/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_add.py

  • Committer: Robert Collins
  • Date: 2007-04-19 02:27:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2426.
  • Revision ID: robertc@robertcollins.net-20070419022744-pfdqz42kp1wizh43
``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010, 2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
#
17
17
 
18
18
"""Tests of the 'bzr add' command."""
19
19
 
20
20
import os
21
21
 
22
 
from bzrlib import (
23
 
    osutils,
24
 
    tests,
25
 
    )
26
 
from bzrlib.tests import (
27
 
    script,
28
 
    )
29
 
from bzrlib.tests.scenarios import load_tests_apply_scenarios
30
 
 
31
 
 
32
 
load_tests = load_tests_apply_scenarios
33
 
 
34
 
 
35
 
class TestAdd(tests.TestCaseWithTransport):
36
 
 
37
 
    scenarios = [
38
 
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
39
 
        ('view-aware', {'branch_tree_format': '2a'}),
40
 
        ]
41
 
 
42
 
    def make_branch_and_tree(self, dir):
43
 
        return super(TestAdd, self).make_branch_and_tree(
44
 
            dir, format=self.branch_tree_format)
45
 
 
 
22
from bzrlib.tests.blackbox import ExternalBase
 
23
 
 
24
 
 
25
class TestAdd(ExternalBase):
 
26
        
46
27
    def test_add_reports(self):
47
28
        """add command prints the names of added files."""
48
 
        tree = self.make_branch_and_tree('.')
 
29
        self.runbzr('init')
49
30
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
50
31
        self.build_tree_contents([('.bzrignore', 'CVS\n')])
51
 
        out = self.run_bzr('add')[0]
 
32
        out = self.run_bzr_captured(['add'], retcode=0)[0]
52
33
        # the ordering is not defined at the moment
53
34
        results = sorted(out.rstrip('\n').split('\n'))
