← 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: Ian Clatworthy
  • Date: 2007-08-13 14:16:53 UTC
  • mto: (2733.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 2734.
  • Revision ID: ian.clatworthy@internode.on.net-20070813141653-3cbrp00xowq58zv1
Added mini tutorial

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_revert.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Black-box tests for bzr revert."""
18
18
 
19
19
import os
20
20
 
21
21
import bzrlib.osutils
22
 
from bzrlib.tests import TestCaseWithTransport
 
22
from bzrlib.tests.blackbox import ExternalBase
23
23
from bzrlib.trace import mutter
24
24
from bzrlib.workingtree import WorkingTree
25
25
 
26
26
 
27
 
class TestRevert(TestCaseWithTransport):
 
27
class TestRevert(ExternalBase):
28
28
 
29
29
    def _prepare_tree(self):
30
30
        self.run_bzr('init')
46
46
        self.assertEquals('modified:\n  dir/file\n', self.run_bzr('status')[0])
47
47
 
48
48
    def _prepare_rename_mod_tree(self):
49
 
        self.build_tree(['a/', 'a/b', 'a/c', 'a/d/', 'a/d/e', 'f/', 'f/g',
 
49
        self.build_tree(['a/', 'a/b', 'a/c', 'a/d/', 'a/d/e', 'f/', 'f/g', 
50
50
                         'f/h', 'f/i'])
51
51
        self.run_bzr('init')
52
52
        self.run_bzr('add')
93
93
        """Test that revert DIRECTORY does what's expected"""
94
94
        self._prepare_rename_mod_tree()
95
95
        self.run_bzr('revert a')
96
 
        self.assertPathExists('a/b')
97
 
        self.assertPathExists('a/d')
98
 
        self.assertPathDoesNotExist('a/g')
99
 
        self.expectFailure(
100
 
            "j is in the delta revert applies because j was renamed too",
101
 
            self.assertPathExists, 'j')
102
 
        self.assertPathExists('h')
 
96
        self.failUnlessExists('a/b')
 
97
        self.failUnlessExists('a/d')
 
98
        self.failIfExists('a/g')
 
99
        self.failUnlessExists('j')
 
100
        self.failUnlessExists('h')
103
101
        self.run_bzr('revert f')
104
 
        self.assertPathDoesNotExist('j')
105
 
        self.assertPathDoesNotExist('h')
106
 
        self.assertPathExists('a/d/e')
 
102
        self.failIfExists('j')
 
103
        self.failIfExists('h')
 
104
        self.failUnlessExists('a/d/e')
107
105
 
108
106
    def test_revert_chatter(self):
109
107
        self._prepare_rename_mod_tree()
120
118
    def test_revert(self):
121
119
        self.run_bzr('init')
122
120
 
123
 
        with file('hello', 'wt') as f: f.write('foo')
 
121
        file('hello', 'wt').write('foo')
124
122
        self.run_bzr('add hello')
125
123
        self.run_bzr('commit -m setup hello')
126
124
 
127
 
        with file('goodbye', 'wt') as f: f.write('baz')
 
125
        file('goodbye', 'wt').write('baz')
128
126
        self.run_bzr('add goodbye')
129
127
        self.run_bzr('commit -m setup goodbye')
130
128
 
131
 
        with file('hello', 'wt') as f: f.write('bar')
132
 
        with file('goodbye', 'wt') as f: f.write('qux')
 
129
        file('hello', 'wt').write('bar')
 
130
        file('goodbye', 'wt').write('qux')
133
131
        self.run_bzr('revert hello')
134
132
        self.check_file_contents('hello', 'foo')
135
133
        self.check_file_contents('goodbye', 'qux')
148
146
            self.run_bzr('commit -m f')
149
147
            os.unlink('symlink')
150
148
            self.run_bzr('revert')
151
 
            self.assertPathExists('symlink')
 
149
            self.failUnlessExists('symlink')
152
150
            os.unlink('symlink')
153
151
            os.symlink('a-different-path', 'symlink')
154
152
            self.run_bzr('revert')
156
154
                             os.readlink('symlink'))
157
155
        else:
158
156
            self.log("skipping revert symlink tests")
159
 
 
160
 
        with file('hello', 'wt') as f: f.write('xyz')
 
157
        
 
158
        file('hello', 'wt').write('xyz')
161
159
        self.run_bzr('commit -m xyz hello')
162
160
        self.run_bzr('revert -r 1 hello')
163
161
        self.check_file_contents('hello', 'foo')
188
186
        out, err = self.run_bzr('revert -r -2')
189
187
        self.assertEqual('', out)
190
188
        self.assertEqual('-D  file\n', err)
191
 
 
192
 
    def test_revert_forget_merges(self):
193
 
        # revert --forget-merges removes any pending merges into the tree, but
194
 
        # leaves the files unchanged
195
 
        tree = self.make_branch_and_tree('.')
196
 
        # forget-merges before first commit, though pointless, does not fail
197
 
        self.run_bzr(['revert', '--forget-merges'])
198
 
        self.build_tree(['file'])
199
 
        first_rev_id = tree.commit('initial commit')
200
 
        self.build_tree_contents([('file', 'new content')])
201
 
        existing_parents = tree.get_parent_ids()
202
 
        self.assertEquals([first_rev_id], existing_parents)
203
 
        merged_parents = existing_parents + ['merged-in-rev']
204
 
        tree.set_parent_ids(merged_parents)
205
 
        self.assertEquals(merged_parents, tree.get_parent_ids())
206
 
        self.run_bzr(['revert', '--forget-merges'])
207
 
        self.assertEquals([first_rev_id], tree.get_parent_ids())
208
 
        # changed files are not reverted
209
 
        self.assertFileEqual('new content', 'file')
210
 
        # you can give it the path of a tree
211
 
        self.run_bzr(['revert', '--forget-merges', tree.abspath('.')])