← 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: Aaron Bentley
  • Date: 2007-02-06 14:52:16 UTC
  • mfrom: (2266 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2268.
  • Revision ID: abentley@panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
Merge bzr.dev

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