54
 
        self.assertEquals(['adding .bzrignore',
55
 
                           'adding dir',
56
 
                           'adding dir/sub.txt',
57
 
                           'adding top.txt'],
 
35
        self.assertEquals(['If you wish to add some of these files, please'\
 
36
                           ' add them by name.',
 
37
                           'added .bzrignore',
 
38
                           'added dir',
 
39
                           'added dir/sub.txt',
 
40
                           'added top.txt',
 
41
                           'ignored 1 file(s).'],
58
42
                          results)
59
 
        out = self.run_bzr('add -v')[0]
 
43
        out = self.run_bzr_captured(['add', '-v'], retcode=0)[0]
60
44
        results = sorted(out.rstrip('\n').split('\n'))
61
 
        self.assertEquals(['ignored CVS matching "CVS"'],
 
45
        self.assertEquals(['If you wish to add some of these files, please'\
 
46
                           ' add them by name.',
 
47
                           'ignored CVS matching "CVS"'],
62
48
                          results)
63
49
 
64
50
    def test_add_quiet_is(self):
65
51
        """add -q does not print the names of added files."""
66
 
        tree = self.make_branch_and_tree('.')
 
52
        self.runbzr('init')
67
53
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
68
 
        out = self.run_bzr('add -q')[0]
 
54
        out = self.run_bzr_captured(['add', '-q'], retcode=0)[0]
69
55
        # the ordering is not defined at the moment
70
56
        results = sorted(out.rstrip('\n').split('\n'))
71
57
        self.assertEquals([''], results)
75
61
 
76
62
        "bzr add" should add the parent(s) as necessary.
77
63
        """
78
 
        tree = self.make_branch_and_tree('.')
 
64
        self.runbzr('init')
79
65
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
80
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
81
 
        self.run_bzr('add inertiatic/esp')
82
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
66
        self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
 
67
        self.run_bzr('add', 'inertiatic/esp')
 
68
        self.assertEquals(self.capture('unknowns'), '')
83
69
 
84
70
        # Multiple unversioned parents
85
71
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
86
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
87
 
        self.run_bzr('add veil/cerpin/taxt')
88
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
72
        self.assertEquals(self.capture('unknowns'), 'veil\n')
 
73
        self.run_bzr('add', 'veil/cerpin/taxt')
 
74
        self.assertEquals(self.capture('unknowns'), '')
89
75
 
90
76
        # Check whacky paths work
91
77
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
92
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
93
 
        self.run_bzr('add inertiatic/../cicatriz/esp')
94
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
78
        self.assertEquals(self.capture('unknowns'), 'cicatriz\n')
 
79
        self.run_bzr('add', 'inertiatic/../cicatriz/esp')
 
80
        self.assertEquals(self.capture('unknowns'), '')
95
81
 
96
82
    def test_add_in_versioned(self):
97
83
        """Try to add a file in a versioned directory.
98
84
 
99
85
        "bzr add" should do this happily.
100
86
        """
101
 
        tree = self.make_branch_and_tree('.')
 
87
        self.runbzr('init')
102
88
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
103
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
104
 
        self.run_bzr('add --no-recurse inertiatic')
105
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
106
 
        self.run_bzr('add inertiatic/esp')
107
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
89
        self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
 
90
        self.run_bzr('add', '--no-recurse', 'inertiatic')
 
91
        self.assertEquals(self.capture('unknowns'), 'inertiatic/esp\n')
 
92
        self.run_bzr('add', 'inertiatic/esp')
 
93
        self.assertEquals(self.capture('unknowns'), '')
108
94
 
109
95
    def test_subdir_add(self):
110
96
        """Add in subdirectory should add only things from there down"""
112
98
 
113
99
        eq = self.assertEqual
114
100
        ass = self.assertTrue
115
 
 
 
101
        chdir = os.chdir
 
102
        
116
103
        t = self.make_branch_and_tree('.')
117
104
        b = t.branch
118
105
        self.build_tree(['src/', 'README'])
119
 
 
 
106
        
120
107
        eq(sorted(t.unknowns()),
121
108
           ['README', 'src'])
122
 
 
123
 
        self.run_bzr('add src')
124
 
 
 
109
        
 
110
        self.run_bzr('add', 'src')
 
111
        
125
112
        self.build_tree(['src/foo.c'])
126
 
 
 
113
        
127
114
        # add with no arguments in a subdirectory gets only files below that
128
115
        # subdirectory
129
 
        self.run_bzr('add', working_dir='src')
130
 
        self.assertEquals('README\n',
131
 
                          self.run_bzr('unknowns', working_dir='src')[0])
 
116
        chdir('src')
 
117
        self.run_bzr('add')
 
118
        self.assertEquals(self.capture('unknowns'), 'README\n')
132
119
        # reopen to see the new changes
133
 
        t = t.bzrdir.open_workingtree('src')
 
120
        t = t.bzrdir.open_workingtree()
134
121
        versioned = [path for path, entry in t.iter_entries_by_dir()]
135
 
        self.assertEquals(versioned, ['', 'src', 'src/foo.c'])
136
 
 
 
122
        self.assertEquals(versioned,
 
123
            ['', 'src', 'src/foo.c'])
 
124
                
137
125
        # add from the parent directory should pick up all file names
 
126
        chdir('..')
138
127
        self.run_bzr('add')
139
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
128
        self.assertEquals(self.capture('unknowns'), '')
140
129
        self.run_bzr('check')
141
130
 
142
131
    def test_add_missing(self):
143
132
        """bzr add foo where foo is missing should error."""
144
133
        self.make_branch_and_tree('.')
145
 
        self.run_bzr('add missing-file', retcode=3)
 
134
        self.run_bzr('add', 'missing-file', retcode=3)
146
135
 
147
136
    def test_add_from(self):
148
137
        base_tree = self.make_branch_and_tree('base')
154
143
        self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
155
144
 
156
145
        os.chdir('new')
157
 
        out, err = self.run_bzr('add --file-ids-from ../base')
 
146
        out, err = self.run_bzr('add', '--file-ids-from', '../base')
158
147
        self.assertEqual('', err)
159
 
        self.assertEqualDiff('adding a w/ file id from a\n'
160
 
                             'adding b w/ file id from b\n'
161
 
                             'adding b/c w/ file id from b/c\n',
 
148
        self.assertEqualDiff('added a w/ file id from a\n'
 
149
                             'added b w/ file id from b\n'
 
150
                             'added b/c w/ file id from b/c\n',
162
151
                             out)
163
152
        new_tree = new_tree.bzrdir.open_workingtree()
164
153
        self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
175
164
        self.build_tree(['new/c', 'new/d'])
176
165
 
177
166
        os.chdir('new')
178
 
        out, err = self.run_bzr('add --file-ids-from ../base/b')
 
167
        out, err = self.run_bzr('add', '--file-ids-from', '../base/b')
179
168
        self.assertEqual('', err)
180
 
        self.assertEqualDiff('adding c w/ file id from b/c\n'
181
 
                             'adding d w/ file id from b/d\n',
 
169
        self.assertEqualDiff('added c w/ file id from b/c\n'
 
170
                             'added d w/ file id from b/d\n',
182
171
                             out)
183
172
 
184
173
        new_tree = new_tree.bzrdir.open_workingtree()
186
175
        self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
187
176
 
188
177
    def test_add_dry_run(self):
189
 
        """Test a dry run add, make sure nothing is added."""
190
 
        wt = self.make_branch_and_tree('.')
191
 
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
192
 
        self.assertEqual(list(wt.unknowns()), ['inertiatic'])
193
 
        self.run_bzr('add --dry-run')
194
 
        self.assertEqual(list(wt.unknowns()), ['inertiatic'])
 
178
        # ensure that --dry-run actually don't add anything
 
179
        base_tree = self.make_branch_and_tree('.')
 
180
        self.build_tree(['spam'])
 
181
        out = self.run_bzr_captured(['add', '--dry-run'], retcode=0)[0]
 
182
        self.assertEquals('added spam\n', out)
 
183
        out = self.run_bzr_captured(['added'], retcode=0)[0]
 
184
        self.assertEquals('', out)
195
185
 
196
186
    def test_add_control_dir(self):
197
187
        """The control dir and its content should be refused."""
198
188
        self.make_branch_and_tree('.')
199
 
        err = self.run_bzr('add .bzr', retcode=3)[1]
 
189
        err = self.run_bzr('add', '.bzr', retcode=3)[1]
200
190
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
201
 
        err = self.run_bzr('add .bzr/README', retcode=3)[1]
 
191
        err = self.run_bzr('add', '.bzr/README', retcode=3)[1]
202
192
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
203
193
        self.build_tree(['.bzr/crescent'])
204
 
        err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
 
194
        err = self.run_bzr('add', '.bzr/crescent', retcode=3)[1]
205
195
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
206
 
 
207
 
    def test_add_via_symlink(self):
208
 
        self.requireFeature(tests.SymlinkFeature)
209
 
        self.make_branch_and_tree('source')
210
 
        self.build_tree(['source/top.txt'])
211
 
        os.symlink('source', 'link')
212
 
        out = self.run_bzr(['add', 'link/top.txt'])[0]
213
 
        self.assertEquals(out, 'adding top.txt\n')
214
 
 
215
 
    def test_add_symlink_to_abspath(self):
216
 
        self.requireFeature(tests.SymlinkFeature)
217
 
        self.make_branch_and_tree('tree')
218
 
        os.symlink(osutils.abspath('target'), 'tree/link')
219
 
        out = self.run_bzr(['add', 'tree/link'])[0]
220
 
        self.assertEquals(out, 'adding link\n')
221
 
 
222
 
    def test_add_not_child(self):
223
 
        # https://bugs.launchpad.net/bzr/+bug/98735
224
 
        sr = script.ScriptRunner()
225
 
        self.make_branch_and_tree('tree1')
226
 
        self.make_branch_and_tree('tree2')
227
 
        self.build_tree(['tree1/a', 'tree2/b'])
228
 
        sr.run_script(self, '''
229
 
        $ bzr add tree1/a tree2/b
230
 
        2>bzr: ERROR: Path "...tree2/b" is not a child of path "...tree1"
231
 
        ''')
232
 
 
233
 
    def test_add_multiple_files_in_unicode_cwd(self):
234
 
        """Adding multiple files in a non-ascii cwd, see lp:686611"""
235
 
        self.requireFeature(tests.UnicodeFilename)
236
 
        self.make_branch_and_tree(u"\xA7")
237
 
        self.build_tree([u"\xA7/a", u"\xA7/b"])
238
 
        out, err = self.run_bzr(["add", "a", "b"], working_dir=u"\xA7")
239
 
        self.assertEquals(out, "adding a\n" "adding b\n")
240
 
        self.assertEquals(err, "")