← 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: John Arbash Meinel
  • Date: 2006-10-11 23:08:27 UTC
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: john@arbash-meinel.com-20061011230827-2bdfc45020695281
Change Copyright .. by Canonical to Copyright ... Canonical

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