← 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: Patch Queue Manager
  • Date: 2016-04-21 04:10:52 UTC
  • mfrom: (6616.1.1 fix-en-user-guide)
  • Revision ID: pqm@pqm.ubuntu.com-20160421041052-clcye7ns1qcl2n7w
(richard-wilbur) Ensure build of English use guide always uses English text
 even when user's locale specifies a different language. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
1
 
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009-2012, 2016 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
 
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
24
 
 
25
 
 
26
 
class TestAdd(ExternalBase):
27
 
        
 
22
from bzrlib import (
 
23
    osutils,
 
24
    tests,
 
25
    )
 
26
from bzrlib.tests import (
 
27
    features,
 
28
    script,
 
29
    )
 
30
from bzrlib.tests.scenarios import load_tests_apply_scenarios
 
31
 
 
32
 
 
33
load_tests = load_tests_apply_scenarios
 
34
 
 
35
 
 
36
class TestAdd(tests.TestCaseWithTransport):
 
37
 
 
38
    scenarios = [
 
39
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
 
40
        ('view-aware', {'branch_tree_format': '2a'}),
 
41
        ]
 
42
 
 
43
    def make_branch_and_tree(self, dir):
 
44
        return super(TestAdd, self).make_branch_and_tree(
 
45
            dir, format=self.branch_tree_format)
 
46
 
28
47
    def test_add_reports(self):
29
48
        """add command prints the names of added files."""
30
49
        tree = self.make_branch_and_tree('.')
33
52
        out = self.run_bzr('add')[0]
34
53
        # the ordering is not defined at the moment
35
54
        results = sorted(out.rstrip('\n').split('\n'))
