← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-04 12:10:51 UTC
  • mfrom: (5819.1.4 777007-developer-doc)
  • Revision ID: pqm@pqm.ubuntu.com-20110504121051-aovlsmqiivjmc4fc
(jelmer) Small fixes to developer documentation. (Jonathan Riddell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009, 2010, 2011 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
#
17
17
 
18
18
"""Tests of the 'bzr add' command."""
19
19
 
20
20
import os
21
21
 
22
 
from bzrlib.tests.blackbox import ExternalBase
23
 
 
24
 
 
25
 
class TestAdd(ExternalBase):
26
 
        
 
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
 
27
46
    def test_add_reports(self):
28
47
        """add command prints the names of added files."""
29
 
        self.runbzr('init')
 
48
        tree = self.make_branch_and_tree('.')
30
49
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
31
50
        self.build_tree_contents([('.bzrignore', 'CVS\n')])
32
 
        out = self.run_bzr_captured(['add'], retcode=0)[0]
 
51
        out = self.run_bzr('add')[0]
33
52
        # the ordering is not defined at the moment
34
53
        results = sorted(out.rstrip('\n').split('\n'))
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).'],
 
54
        self.assertEquals(['adding .bzrignore',
 
55
                           'adding dir',
 
56
                           'adding dir/sub.txt',
 
57
                           'adding top.txt'],
42
58
                          results)
43
 
        out = self.run_bzr_captured(['add', '-v'], retcode=0)[0]
 
59
        out = self.run_bzr('add -v')[0]
44
60
        results = sorted(out.rstrip('\n').split('\n'))
