← 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: 2009-04-09 20:23:07 UTC
  • mfrom: (4265.1.4 bbc-merge)
  • Revision ID: pqm@pqm.ubuntu.com-20090409202307-n0depb16qepoe21o
(jam) Change _fetch_uses_deltas = False for CHK repos until we can
        write a better fix.

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) 2005, 2006, 2007 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 import (
 
23
    condition_isinstance,
 
24
    split_suite_by_condition,
 
25
    multiply_tests,
 
26
    )
22
27
from bzrlib.tests.blackbox import ExternalBase
 
28
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
 
29
 
 
30
 
 
31
def load_tests(standard_tests, module, loader):
 
32
    """Parameterize tests for view-aware vs not."""
 
33
    to_adapt, result = split_suite_by_condition(
 
34
        standard_tests, condition_isinstance(TestAdd))
 
35
    scenarios = [
 
36
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
 
37
        ('view-aware', {'branch_tree_format': 'development6-rich-root'}),
 
38
        ]
 
39
    return multiply_tests(to_adapt, scenarios, result)
23
40
 
24
41
 
25
42
class TestAdd(ExternalBase):
26
 
        
 
43
 
 
44
    def make_branch_and_tree(self, dir):
 
45
        return ExternalBase.make_branch_and_tree(self, dir,
 
46
            format=self.branch_tree_format)
 
47
 
27
48
    def test_add_reports(self):
28
49
        """add command prints the names of added files."""
29
 
        self.runbzr('init')
 
50
        tree = self.make_branch_and_tree('.')
30
51
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
31
52
        self.build_tree_contents([('.bzrignore', 'CVS\n')])
32
 
        out = self.run_bzr_captured(['add'], retcode=0)[0]
 
53
        out = self.run_bzr('add')[0]
33
54
        # the ordering is not defined at the moment
34
55
        results = sorted(out.rstrip('\n').split('\n'))
35
56
        self.assertEquals(['If you wish to add some of these files, please'\
36
57
                           ' add them by name.',
37
 
                           'added .bzrignore',
38
 
                           'added dir',
39
 
                           'added dir/sub.txt',
40
 
                           'added top.txt',
 
58
                           'adding .bzrignore',
 
59
                           'adding dir',
 
60
                           'adding dir/sub.txt',
 
61
                           'adding top.txt',
41
62
                           'ignored 1 file(s).'],
42
63
                          results)
43
 
        out = self.run_bzr_captured(['add', '-v'], retcode=0)[0]
 
64
        out = self.run_bzr('add -v')[0]
44
65
        results = sorted(out.rstrip('\n').split('\n'))
