← 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: Wouter van Heyst
  • Date: 2006-06-06 22:37:30 UTC
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: larstiq@larstiq.dyndns.org-20060606223730-a308c5429fc6c617
change branch.{get,set}_parent to store a relative path but return full urls

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 by 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
 
        self.build_tree_contents([('.bzrignore', 'CVS\n')])
33
 
        out = self.run_bzr('add')[0]
 
31
        out = self.run_bzr_captured(['add'], retcode=0)[0]
34
32
        # the ordering is not defined at the moment
35
33
        results = sorted(out.rstrip('\n').split('\n'))
36
34
        self.assertEquals(['If you wish to add some of these files, please'\
37
35
                           ' add them by name.',
38
 
                           'added .bzrignore',
39
36
                           'added dir',
40
37
                           'added dir/sub.txt',
41
38
                           'added top.txt',
42
39
                           'ignored 1 file(s).'],
43
40
                          results)
44
 
        out = self.run_bzr('add -v')[0]
 
41
        out = self.run_bzr_captured(['add', '-v'], retcode=0)[0]
45
42
        results = sorted(out.rstrip('\n').split('\n'))
46
43
        self.assertEquals(['If you wish to add some of these files, please'\
47
44
                           ' add them by name.',
50
47
 
51
48
    def test_add_quiet_is(self):
52
49
        """add -q does not print the names of added files."""
53
 
        tree = self.make_branch_and_tree('.') 
 
50
        self.runbzr('init')
54
51
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
55
 
        out = self.run_bzr('add -q')[0]
 
52
        out = self.run_bzr_captured(['add', '-q'], retcode=0)[0]
56
53
        # the ordering is not defined at the moment
57
54
        results = sorted(out.rstrip('\n').split('\n'))
58
55
        self.assertEquals([''], results)
62
59
 
63
60
        "bzr add" should add the parent(s) as necessary.
64
61
        """
65
 
        tree = self.make_branch_and_tree('.')
 
62
        self.runbzr('init')
66
63
        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], '')
 
64
        self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
 
65
        self.run_bzr('add', 'inertiatic/esp')
 
66
        self.assertEquals(self.capture('unknowns'), '')
70
67
 
71
68
        # Multiple unversioned parents
72
69
        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], '')
 
70
        self.assertEquals(self.capture('unknowns'), 'veil\n')
 
71
        self.run_bzr('add', 'veil/cerpin/taxt')
 
72
        self.assertEquals(self.capture('unknowns'), '')
76
73
 
77
74
        # Check whacky paths work
78
75
        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], '')
 
76
        self.assertEquals(self.capture('unknowns'), 'cicatriz\n')
 
77
        self.run_bzr('add', 'inertiatic/../cicatriz/esp')
 
78
        self.assertEquals(self.capture('unknowns'), '')
82
79
 
83
80
    def test_add_in_versioned(self):
84
81
        """Try to add a file in a versioned directory.
85
82
 
86
83
        "bzr add" should do this happily.
87
84
        """
88
 
        tree = self.make_branch_and_tree('.')
 
85
        self.runbzr('init')
89
86
        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], '')
 
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'), '')
95
92
 
96
93
    def test_subdir_add(self):
97
94
        """Add in subdirectory should add only things from there down"""
98
95
        from bzrlib.workingtree import WorkingTree
99
 
 
 
96
        
100
97
        eq = self.assertEqual
101
 
        ass = self.assertTrue
 
98
        ass = self.assert_
102
99
        chdir = os.chdir
103
100
        
104
101
        t = self.make_branch_and_tree('.')
108
105
        eq(sorted(t.unknowns()),
109
106
           ['README', 'src'])
110
107
        
111
 
        self.run_bzr('add src')
 
108
        self.run_bzr('add', 'src')
112
109
        
113
110
        self.build_tree(['src/foo.c'])
114
111
        
115
 
        # add with no arguments in a subdirectory gets only files below that
116
 
        # subdirectory
117
112
        chdir('src')
118
113
        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'])
 
114
        
 
115
        self.assertEquals(self.capture('unknowns'), 'README\n')
 
116
        eq(len(t.read_working_inventory()), 3)
125
117
                
126
 
        # add from the parent directory should pick up all file names
127
118
        chdir('..')
128
119
        self.run_bzr('add')
129
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
120
        self.assertEquals(self.capture('unknowns'), '')
130
121
        self.run_bzr('check')
131
 
 
132
 
    def test_add_missing(self):
133
 
        """bzr add foo where foo is missing should error."""
134
 
        self.make_branch_and_tree('.')
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')