← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_revert.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_revert.py
1
 
# Copyright (C) 2005 by Canonical Ltd
 
1
# Copyright (C) 2005 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
27
27
class TestRevert(ExternalBase):
28
28
 
29
29
    def _prepare_tree(self):
30
 
        self.runbzr('init')
31
 
        self.runbzr('mkdir dir')
 
30
        self.run_bzr('init')
 
31
        self.run_bzr('mkdir dir')
32
32
 
33
33
        f = file('dir/file', 'wb')
34
34
        f.write('spam')
35
35
        f.close()
36
 
        self.runbzr('add dir/file')
 
36
        self.run_bzr('add dir/file')
37
37
 
38
 
        self.runbzr('commit -m1')
 
38
        self.run_bzr('commit -m1')
39
39
 
40
40
        # modify file
41
41
        f = file('dir/file', 'wb')
43
43
        f.close()
44
44
 
45
45
        # check status
46
 
        self.assertEquals('modified:\n  dir/file\n', self.capture('status'))
 
46
        self.assertEquals('modified:\n  dir/file\n', self.run_bzr(['status'])[0])
47
47
 
48
48
    def _prepare_rename_mod_tree(self):
49
49
        self.build_tree(['a/', 'a/b', 'a/c', 'a/d/', 'a/d/e', 'f/', 'f/g', 
66
66
        os.chdir('dir')
67
67
        mutter('cd dir\n')
68
68
 
69
 
        self.assertEquals('1\n', self.capture('revno'))
70
 
        self.runbzr('revert %s file' % param)
 
69
        self.assertEquals('1\n', self.run_bzr(['revno'])[0])
 
70
        self.run_bzr('revert %s file' % param)
71
71
        self.assertEquals('spam', open('file', 'rb').read())
72
72
 
73
73
    def test_revert_in_subdir(self):
82
82
        os.mkdir('brach')
83
83
        os.chdir('brach')
84
84
        self._prepare_tree()
85
 
        self.runbzr('checkout --lightweight . ../sprach')
86
 
        self.runbzr('commit -m more')
 
85
        self.run_bzr('checkout --lightweight . ../sprach')
 
86
        self.run_bzr('commit -m more')
87
87
        os.chdir('../sprach')
88
 
        self.assertEqual('', self.capture('status'))
89
 
        self.runbzr('revert')
90
 
        self.assertEqual('', self.capture('status'))
 
88
        self.assertEqual('', self.run_bzr(['status'])[0])
 
89
        self.run_bzr('revert')
 
90
        self.assertEqual('', self.run_bzr(['status'])[0])
91
91
 
92
92
    def test_revert_dirname(self):
93
93
        """Test that revert DIRECTORY does what's expected"""
103
103
        self.failIfExists('h')
104
104
        self.failUnlessExists('a/d/e')
105
105
 
 
106
    def test_revert_chatter(self):
 
107
        self._prepare_rename_mod_tree()
 
108
        chatter = self.run_bzr('revert')[1]
 
109
        self.assertEqualDiff(
 
110
            'R   a/g => f/g\n'
 
111
            'R   h => f/h\n'
 
112
            'R   j/ => f/\n'
 
113
            'R   j/b => a/b\n'
 
114
            'R   j/d/ => a/d/\n'
 
115
            'R   j/e => a/d/e\n',
 
116
            chatter)
 
117
 
106
118
    def test_revert(self):
107
119
        self.run_bzr('init')
108
120
 
153
165
        self.run_bzr('revert')
154
166
        os.chdir('..')
155
167
 
 
168
    def test_revert_newly_added(self):
 
169
        # this tests the UI reports reverting a newly added file
 
170
        # correct (such files are not deleted)
 
171
        tree = self.make_branch_and_tree('.')
 
172
        self.build_tree(['file'])
 
173
        tree.add(['file'])
 
174
        out, err = self.run_bzr('revert')
 
175
        self.assertEqual('', out)
 
176
        self.assertEqual('-   file\n', err)
 
177
 
 
178
    def test_revert_removing_file(self):
 
179
        # this tests the UI reports reverting a file which has been committed
 
180
        # to a revision that did not have it, reports it as being deleted.
 
181
        tree = self.make_branch_and_tree('.')
 
182
        tree.commit('empty commit')
 
183
        self.build_tree(['file'])
 
184
        tree.add(['file'])
 
185
        tree.commit('add file')
 
186
        out, err = self.run_bzr('revert', '-r', '-2')
 
187
        self.assertEqual('', out)
 
188
        self.assertEqual('-D  file\n', err)