45
 
        self.assertEquals(['If you wish to add some of these files, please'\
46
 
                           ' add them by name.',
47
 
                           'ignored CVS matching "CVS"'],
 
61
        self.assertEquals(['ignored CVS matching "CVS"'],
48
62
                          results)
49
63
 
50
64
    def test_add_quiet_is(self):
51
65
        """add -q does not print the names of added files."""
52
 
        self.runbzr('init')
 
66
        tree = self.make_branch_and_tree('.')
53
67
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
54
 
        out = self.run_bzr_captured(['add', '-q'], retcode=0)[0]
 
68
        out = self.run_bzr('add -q')[0]
55
69
        # the ordering is not defined at the moment
56
70
        results = sorted(out.rstrip('\n').split('\n'))
57
71
        self.assertEquals([''], results)
61
75
 
62
76
        "bzr add" should add the parent(s) as necessary.
63
77
        """
64
 
        self.runbzr('init')
 
78
        tree = self.make_branch_and_tree('.')
65
79
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
66
 
        self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
67
 
        self.run_bzr('add', 'inertiatic/esp')
68
 
        self.assertEquals(self.capture('unknowns'), '')
 
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], '')
69
83
 
70
84
        # Multiple unversioned parents
71
85
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
72
 
        self.assertEquals(self.capture('unknowns'), 'veil\n')
73
 
        self.run_bzr('add', 'veil/cerpin/taxt')
74
 
        self.assertEquals(self.capture('unknowns'), '')
 
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], '')
75
89
 
76
90
        # Check whacky paths work
77
91
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
78
 
        self.assertEquals(self.capture('unknowns'), 'cicatriz\n')
79
 
        self.run_bzr('add', 'inertiatic/../cicatriz/esp')
80
 
        self.assertEquals(self.capture('unknowns'), '')
 
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], '')
81
95
 
82
96
    def test_add_in_versioned(self):
83
97
        """Try to add a file in a versioned directory.
84
98
 
85
99
        "bzr add" should do this happily.
86
100
        """
87
 
        self.runbzr('init')
 
101
        tree = self.make_branch_and_tree('.')
88
102
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
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'), '')
 
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], '')
94
108
 
95
109
    def test_subdir_add(self):
96
110
        """Add in subdirectory should add only things from there down"""
98
112
 
99
113
        eq = self.assertEqual
100
114
        ass = self.assertTrue
101
 
        chdir = os.chdir
102
 
        
 
115
 
103
116
        t = self.make_branch_and_tree('.')
104
117
        b = t.branch
105
118
        self.build_tree(['src/', 'README'])
106
 
        
 
119
 
107
120
        eq(sorted(t.unknowns()),
108
121
           ['README', 'src'])
109
 
        
110
 
        self.run_bzr('add', 'src')
111
 
        
 
122
 
 
123
        self.run_bzr('add src')
 
124
 
112
125
        self.build_tree(['src/foo.c'])
113
 
        
114
 
        chdir('src')
115
 
        self.run_bzr('add')
116
 
        
117
 
        self.assertEquals(self.capture('unknowns'), 'README\n')
118
 
        eq(len(t.read_working_inventory()), 3)
119
 
                
120
 
        chdir('..')
121
 
        self.run_bzr('add')
122
 
        self.assertEquals(self.capture('unknowns'), '')
 
126
 
 
127
        # add with no arguments in a subdirectory gets only files below that
 
128
        # subdirectory
 
129
        self.run_bzr('add', working_dir='src')
 
130
        self.assertEquals('README\n',
 
131
                          self.run_bzr('unknowns', working_dir='src')[0])
 
132
        # reopen to see the new changes
 
133
        t = t.bzrdir.open_workingtree('src')
 
134
        versioned = [path for path, entry in t.iter_entries_by_dir()]
 
135
        self.assertEquals(versioned, ['', 'src', 'src/foo.c'])
 
136
 
 
137
        # add from the parent directory should pick up all file names
 
138
        self.run_bzr('add')
 
139
        self.assertEquals(self.run_bzr('unknowns')[0], '')
123
140
        self.run_bzr('check')
124
141
 
125
142
    def test_add_missing(self):
126
143
        """bzr add foo where foo is missing should error."""
127
144
        self.make_branch_and_tree('.')
128
 
        self.run_bzr('add', 'missing-file', retcode=3)
 
145
        self.run_bzr('add missing-file', retcode=3)
129
146
 
130
147
    def test_add_from(self):
131
148
        base_tree = self.make_branch_and_tree('base')
137
154
        self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
138
155
 
139
156
        os.chdir('new')
140
 
        out, err = self.run_bzr('add', '--file-ids-from', '../base')
 
157
        out, err = self.run_bzr('add --file-ids-from ../base')
141
158
        self.assertEqual('', err)
142
 
        self.assertEqualDiff('added a w/ file id from a\n'
143
 
                             'added b w/ file id from b\n'
144
 
                             'added b/c w/ file id from b/c\n',
 
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',
145
162
                             out)
146
 
 
147
 
        new_tree.read_working_inventory()
 
163
        new_tree = new_tree.bzrdir.open_workingtree()
148
164
        self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
149
165
        self.assertEqual(base_tree.path2id('b'), new_tree.path2id('b'))
150
166
        self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('b/c'))
159
175
        self.build_tree(['new/c', 'new/d'])
160
176
 
161
177
        os.chdir('new')
162
 
        out, err = self.run_bzr('add', '--file-ids-from', '../base/b')
 
178
        out, err = self.run_bzr('add --file-ids-from ../base/b')
163
179
        self.assertEqual('', err)
164
 
        self.assertEqualDiff('added c w/ file id from b/c\n'
165
 
                             'added d w/ file id from b/d\n',
 
180
        self.assertEqualDiff('adding c w/ file id from b/c\n'
 
181
                             'adding d w/ file id from b/d\n',
166
182
                             out)
167
183
 
168
 
        new_tree.read_working_inventory()
 
184
        new_tree = new_tree.bzrdir.open_workingtree()
169
185
        self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
170
186
        self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
171
187
 
172
188
    def test_add_dry_run(self):
173
 
        # ensure that --dry-run actually don't add anything
174
 
        base_tree = self.make_branch_and_tree('.')
175
 
        self.build_tree(['spam'])
176
 
        out = self.run_bzr_captured(['add', '--dry-run'], retcode=0)[0]
177
 
        self.assertEquals('added spam\n', out)
178
 
        out = self.run_bzr_captured(['added'], retcode=0)[0]
179
 
        self.assertEquals('', out)
 
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'])
 
195
 
 
196
    def test_add_control_dir(self):
 
197
        """The control dir and its content should be refused."""
 
198
        self.make_branch_and_tree('.')
 
199
        err = self.run_bzr('add .bzr', retcode=3)[1]
 
200
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
 
201
        err = self.run_bzr('add .bzr/README', retcode=3)[1]
 
202
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
 
203
        self.build_tree(['.bzr/crescent'])
 
204
        err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
 
205
        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, "")