/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2010-05-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

Show diffs side-by-side

added added

removed removed

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