← 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: Mark Hammond
  • Date: 2009-01-12 01:55:34 UTC
  • mto: (3995.8.2 prepare-1.12)
  • mto: This revision was merged to the branch mainline in revision 4007.
  • Revision ID: mhammond@skippinet.com.au-20090112015534-yfxg50p7mpds9j4v
Include all .html files from the tortoise doc directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
#
17
17
 
18
18
"""Tests of the 'bzr add' command."""
19
19
 
20
20
import os
21
21
 
22
 
from bzrlib import osutils
23
 
from bzrlib.tests import (
24
 
    condition_isinstance,
25
 
    split_suite_by_condition,
26
 
    multiply_tests,
27
 
    SymlinkFeature
28
 
    )
29
22
from bzrlib.tests.blackbox import ExternalBase
30
 
 
31
 
 
32
 
def load_tests(standard_tests, module, loader):
33
 
    """Parameterize tests for view-aware vs not."""
34
 
    to_adapt, result = split_suite_by_condition(
35
 
        standard_tests, condition_isinstance(TestAdd))
36
 
    scenarios = [
37
 
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
38
 
        ('view-aware', {'branch_tree_format': 'development6-rich-root'}),
39
 
        ]
40
 
    return multiply_tests(to_adapt, scenarios, result)
 
23
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
41
24
 
42
25
 
43
26
class TestAdd(ExternalBase):
44
 
 
45
 
    def make_branch_and_tree(self, dir):
46
 
        return ExternalBase.make_branch_and_tree(self, dir,
47
 
            format=self.branch_tree_format)
48
 
 
 
27
        
49
28
    def test_add_reports(self):
50
29
        """add command prints the names of added files."""
51
30
        tree = self.make_branch_and_tree('.')
54
33
        out = self.run_bzr('add')[0]
55
34
        # the ordering is not defined at the moment
56
35
        results = sorted(out.rstrip('\n').split('\n'))
57
 
        self.assertEquals(['adding .bzrignore',
58
 
                           'adding dir',
59
 
                           'adding dir/sub.txt',
60
 
                           'adding top.txt'],
 
36
        self.assertEquals(['If you wish to add some of these files, please'\
 
37
                           ' add them by name.',
 
38
                           'added .bzrignore',
 
39
                           'added dir',
 
40
                           'added dir/sub.txt',
 
41
                           'added top.txt',
 
42
                           'ignored 1 file(s).'],
61
43
                          results)
62
44
        out = self.run_bzr('add -v')[0]
63
45
        results = sorted(out.rstrip('\n').split('\n'))
64
 
        self.assertEquals(['ignored CVS matching "CVS"'],
 
46
        self.assertEquals(['If you wish to add some of these files, please'\
 
47
                           ' add them by name.',
 
48
                           'ignored CVS matching "CVS"'],
65
49
                          results)
66
50
 
67
51
    def test_add_quiet_is(self):
68
52
        """add -q does not print the names of added files."""
69
 
        tree = self.make_branch_and_tree('.')
 
53
        tree = self.make_branch_and_tree('.') 
70
54
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
71
55
        out = self.run_bzr('add -q')[0]
72
56
        # the ordering is not defined at the moment
116
100
        eq = self.assertEqual
117
101
        ass = self.assertTrue
118
102
        chdir = os.chdir
119
 
 
 
103
        
120
104
        t = self.make_branch_and_tree('.')
121
105
        b = t.branch
122
106
        self.build_tree(['src/', 'README'])
123
 
 
 
107
        
124
108
        eq(sorted(t.unknowns()),
125
109
           ['README', 'src'])
126
 
 
 
110
        
127
111
        self.run_bzr('add src')
128
 
 
 
112
        
129
113
        self.build_tree(['src/foo.c'])
130
 
 
 
114
        
131
115
        # add with no arguments in a subdirectory gets only files below that
132
116
        # subdirectory
133
117
        chdir('src')
138
122
        versioned = [path for path, entry in t.iter_entries_by_dir()]
139
123
        self.assertEquals(versioned,
140
124
            ['', 'src', 'src/foo.c'])
141
 
 
 
125
                
142
126
        # add from the parent directory should pick up all file names
143
127
        chdir('..')
144
128
        self.run_bzr('add')
162
146
        os.chdir('new')
163
147
        out, err = self.run_bzr('add --file-ids-from ../base')
164
148
        self.assertEqual('', err)
165
 
        self.assertEqualDiff('adding a w/ file id from a\n'
166
 
                             'adding b w/ file id from b\n'
167
 
                             'adding b/c w/ file id from b/c\n',
 
149
        self.assertEqualDiff('added a w/ file id from a\n'
 
150
                             'added b w/ file id from b\n'
 
151
                             'added b/c w/ file id from b/c\n',
168
152
                             out)
169
153
        new_tree = new_tree.bzrdir.open_workingtree()
170
154
        self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
183
167
        os.chdir('new')
184
168
        out, err = self.run_bzr('add --file-ids-from ../base/b')
185
169
        self.assertEqual('', err)
186
 
        self.assertEqualDiff('adding c w/ file id from b/c\n'
187
 
                             'adding d w/ file id from b/d\n',
 
170
        self.assertEqualDiff('added c w/ file id from b/c\n'
 
171
                             'added d w/ file id from b/d\n',
188
172
                             out)
189
173
 
190
174
        new_tree = new_tree.bzrdir.open_workingtree()
210
194
        err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
211
195
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
212
196
 
213
 
    def test_add_via_symlink(self):
214
 
        self.requireFeature(SymlinkFeature)
215
 
        self.make_branch_and_tree('source')
216
 
        self.build_tree(['source/top.txt'])
217
 
        os.symlink('source', 'link')
218
 
        out = self.run_bzr(['add', 'link/top.txt'])[0]
219
 
        self.assertEquals(out, 'adding top.txt\n')
 
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')
220
203
 
221
 
    def test_add_symlink_to_abspath(self):
222
 
        self.requireFeature(SymlinkFeature)
223
 
        self.make_branch_and_tree('tree')
224
 
        os.symlink(osutils.abspath('target'), 'tree/link')
225
 
        out = self.run_bzr(['add', 'tree/link'])[0]
226
 
        self.assertEquals(out, 'adding link\n')
 
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')