/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: Jelmer Vernooij
  • Date: 2009-02-25 15:36:48 UTC
  • mfrom: (4048 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4050.
  • Revision ID: jelmer@samba.org-20090225153648-7r5mk20nr9dttqbf
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
24
24
 
25
25
 
26
26
class TestAdd(ExternalBase):
27
 
        
 
27
 
28
28
    def test_add_reports(self):
29
29
        """add command prints the names of added files."""
30
30
        tree = self.make_branch_and_tree('.')
35
35
        results = sorted(out.rstrip('\n').split('\n'))
36
36
        self.assertEquals(['If you wish to add some of these files, please'\
37
37
                           ' add them by name.',
38
 
                           'added .bzrignore',
39
 
                           'added dir',
40
 
                           'added dir/sub.txt',
41
 
                           'added top.txt',
 
38
                           'add completed',
 
39
                           'adding .bzrignore',
 
40
                           'adding dir',
 
41
                           'adding dir/sub.txt',
 
42
                           'adding top.txt',
42
43
                           'ignored 1 file(s).'],
43
44
                          results)
44
45
        out = self.run_bzr('add -v')[0]
50
51
 
51
52
    def test_add_quiet_is(self):
52
53
        """add -q does not print the names of added files."""
53
 
        tree = self.make_branch_and_tree('.') 
 
54
        tree = self.make_branch_and_tree('.')
54
55
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
55
56
        out = self.run_bzr('add -q')[0]
56
57
        # the ordering is not defined at the moment
100
101
        eq = self.assertEqual
101
102
        ass = self.assertTrue
102
103
        chdir = os.chdir
103
 
        
 
104
 
104
105
        t = self.make_branch_and_tree('.')
105
106
        b = t.branch
106
107
        self.build_tree(['src/', 'README'])
107
 
        
 
108
 
108
109
        eq(sorted(t.unknowns()),
109
110
           ['README', 'src'])
110
 
        
 
111
 
111
112
        self.run_bzr('add src')
112
 
        
 
113
 
113
114
        self.build_tree(['src/foo.c'])
114
 
        
 
115
 
115
116
        # add with no arguments in a subdirectory gets only files below that
116
117
        # subdirectory
117
118
        chdir('src')
122
123
        versioned = [path for path, entry in t.iter_entries_by_dir()]
123
124
        self.assertEquals(versioned,
124
125
            ['', 'src', 'src/foo.c'])
125
 
                
 
126
 
126
127
        # add from the parent directory should pick up all file names
127
128
        chdir('..')
128
129
        self.run_bzr('add')
146
147
        os.chdir('new')
147
148
        out, err = self.run_bzr('add --file-ids-from ../base')
148
149
        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',
 
150
        self.assertEqualDiff('adding a w/ file id from a\n'
 
151
                             'adding b w/ file id from b\n'
 
152
                             'adding b/c w/ file id from b/c\n'
 
153
                             'add completed\n',
152
154
                             out)
153
155
        new_tree = new_tree.bzrdir.open_workingtree()
154
156
        self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
167
169
        os.chdir('new')
168
170
        out, err = self.run_bzr('add --file-ids-from ../base/b')
169
171
        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
        self.assertEqualDiff('adding c w/ file id from b/c\n'
 
173
                             'adding d w/ file id from b/d\n'
 
174
                             'add completed\n',
172
175
                             out)
173
176
 
174
177
        new_tree = new_tree.bzrdir.open_workingtree()