36
 
        self.assertEquals(['If you wish to add some of these files, please'\
37
 
                           ' add them by name.',
38
 
                           'added .bzrignore',
39
 
                           'added dir',
40
 
                           'added dir/sub.txt',
41
 
                           'added top.txt',
42
 
                           'ignored 1 file(s).'],
 
55
        self.assertEqual(['adding .bzrignore',
 
56
                           'adding dir',
 
57
                           'adding dir/sub.txt',
 
58
                           'adding top.txt'],
43
59
                          results)
44
60
        out = self.run_bzr('add -v')[0]
45
61
        results = sorted(out.rstrip('\n').split('\n'))
46
 
        self.assertEquals(['If you wish to add some of these files, please'\
47
 
                           ' add them by name.',
48
 
                           'ignored CVS matching "CVS"'],
 
62
        self.assertEqual(['ignored CVS matching "CVS"'],
49
63
                          results)
50
64
 
51
65
    def test_add_quiet_is(self):
52
66
        """add -q does not print the names of added files."""
53
 
        tree = self.make_branch_and_tree('.') 
 
67
        tree = self.make_branch_and_tree('.')
54
68
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
55
69
        out = self.run_bzr('add -q')[0]
56
70
        # the ordering is not defined at the moment
57
71
        results = sorted(out.rstrip('\n').split('\n'))
58
 
        self.assertEquals([''], results)
 
72
        self.assertEqual([''], results)
59
73
 
60
74
    def test_add_in_unversioned(self):
61
75
        """Try to add a file in an unversioned directory.
64
78
        """
65
79
        tree = self.make_branch_and_tree('.')
66
80
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
67
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
 
81
        self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic\n')
68
82
        self.run_bzr('add inertiatic/esp')
69
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
83
        self.assertEqual(self.run_bzr('unknowns')[0], '')
70
84
 
71
85
        # Multiple unversioned parents
72
86
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
73
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
 
87
        self.assertEqual(self.run_bzr('unknowns')[0], 'veil\n')
74
88
        self.run_bzr('add veil/cerpin/taxt')
75
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
89
        self.assertEqual(self.run_bzr('unknowns')[0], '')
76
90
 
77
91
        # Check whacky paths work
78
92
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
79
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
 
93
        self.assertEqual(self.run_bzr('unknowns')[0], 'cicatriz\n')
80
94
        self.run_bzr('add inertiatic/../cicatriz/esp')
81
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
95
        self.assertEqual(self.run_bzr('unknowns')[0], '')
 
96
 
 
97
    def test_add_no_recurse(self):
 
98
        tree = self.make_branch_and_tree('.')
 
99
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
 
100
        self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic\n')
 
101
        self.run_bzr('add -N inertiatic')
 
102
        self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
82
103
 
83
104
    def test_add_in_versioned(self):
84
105
        """Try to add a file in a versioned directory.
87
108
        """
88
109
        tree = self.make_branch_and_tree('.')
89
110
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
90
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
 
111
        self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic\n')
91
112
        self.run_bzr('add --no-recurse inertiatic')
92
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
 
113
        self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
93
114
        self.run_bzr('add inertiatic/esp')
94
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
115
        self.assertEqual(self.run_bzr('unknowns')[0], '')
95
116
 
96
117
    def test_subdir_add(self):
97
118
        """Add in subdirectory should add only things from there down"""
98
 
        from bzrlib.workingtree import WorkingTree
99
 
 
100
119
        eq = self.assertEqual
101
120
        ass = self.assertTrue
102
 
        chdir = os.chdir
103
 
        
 
121
 
104
122
        t = self.make_branch_and_tree('.')
105
123
        b = t.branch
106
124
        self.build_tree(['src/', 'README'])
107
 
        
 
125
 
108
126
        eq(sorted(t.unknowns()),
109
127
           ['README', 'src'])
110
 
        
 
128
 
111
129
        self.run_bzr('add src')
112
 
        
 
130
 
113
131
        self.build_tree(['src/foo.c'])
114
 
        
 
132
 
115
133
        # add with no arguments in a subdirectory gets only files below that
116
134
        # subdirectory
117
 
        chdir('src')
118
 
        self.run_bzr('add')
119
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
 
135
        self.run_bzr('add', working_dir='src')
 
136
        self.assertEqual('README\n',
 
137
                          self.run_bzr('unknowns', working_dir='src')[0])
120
138
        # reopen to see the new changes
121
 
        t = t.bzrdir.open_workingtree()
 
139
        t = t.bzrdir.open_workingtree('src')
122
140
        versioned = [path for path, entry in t.iter_entries_by_dir()]
123
 
        self.assertEquals(versioned,
124
 
            ['', 'src', 'src/foo.c'])
125
 
                
 
141
        self.assertEqual(versioned, ['', 'src', 'src/foo.c'])
 
142
 
126
143
        # add from the parent directory should pick up all file names
127
 
        chdir('..')
128
144
        self.run_bzr('add')
129
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
145
        self.assertEqual(self.run_bzr('unknowns')[0], '')
130
146
        self.run_bzr('check')
131
147
 
132
148
    def test_add_missing(self):
143
159
        new_tree = self.make_branch_and_tree('new')
144
160
        self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
145
161
 
146
 
        os.chdir('new')
147
 
        out, err = self.run_bzr('add --file-ids-from ../base')
 
162
        out, err = self.run_bzr('add --file-ids-from ../base',
 
163
                                working_dir='new')
148
164
        self.assertEqual('', err)
149
 
        self.assertEqualDiff('added a w/ file id from a\n'
150
 
                             'added b w/ file id from b\n'
151
 
                             'added b/c w/ file id from b/c\n',
 
165
        self.assertEqualDiff('adding a w/ file id from a\n'
 
166
                             'adding b w/ file id from b\n'
 
167
                             'adding b/c w/ file id from b/c\n',
152
168
                             out)
153
169
        new_tree = new_tree.bzrdir.open_workingtree()
154
170
        self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
164
180
        new_tree = self.make_branch_and_tree('new')
165
181
        self.build_tree(['new/c', 'new/d'])
166
182
 
167
 
        os.chdir('new')
168
 
        out, err = self.run_bzr('add --file-ids-from ../base/b')
 
183
        out, err = self.run_bzr('add --file-ids-from ../base/b',
 
184
                                working_dir='new')
169
185
        self.assertEqual('', err)
170
 
        self.assertEqualDiff('added c w/ file id from b/c\n'
171
 
                             'added d w/ file id from b/d\n',
 
186
        self.assertEqualDiff('adding c w/ file id from b/c\n'
 
187
                             'adding d w/ file id from b/d\n',
172
188
                             out)
173
189
 
174
 
        new_tree = new_tree.bzrdir.open_workingtree()
 
190
        new_tree = new_tree.bzrdir.open_workingtree('new')
175
191
        self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
176
192
        self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
177
193
 
194
210
        err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
195
211
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
196
212
 
197
 
    def test_add_with_wildcards(self):
198
 
        self.requireFeature(NeedsGlobExpansionFeature)
199
 
        self.make_branch_and_tree('.')
200
 
        self.build_tree(['a1', 'a2', 'b', 'c33'])
201
 
        self.run_bzr(['add', 'a?', 'c*'])
202
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'b\n')
203
 
 
204
 
    def test_add_with_wildcards_unicode(self):
205
 
        self.requireFeature(NeedsGlobExpansionFeature)
206
 
        self.make_branch_and_tree('.')
207
 
        self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
208
 
        self.run_bzr(['add', u'\u1234?', u'\u1235*'])
209
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')
 
213
    def test_add_via_symlink(self):
 
214
        self.requireFeature(features.SymlinkFeature)
 
215
        self.make_branch_and_tree('source')
 
216
        self.build_tree(['source/top.txt'])
 
217
        os.symlink('source', 'link')
 
218
        out = self.run_bzr(['add', 'link/top.txt'])[0]
 
219
        self.assertEqual(out, 'adding top.txt\n')
 
220
 
 
221
    def test_add_symlink_to_abspath(self):
 
222
        self.requireFeature(features.SymlinkFeature)
 
223
        self.make_branch_and_tree('tree')
 
224
        os.symlink(osutils.abspath('target'), 'tree/link')
 
225
        out = self.run_bzr(['add', 'tree/link'])[0]
 
226
        self.assertEqual(out, 'adding link\n')
 
227
 
 
228
    def test_add_not_child(self):
 
229
        # https://bugs.launchpad.net/bzr/+bug/98735
 
230
        sr = script.ScriptRunner()
 
231
        self.make_branch_and_tree('tree1')
 
232
        self.make_branch_and_tree('tree2')
 
233
        self.build_tree(['tree1/a', 'tree2/b'])
 
234
        sr.run_script(self, '''
 
235
        $ bzr add tree1/a tree2/b
 
236
        2>bzr: ERROR: Path "...tree2/b" is not a child of path "...tree1"
 
237
        ''')
 
238
 
 
239
    def test_add_multiple_files_in_unicode_cwd(self):
 
240
        """Adding multiple files in a non-ascii cwd, see lp:686611"""
 
241
        self.requireFeature(features.UnicodeFilenameFeature)
 
242
        self.make_branch_and_tree(u"\xA7")
 
243
        self.build_tree([u"\xA7/a", u"\xA7/b"])
 
244
        out, err = self.run_bzr(["add", "a", "b"], working_dir=u"\xA7")
 
245
        self.assertEqual(out, "adding a\n" "adding b\n")
 
246
        self.assertEqual(err, "")
 
247
 
 
248
    def test_add_skip_large_files(self):
 
249
        """Test skipping files larger than add.maximum_file_size"""
 
250
        tree = self.make_branch_and_tree('.')
 
251
        self.build_tree(['small.txt', 'big.txt', 'big2.txt'])
 
252
        self.build_tree_contents([('small.txt', '0\n')])
 
253
        self.build_tree_contents([('big.txt', '01234567890123456789\n')])
 
254
        self.build_tree_contents([('big2.txt', '01234567890123456789\n')])
 
255
        tree.branch.get_config_stack().set('add.maximum_file_size', 5)
 
256
        out = self.run_bzr('add')[0]
 
257
        results = sorted(out.rstrip('\n').split('\n'))
 
258
        self.assertEqual(['adding small.txt'], results)
 
259
        # named items never skipped, even if over max
 
260
        out, err = self.run_bzr(["add", "big2.txt"])
 
261
        results = sorted(out.rstrip('\n').split('\n'))
 
262
        self.assertEqual(['adding big2.txt'], results)
 
263
        self.assertEqual("", err)
 
264
        tree.branch.get_config_stack().set('add.maximum_file_size', 30)
 
265
        out = self.run_bzr('add')[0]
 
266
        results = sorted(out.rstrip('\n').split('\n'))
 
267
        self.assertEqual(['adding big.txt'], results)