← 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-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
1
 
# Copyright (C) 2006, 2007, 2009-2012, 2016 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
52
52
        out = self.run_bzr('add')[0]
53
53
        # the ordering is not defined at the moment
54
54
        results = sorted(out.rstrip('\n').split('\n'))
55
 
        self.assertEqual(['adding .bzrignore',
 
55
        self.assertEquals(['adding .bzrignore',
56
56
                           'adding dir',
57
57
                           'adding dir/sub.txt',
58
58
                           'adding top.txt'],
59
59
                          results)
60
60
        out = self.run_bzr('add -v')[0]
61
61
        results = sorted(out.rstrip('\n').split('\n'))
62
 
        self.assertEqual(['ignored CVS matching "CVS"'],
 
62
        self.assertEquals(['ignored CVS matching "CVS"'],
63
63
                          results)
64
64
 
65
65
    def test_add_quiet_is(self):
69
69
        out = self.run_bzr('add -q')[0]
70
70
        # the ordering is not defined at the moment
71
71
        results = sorted(out.rstrip('\n').split('\n'))
72
 
        self.assertEqual([''], results)
 
72
        self.assertEquals([''], results)
73
73
 
74
74
    def test_add_in_unversioned(self):
75
75
        """Try to add a file in an unversioned directory.
78
78
        """
79
79
        tree = self.make_branch_and_tree('.')
80
80
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
81
 
        self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic\n')
 
81
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
82
82
        self.run_bzr('add inertiatic/esp')
83
 
        self.assertEqual(self.run_bzr('unknowns')[0], '')
 
83
        self.assertEquals(self.run_bzr('unknowns')[0], '')
84
84
 
85
85
        # Multiple unversioned parents
86
86
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
87
 
        self.assertEqual(self.run_bzr('unknowns')[0], 'veil\n')
 
87
        self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
88
88
        self.run_bzr('add veil/cerpin/taxt')
89
 
        self.assertEqual(self.run_bzr('unknowns')[0], '')
 
89
        self.assertEquals(self.run_bzr('unknowns')[0], '')
90
90
 
91
91
        # Check whacky paths work
92
92
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
93
 
        self.assertEqual(self.run_bzr('unknowns')[0], 'cicatriz\n')
 
93
        self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
94
94
        self.run_bzr('add inertiatic/../cicatriz/esp')
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')
 
95
        self.assertEquals(self.run_bzr('unknowns')[0], '')
103
96
 
104
97
    def test_add_in_versioned(self):
105
98
        """Try to add a file in a versioned directory.
108
101
        """
109
102
        tree = self.make_branch_and_tree('.')
110
103
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
111
 
        self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic\n')
 
104
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
112
105
        self.run_bzr('add --no-recurse inertiatic')
113
 
        self.assertEqual(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
 
106
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
114
107
        self.run_bzr('add inertiatic/esp')
115
 
        self.assertEqual(self.run_bzr('unknowns')[0], '')
 
108
        self.assertEquals(self.run_bzr('unknowns')[0], '')
116
109
 
117
110
    def test_subdir_add(self):
118
111
        """Add in subdirectory should add only things from there down"""
 
112
        from bzrlib.workingtree import WorkingTree
 
113
 
119
114
        eq = self.assertEqual
120
115
        ass = self.assertTrue
121
116
 
133
128
        # add with no arguments in a subdirectory gets only files below that
134
129
        # subdirectory
135
130
        self.run_bzr('add', working_dir='src')
136
 
        self.assertEqual('README\n',
 
131
        self.assertEquals('README\n',
137
132
                          self.run_bzr('unknowns', working_dir='src')[0])
138
133
        # reopen to see the new changes
139
134
        t = t.bzrdir.open_workingtree('src')
140
135
        versioned = [path for path, entry in t.iter_entries_by_dir()]
141
 
        self.assertEqual(versioned, ['', 'src', 'src/foo.c'])
 
136
        self.assertEquals(versioned, ['', 'src', 'src/foo.c'])
142
137
 
143
138
        # add from the parent directory should pick up all file names
144
139
        self.run_bzr('add')
145
 
        self.assertEqual(self.run_bzr('unknowns')[0], '')
 
140
        self.assertEquals(self.run_bzr('unknowns')[0], '')
146
141
        self.run_bzr('check')
147
142
 
148
143
    def test_add_missing(self):
159
154
        new_tree = self.make_branch_and_tree('new')
160
155
        self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
161
156
 
162
 
        out, err = self.run_bzr('add --file-ids-from ../base',
163
 
                                working_dir='new')
 
157
        os.chdir('new')
 
158
        out, err = self.run_bzr('add --file-ids-from ../base')
164
159
        self.assertEqual('', err)
165
160
        self.assertEqualDiff('adding a w/ file id from a\n'
166
161
                             'adding b w/ file id from b\n'
180
175
        new_tree = self.make_branch_and_tree('new')
181
176
        self.build_tree(['new/c', 'new/d'])
182
177
 
183
 
        out, err = self.run_bzr('add --file-ids-from ../base/b',
184
 
                                working_dir='new')
 
178
        os.chdir('new')
 
179
        out, err = self.run_bzr('add --file-ids-from ../base/b')
185
180
        self.assertEqual('', err)
186
181
        self.assertEqualDiff('adding c w/ file id from b/c\n'
187
182
                             'adding d w/ file id from b/d\n',
188
183
                             out)
189
184
 
190
 
        new_tree = new_tree.bzrdir.open_workingtree('new')
 
185
        new_tree = new_tree.bzrdir.open_workingtree()
191
186
        self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
192
187
        self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
193
188
 
216
211
        self.build_tree(['source/top.txt'])
217
212
        os.symlink('source', 'link')
218
213
        out = self.run_bzr(['add', 'link/top.txt'])[0]
219
 
        self.assertEqual(out, 'adding top.txt\n')
 
214
        self.assertEquals(out, 'adding top.txt\n')
220
215
 
221
216
    def test_add_symlink_to_abspath(self):
222
217
        self.requireFeature(features.SymlinkFeature)
223
218
        self.make_branch_and_tree('tree')
224
219
        os.symlink(osutils.abspath('target'), 'tree/link')
225
220
        out = self.run_bzr(['add', 'tree/link'])[0]
226
 
        self.assertEqual(out, 'adding link\n')
 
221
        self.assertEquals(out, 'adding link\n')
227
222
 
228
223
    def test_add_not_child(self):
229
224
        # https://bugs.launchpad.net/bzr/+bug/98735
242
237
        self.make_branch_and_tree(u"\xA7")
243
238
        self.build_tree([u"\xA7/a", u"\xA7/b"])
244
239
        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)
 
240
        self.assertEquals(out, "adding a\n" "adding b\n")
 
241
        self.assertEquals(err, "")