← 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: 2008-08-18 22:34:21 UTC
  • mto: (3606.5.6 1.6)
  • mto: This revision was merged to the branch mainline in revision 3641.
  • Revision ID: john@arbash-meinel.com-20080818223421-todjny24vj4faj4t
Add tests for the fetching behavior.

The proper parameter passed is 'unordered' add an assert for it, and
fix callers that were passing 'unsorted' instead.
Add tests that we make the right get_record_stream call based
on the value of _fetch_uses_deltas.
Fix the fetch request for signatures.

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) 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
20
20
import os
21
21
 
22
22
from bzrlib.tests.blackbox import ExternalBase
 
23
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
23
24
 
24
25
 
25
26
class TestAdd(ExternalBase):
26
27
        
27
28
    def test_add_reports(self):
28
29
        """add command prints the names of added files."""
29
 
        self.runbzr('init')
 
30
        tree = self.make_branch_and_tree('.')
30
31
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
31
 
        out = self.run_bzr_captured(['add'], retcode=0)[0]
 
32
        self.build_tree_contents([('.bzrignore', 'CVS\n')])
 
33
        out = self.run_bzr('add')[0]
32
34
        # the ordering is not defined at the moment
33
35
        results = sorted(out.rstrip('\n').split('\n'))
34
36
        self.assertEquals(['If you wish to add some of these files, please'\
35
37
                           ' add them by name.',
 
38
                           'added .bzrignore',
36
39
                           'added dir',
37
40
                           'added dir/sub.txt',
38
41
                           'added top.txt',
39
42
                           'ignored 1 file(s).'],
40
43
                          results)
41
 
        out = self.run_bzr_captured(['add', '-v'], retcode=0)[0]
 
44
        out = self.run_bzr('add -v')[0]
42
45
        results = sorted(out.rstrip('\n').split('\n'))
43
46
        self.assertEquals(['If you wish to add some of these files, please'\
44
47
                           ' add them by name.',
47
50
 
48
51
    def test_add_quiet_is(self):
49
52
        """add -q does not print the names of added files."""
50
 
        self.runbzr('init')
 
53
        tree = self.make_branch_and_tree('.') 
51
54
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
52
 
        out = self.run_bzr_captured(['add', '-q'], retcode=0)[0]
 
55
        out = self.run_bzr('add -q')[0]
53
56
        # the ordering is not defined at the moment
54
57
        results = sorted(out.rstrip('\n').split('\n'))
55
58
        self.assertEquals([''], results)
59
62
 
60
63
        "bzr add" should add the parent(s) as necessary.
61
64
        """
62
 
        self.runbzr('init')
 
65
        tree = self.make_branch_and_tree('.')
63
66
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
64
 
        self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
65
 
        self.run_bzr('add', 'inertiatic/esp')
66
 
        self.assertEquals(self.capture('unknowns'), '')
 
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], '')
67
70
 
68
71
        # Multiple unversioned parents
69
72
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
70
 
        self.assertEquals(self.capture('unknowns'), 'veil\n')
71
 
        self.run_bzr('add', 'veil/cerpin/taxt')
72
 
        self.assertEquals(self.capture('unknowns'), '')
 
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], '')
73
76
 
74
77
        # Check whacky paths work
75
78
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
76
 
        self.assertEquals(self.capture('unknowns'), 'cicatriz\n')
77
 
        self.run_bzr('add', 'inertiatic/../cicatriz/esp')
78
 
        self.assertEquals(self.capture('unknowns'), '')
 
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], '')
79
82
 
80
83
    def test_add_in_versioned(self):
81
84
        """Try to add a file in a versioned directory.
82
85
 
83
86
        "bzr add" should do this happily.
84
87
        """
85
 
        self.runbzr('init')
 
88
        tree = self.make_branch_and_tree('.')
86
89
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
87
 
        self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
88
 
        self.run_bzr('add', '--no-recurse', 'inertiatic')
89
 
        self.assertEquals(self.capture('unknowns'), 'inertiatic/esp\n')
90
 
        self.run_bzr('add', 'inertiatic/esp')
91
 
        self.assertEquals(self.capture('unknowns'), '')
 
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], '')
92
95
 
93
96
    def test_subdir_add(self):
94
97
        """Add in subdirectory should add only things from there down"""
95
98
        from bzrlib.workingtree import WorkingTree
96
 
        
 
99
 
97
100
        eq = self.assertEqual
98
 
        ass = self.assert_
 
101
        ass = self.assertTrue
99
102
        chdir = os.chdir
100
103
        
101
104
        t = self.make_branch_and_tree('.')
105
108
        eq(sorted(t.unknowns()),
106
109
           ['README', 'src'])
107
110
        
108
 
        self.run_bzr('add', 'src')
 
111
        self.run_bzr('add src')
109
112
        
110
113
        self.build_tree(['src/foo.c'])
111
114
        
 
115
        # add with no arguments in a subdirectory gets only files below that
 
116
        # subdirectory
112
117
        chdir('src')
113
118
        self.run_bzr('add')
114
 
        
115
 
        self.assertEquals(self.capture('unknowns'), 'README\n')
116
 
        eq(len(t.read_working_inventory()), 3)
 
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'])
117
125
                
 
126
        # add from the parent directory should pick up all file names
118
127
        chdir('..')
119
128
        self.run_bzr('add')
120
 
        self.assertEquals(self.capture('unknowns'), '')
 
129
        self.assertEquals(self.run_bzr('unknowns')[0], '')
121
130
        self.run_bzr('check')
122
131
 
123
132
    def test_add_missing(self):
124
133
        """bzr add foo where foo is missing should error."""
125
134
        self.make_branch_and_tree('.')
126
 
        self.run_bzr('add', 'missing-file', retcode=3)
 
135
        self.run_bzr('add missing-file', retcode=3)
 
136
 
 
137
    def test_add_from(self):
 
138
        base_tree = self.make_branch_and_tree('base')
 
139
        self.build_tree(['base/a', 'base/b/', 'base/b/c'])
 
140
        base_tree.add(['a', 'b', 'b/c'])
 
141
        base_tree.commit('foo')
 
142
 
 
143
        new_tree = self.make_branch_and_tree('new')
 
144
        self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
 
145
 
 
146
        os.chdir('new')
 
147
        out, err = self.run_bzr('add --file-ids-from ../base')
 
148
        self.assertEqual('', err)
 
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',
 
152
                             out)
 
153
        new_tree = new_tree.bzrdir.open_workingtree()
 
154
        self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
 
155
        self.assertEqual(base_tree.path2id('b'), new_tree.path2id('b'))
 
156
        self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('b/c'))
 
157
 
 
158
    def test_add_from_subdir(self):
 
159
        base_tree = self.make_branch_and_tree('base')
 
160
        self.build_tree(['base/a', 'base/b/', 'base/b/c', 'base/b/d'])
 
161
        base_tree.add(['a', 'b', 'b/c', 'b/d'])
 
162
        base_tree.commit('foo')
 
163
 
 
164
        new_tree = self.make_branch_and_tree('new')
 
165
        self.build_tree(['new/c', 'new/d'])
 
166
 
 
167
        os.chdir('new')
 
168
        out, err = self.run_bzr('add --file-ids-from ../base/b')
 
169
        self.assertEqual('', err)
 
170
        self.assertEqualDiff('added c w/ file id from b/c\n'
 
171
                             'added d w/ file id from b/d\n',
 
172
                             out)
 
173
 
 
174
        new_tree = new_tree.bzrdir.open_workingtree()
 
175
        self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
 
176
        self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
 
177
 
 
178
    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')