← 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: Ian Clatworthy
  • Date: 2007-12-07 05:31:54 UTC
  • mto: (3092.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3093.
  • Revision ID: ian.clatworthy@internode.on.net-20071207053154-k9tmyczcf8niwonm
fix efficiency of local commit detection as recommended by jameinel's review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010, 2011 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 (
23
 
    osutils,
24
 
    tests,
25
 
    )
26
 
from bzrlib.tests import (
27
 
    features,
28
 
    script,
29
 
    )
30
 
from bzrlib.tests.scenarios import load_tests_apply_scenarios
31
 
 
32
 
 
33
 
load_tests = load_tests_apply_scenarios
34
 
 
35
 
 
36
 
class TestAdd(tests.TestCaseWithTransport):
37
 
 
38
 
    scenarios = [
39
 
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
40
 
        ('view-aware', {'branch_tree_format': '2a'}),
41
 
        ]
42
 
 
43
 
    def make_branch_and_tree(self, dir):
44
 
        return super(TestAdd, self).make_branch_and_tree(
45
 
            dir, format=self.branch_tree_format)
46
 
 
 
22
from bzrlib.tests.blackbox import ExternalBase
 
23
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
 
24
 
 
25
 
 
26
class TestAdd(ExternalBase):
 
27
        
47
28
    def test_add_reports(self):
48
29
        """add command prints the names of added files."""
49
30
        tree = self.make_branch_and_tree('.')
52
33
        out = self.run_bzr('add')[0]
53
34
        # the ordering is not defined at the moment
54
35
        results = sorted(out.rstrip('\n').split('\n'))
55
 
        self.assertEquals(['adding .bzrignore',
56
 
                           'adding dir',
57
 
                           'adding dir/sub.txt',
58
 
                           '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).'],
59
43
                          results)
60
44
        out = self.run_bzr('add -v')[0]
61
45
        results = sorted(out.rstrip('\n').split('\n'))
62
 
        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"'],
63
49
                          results)
64
50
 
65
51
    def test_add_quiet_is(self):
66
52
        """add -q does not print the names of added files."""
67
 
        tree = self.make_branch_and_tree('.')
 
53
        tree = self.make_branch_and_tree('.') 
68
54
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
69
55
        out = self.run_bzr('add -q')[0]
70
56
        # the ordering is not defined at the moment
113
99
 
114
100
        eq = self.assertEqual
115
101
        ass = self.assertTrue
116
 
 
 
102
        chdir = os.chdir
 
103
        
117
104
        t = self.make_branch_and_tree('.')
118
105
        b = t.branch
119
106
        self.build_tree(['src/', 'README'])
120
 
 
 
107
        
121
108
        eq(sorted(t.unknowns()),
122
109
           ['README', 'src'])
123
 
 
 
110
        
124
111
        self.run_bzr('add src')
125
 
 
 
112
        
126
113
        self.build_tree(['src/foo.c'])
127
 
 
 
114
        
128
115
        # add with no arguments in a subdirectory gets only files below that
129
116
        # subdirectory
130
 
        self.run_bzr('add', working_dir='src')
131
 
        self.assertEquals('README\n',
132
 
                          self.run_bzr('unknowns', working_dir='src')[0])
 
117
        chdir('src')
 
118
        self.run_bzr('add')
 
119
        self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
133
120
        # reopen to see the new changes
134
 
        t = t.bzrdir.open_workingtree('src')
 
121
        t = t.bzrdir.open_workingtree()
135
122
        versioned = [path for path, entry in t.iter_entries_by_dir()]
136
 
        self.assertEquals(versioned, ['', 'src', 'src/foo.c'])
137
 
 
 
123
        self.assertEquals(versioned,
 
124
            ['', 'src', 'src/foo.c'])
 
125
                
138
126
        # add from the parent directory should pick up all file names
 
127
        chdir('..')
139
128
        self.run_bzr('add')
140
129
        self.assertEquals(self.run_bzr('unknowns')[0], '')
141
130
        self.run_bzr('check')
157
146
        os.chdir('new')
158
147
        out, err = self.run_bzr('add --file-ids-from ../base')
159
148
        self.assertEqual('', err)
160
 
        self.assertEqualDiff('adding a w/ file id from a\n'
161
 
                             'adding b w/ file id from b\n'
162
 
                             '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',
163
152
                             out)
164
153
        new_tree = new_tree.bzrdir.open_workingtree()
165
154
        self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
178
167
        os.chdir('new')
179
168
        out, err = self.run_bzr('add --file-ids-from ../base/b')
180
169
        self.assertEqual('', err)
181
 
        self.assertEqualDiff('adding c w/ file id from b/c\n'
182
 
                             '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',
183
172
                             out)
184
173
 
185
174
        new_tree = new_tree.bzrdir.open_workingtree()
205
194
        err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
206
195
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
207
196
 
208
 
    def test_add_via_symlink(self):
209
 
        self.requireFeature(features.SymlinkFeature)
210
 
        self.make_branch_and_tree('source')
211
 
        self.build_tree(['source/top.txt'])
212
 
        os.symlink('source', 'link')
213
 
        out = self.run_bzr(['add', 'link/top.txt'])[0]
214
 
        self.assertEquals(out, 'adding top.txt\n')
215
 
 
216
 
    def test_add_symlink_to_abspath(self):
217
 
        self.requireFeature(features.SymlinkFeature)
218
 
        self.make_branch_and_tree('tree')
219
 
        os.symlink(osutils.abspath('target'), 'tree/link')
220
 
        out = self.run_bzr(['add', 'tree/link'])[0]
221
 
        self.assertEquals(out, 'adding link\n')
222
 
 
223
 
    def test_add_not_child(self):
224
 
        # https://bugs.launchpad.net/bzr/+bug/98735
225
 
        sr = script.ScriptRunner()
226
 
        self.make_branch_and_tree('tree1')
227
 
        self.make_branch_and_tree('tree2')
228
 
        self.build_tree(['tree1/a', 'tree2/b'])
229
 
        sr.run_script(self, '''
230
 
        $ bzr add tree1/a tree2/b
231
 
        2>bzr: ERROR: Path "...tree2/b" is not a child of path "...tree1"
232
 
        ''')
233
 
 
234
 
    def test_add_multiple_files_in_unicode_cwd(self):
235
 
        """Adding multiple files in a non-ascii cwd, see lp:686611"""
236
 
        self.requireFeature(features.UnicodeFilenameFeature)
237
 
        self.make_branch_and_tree(u"\xA7")
238
 
        self.build_tree([u"\xA7/a", u"\xA7/b"])
239
 
        out, err = self.run_bzr(["add", "a", "b"], working_dir=u"\xA7")
240
 
        self.assertEquals(out, "adding a\n" "adding b\n")
241
 
        self.assertEquals(err, "")
 
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')