45
66
        self.assertEquals(['If you wish to add some of these files, please'\
46
67
                           ' add them by name.',
49
70
 
50
71
    def test_add_quiet_is(self):
51
72
        """add -q does not print the names of added files."""
52
 
        self.runbzr('init')
 
73
        tree = self.make_branch_and_tree('.')
53
74
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
54
 
        out = self.run_bzr_captured(['add', '-q'], retcode=0)[0]
 
75
        out = self.run_bzr('add -q')[0]
55
76
        # the ordering is not defined at the moment
56
77
        results = sorted(out.rstrip('\n').split('\n'))
57
78
        self.assertEquals([''], results)
61
82
 
62
83
        "bzr add" should add the parent(s) as necessary.
63
84
        """
64
 
        self.runbzr('init')
 
85
        tree = self.make_branch_and_tree('.')
65
86
        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'), '')
 
87
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
 
88
        self.run_bzr('add inertiatic/esp')
 
89
        self.assertEquals(self.run_bzr('unknowns')[0], '')
69
90
 
70
91
        # Multiple unversioned parents
71
92
        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'), '')
 
93
        self.assertEquals(self.run_bzr('unknowns')[0], 'veil\n')
 
94
        self.run_bzr('add veil/cerpin/taxt')
 
95
        self.assertEquals(self.run_bzr('unknowns')[0], '')
75
96
 
76
97
        # Check whacky paths work
77
98
        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'), '')
 
99
        self.assertEquals(self.run_bzr('unknowns')[0], 'cicatriz\n')
 
100
        self.run_bzr('add inertiatic/../cicatriz/esp')
 
101
        self.assertEquals(self.run_bzr('unknowns')[0], '')
81
102
 
82
103
    def test_add_in_versioned(self):
83
104
        """Try to add a file in a versioned directory.
84
105
 
85
106
        "bzr add" should do this happily.
86
107
        """
87
 
        self.runbzr('init')
 
108
        tree = self.make_branch_and_tree('.')
88
109
        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'), '')
 
110
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
 
111
        self.run_bzr('add --no-recurse inertiatic')
 
112
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
 
113
        self.run_bzr('add inertiatic/esp')
 
114
        self.assertEquals(self.run_bzr('unknowns')[0], '')
94
115
 
95
116
    def test_subdir_add(self):
96
117
        """Add in subdirectory should add only things from there down"""
99
120
        eq = self.assertEqual
100
121
        ass = self.assertTrue
101
122
        chdir = os.chdir
102
 
        
 
123
 
103
124
        t = self.make_branch_and_tree('.')
104
125
        b = t.branch
105
126
        self.build_tree(['src/', 'README'])
106
 
        
 
127
 
107
128
        eq(sorted(t.unknowns()),
108
129
           ['README', 'src'])
109
 
        
110
 
        self.run_bzr('add', 'src')
111
 
        
 
130
 
 
131
        self.run_bzr('add src')
 
132
 
112
133
        self.build_tree(['src/foo.c'])
113
 
        
 
134
 
114
135
        # add with no arguments in a subdirectory gets only files below that
115
136
        # subdirectory
116
137
        chdir('src')
117
138
        self.run_bzr('add')
118
 
        self.assertEquals(self.capture('unknowns'), 'README\n')
 
139
        self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
119
140
        # reopen to see the new changes
120
141
        t = t.bzrdir.open_workingtree()
121
142
        versioned = [path for path, entry in t.iter_entries_by_dir()]
122
143
        self.assertEquals(versioned,
123
144
            ['', 'src', 'src/foo.c'])
124
 
                
 
145
 
125
146
        # add from the parent directory should pick up all file names
126
147
        chdir('..')
127
148
        self.run_bzr('add')
128
 
        self.assertEquals(self.capture('unknowns'), '')
 
149
        self.assertEquals(self.run_bzr('unknowns')[0], '')
129
150
        self.run_bzr('check')
130
151
 
131
152
    def test_add_missing(self):
132
153
        """bzr add foo where foo is missing should error."""
133
154
        self.make_branch_and_tree('.')
134
 
        self.run_bzr('add', 'missing-file', retcode=3)
 
155
        self.run_bzr('add missing-file', retcode=3)
135
156
 
136
157
    def test_add_from(self):
137
158
        base_tree = self.make_branch_and_tree('base')
143
164
        self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
144
165
 
145
166
        os.chdir('new')
146
 
        out, err = self.run_bzr('add', '--file-ids-from', '../base')
 
167
        out, err = self.run_bzr('add --file-ids-from ../base')
147
168
        self.assertEqual('', err)
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',
 
169
        self.assertEqualDiff('adding a w/ file id from a\n'
 
170
                             'adding b w/ file id from b\n'
 
171
                             'adding b/c w/ file id from b/c\n',
151
172
                             out)
152
173
        new_tree = new_tree.bzrdir.open_workingtree()
153
174
        self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
164
185
        self.build_tree(['new/c', 'new/d'])
165
186
 
166
187
        os.chdir('new')
167
 
        out, err = self.run_bzr('add', '--file-ids-from', '../base/b')
 
188
        out, err = self.run_bzr('add --file-ids-from ../base/b')
168
189
        self.assertEqual('', err)
169
 
        self.assertEqualDiff('added c w/ file id from b/c\n'
170
 
                             'added d w/ file id from b/d\n',
 
190
        self.assertEqualDiff('adding c w/ file id from b/c\n'
 
191
                             'adding d w/ file id from b/d\n',
171
192
                             out)
172
193
 
173
194
        new_tree = new_tree.bzrdir.open_workingtree()
175
196
        self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
176
197
 
177
198
    def test_add_dry_run(self):
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)
 
199
        """Test a dry run add, make sure nothing is added."""
 
200
        wt = self.make_branch_and_tree('.')
 
201
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
 
202
        self.assertEqual(list(wt.unknowns()), ['inertiatic'])
 
203
        self.run_bzr('add --dry-run')
 
204
        self.assertEqual(list(wt.unknowns()), ['inertiatic'])
185
205
 
186
206
    def test_add_control_dir(self):
187
207
        """The control dir and its content should be refused."""
188
208
        self.make_branch_and_tree('.')
189
 
        err = self.run_bzr('add', '.bzr', retcode=3)[1]
 
209
        err = self.run_bzr('add .bzr', retcode=3)[1]
190
210
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
191
 
        err = self.run_bzr('add', '.bzr/README', retcode=3)[1]
 
211
        err = self.run_bzr('add .bzr/README', retcode=3)[1]
192
212
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
193
213
        self.build_tree(['.bzr/crescent'])
194
 
        err = self.run_bzr('add', '.bzr/crescent', retcode=3)[1]
 
214
        err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
195
215
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
 
216
 
 
217
    def test_add_with_wildcards(self):
 
218
        self.requireFeature(NeedsGlobExpansionFeature)
 
219
        self.make_branch_and_tree('.')
 
220
        self.build_tree(['a1', 'a2', 'b', 'c33'])
 
221
        self.run_bzr(['add', 'a?', 'c*'])
 
222
        self.assertEquals(self.run_bzr('unknowns')[0], 'b\n')
 
223
 
 
224
    def test_add_with_wildcards_unicode(self):
 
225
        self.requireFeature(NeedsGlobExpansionFeature)
 
226
        self.make_branch_and_tree('.')
 
227
        self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
 
228
        self.run_bzr(['add', u'\u1234?', u'\u1235*'])
 
229
        self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')