/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_add.py

  • Committer: Robert Collins
  • Date: 2007-07-04 08:08:13 UTC
  • mfrom: (2572 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2587.
  • Revision ID: robertc@robertcollins.net-20070704080813-wzebx0r88fvwj5rq
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 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
26
26
        
27
27
    def test_add_reports(self):
28
28
        """add command prints the names of added files."""
29
 
        self.runbzr('init')
 
29
        self.run_bzr('init')
30
30
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
31
31
        self.build_tree_contents([('.bzrignore', 'CVS\n')])
32
 
        out = self.run_bzr_captured(['add'], retcode=0)[0]
 
32
        out = self.run_bzr(['add'], retcode=0)[0]
33
33
        # the ordering is not defined at the moment
34
34
        results = sorted(out.rstrip('\n').split('\n'))
35
35
        self.assertEquals(['If you wish to add some of these files, please'\
40
40
                           'added top.txt',
41
41
                           'ignored 1 file(s).'],
42
42
                          results)
43
 
        out = self.run_bzr_captured(['add', '-v'], retcode=0)[0]
 
43
        out = self.run_bzr(['add', '-v'], retcode=0)[0]
44
44
        results = sorted(out.rstrip('\n').split('\n'))
45
45
        self.assertEquals(['If you wish to add some of these files, please'\
46
46
                           ' add them by name.',
49
49
 
50
50
    def test_add_quiet_is(self):
51
51
        """add -q does not print the names of added files."""
52
 
        self.runbzr('init')
 
52
        self.run_bzr('init')
53
53
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
54
 
        out = self.run_bzr_captured(['add', '-q'], retcode=0)[0]
 
54
        out = self.run_bzr(['add', '-q'], retcode=0)[0]
55
55
        # the ordering is not defined at the moment
56
56
        results = sorted(out.rstrip('\n').split('\n'))
57
57
        self.assertEquals([''], results)
61
61
 
62
62
        "bzr add" should add the parent(s) as necessary.
63
63
        """
64
 
        self.runbzr('init')
 
64
        self.run_bzr('init')
65
65
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
66
 
        self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
67
 
        self.run_bzr('add', 'inertiatic/esp')
68
 
        self.assertEquals(self.capture('unknowns'), '')
 
66
        self.assertEquals(self.run_bzr(['unknowns'])[0], 'inertiatic\n')
 
67
        self.run_bzr('add inertiatic/esp')
 
68
        self.assertEquals(self.run_bzr(['unknowns'])[0], '')
69
69
 
70
70
        # Multiple unversioned parents
71
71
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
72
 
        self.assertEquals(self.capture('unknowns'), 'veil\n')
73
 
        self.run_bzr('add', 'veil/cerpin/taxt')
74
 
        self.assertEquals(self.capture('unknowns'), '')
 
72
        self.assertEquals(self.run_bzr(['unknowns'])[0], 'veil\n')
 
73
        self.run_bzr('add veil/cerpin/taxt')
 
74
        self.assertEquals(self.run_bzr(['unknowns'])[0], '')
75
75
 
76
76
        # Check whacky paths work
77
77
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
78
 
        self.assertEquals(self.capture('unknowns'), 'cicatriz\n')
79
 
        self.run_bzr('add', 'inertiatic/../cicatriz/esp')
80
 
        self.assertEquals(self.capture('unknowns'), '')
 
78
        self.assertEquals(self.run_bzr(['unknowns'])[0], 'cicatriz\n')
 
79
        self.run_bzr('add inertiatic/../cicatriz/esp')
 
80
        self.assertEquals(self.run_bzr(['unknowns'])[0], '')
81
81
 
82
82
    def test_add_in_versioned(self):
83
83
        """Try to add a file in a versioned directory.
84
84
 
85
85
        "bzr add" should do this happily.
86
86
        """
87
 
        self.runbzr('init')
 
87
        self.run_bzr('init')
88
88
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
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'), '')
 
89
        self.assertEquals(self.run_bzr(['unknowns'])[0], 'inertiatic\n')
 
90
        self.run_bzr('add --no-recurse inertiatic')
 
91
        self.assertEquals(self.run_bzr(['unknowns'])[0], 'inertiatic/esp\n')
 
92
        self.run_bzr('add inertiatic/esp')
 
93
        self.assertEquals(self.run_bzr(['unknowns'])[0], '')
94
94
 
95
95
    def test_subdir_add(self):
96
96
        """Add in subdirectory should add only things from there down"""
107
107
        eq(sorted(t.unknowns()),
108
108
           ['README', 'src'])
109
109
        
110
 
        self.run_bzr('add', 'src')
 
110
        self.run_bzr('add src')
111
111
        
112
112
        self.build_tree(['src/foo.c'])
113
113
        
 
114
        # add with no arguments in a subdirectory gets only files below that
 
115
        # subdirectory
114
116
        chdir('src')
115
117
        self.run_bzr('add')
116
 
        
117
 
        self.assertEquals(self.capture('unknowns'), 'README\n')
118
 
        eq(len(t.read_working_inventory()), 3)
 
118
        self.assertEquals(self.run_bzr(['unknowns'])[0], 'README\n')
 
119
        # reopen to see the new changes
 
120
        t = t.bzrdir.open_workingtree()
 
121
        versioned = [path for path, entry in t.iter_entries_by_dir()]
 
122
        self.assertEquals(versioned,
 
123
            ['', 'src', 'src/foo.c'])
119
124
                
 
125
        # add from the parent directory should pick up all file names
120
126
        chdir('..')
121
127
        self.run_bzr('add')
122
 
        self.assertEquals(self.capture('unknowns'), '')
 
128
        self.assertEquals(self.run_bzr(['unknowns'])[0], '')
123
129
        self.run_bzr('check')
124
130
 
125
131
    def test_add_missing(self):
126
132
        """bzr add foo where foo is missing should error."""
127
133
        self.make_branch_and_tree('.')
128
 
        self.run_bzr('add', 'missing-file', retcode=3)
 
134
        self.run_bzr('add missing-file', retcode=3)
129
135
 
130
136
    def test_add_from(self):
131
137
        base_tree = self.make_branch_and_tree('base')
137
143
        self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
138
144
 
139
145
        os.chdir('new')
140
 
        out, err = self.run_bzr('add', '--file-ids-from', '../base')
 
146
        out, err = self.run_bzr('add --file-ids-from ../base')
141
147
        self.assertEqual('', err)
142
148
        self.assertEqualDiff('added a w/ file id from a\n'
143
149
                             'added b w/ file id from b\n'
144
150
                             'added b/c w/ file id from b/c\n',
145
151
                             out)
146
 
 
147
 
        new_tree.read_working_inventory()
 
152
        new_tree = new_tree.bzrdir.open_workingtree()
148
153
        self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
149
154
        self.assertEqual(base_tree.path2id('b'), new_tree.path2id('b'))
150
155
        self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('b/c'))
159
164
        self.build_tree(['new/c', 'new/d'])
160
165
 
161
166
        os.chdir('new')
162
 
        out, err = self.run_bzr('add', '--file-ids-from', '../base/b')
 
167
        out, err = self.run_bzr('add --file-ids-from ../base/b')
163
168
        self.assertEqual('', err)
164
169
        self.assertEqualDiff('added c w/ file id from b/c\n'
165
170
                             'added d w/ file id from b/d\n',
166
171
                             out)
167
172
 
168
 
        new_tree.read_working_inventory()
 
173
        new_tree = new_tree.bzrdir.open_workingtree()
169
174
        self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
170
175
        self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
171
176
 
173
178
        # ensure that --dry-run actually don't add anything
174
179
        base_tree = self.make_branch_and_tree('.')
175
180
        self.build_tree(['spam'])
176
 
        out = self.run_bzr_captured(['add', '--dry-run'], retcode=0)[0]
 
181
        out = self.run_bzr(['add', '--dry-run'], retcode=0)[0]
177
182
        self.assertEquals('added spam\n', out)
178
 
        out = self.run_bzr_captured(['added'], retcode=0)[0]
 
183
        out = self.run_bzr(['added'], retcode=0)[0]
179
184
        self.assertEquals('', out)
 
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')