/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_revert.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

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, 2011, 2016 Canonical Ltd
 
1
# Copyright (C) 2005, 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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
"""Black-box tests for brz revert."""
 
17
"""Black-box tests for bzr revert."""
18
18
 
19
19
import os
20
20
 
21
 
import breezy.osutils
22
 
from breezy.tests import TestCaseWithTransport
23
 
from breezy.trace import mutter
24
 
from breezy.workingtree import WorkingTree
25
 
 
26
 
 
27
 
class TestRevert(TestCaseWithTransport):
 
21
import bzrlib.osutils
 
22
from bzrlib.tests.blackbox import ExternalBase
 
23
from bzrlib.trace import mutter
 
24
from bzrlib.workingtree import WorkingTree
 
25
 
 
26
 
 
27
class TestRevert(ExternalBase):
28
28
 
29
29
    def _prepare_tree(self):
30
30
        self.run_bzr('init')
31
31
        self.run_bzr('mkdir dir')
32
32
 
33
 
        with open('dir/file', 'wb') as f:
34
 
            f.write(b'spam')
 
33
        f = file('dir/file', 'wb')
 
34
        f.write('spam')
 
35
        f.close()
35
36
        self.run_bzr('add dir/file')
36
37
 
37
38
        self.run_bzr('commit -m1')
38
39
 
39
40
        # modify file
40
 
        with open('dir/file', 'wb') as f:
41
 
            f.write(b'eggs')
 
41
        f = file('dir/file', 'wb')
 
42
        f.write('eggs')
 
43
        f.close()
42
44
 
43
45
        # check status
44
 
        self.assertEqual('modified:\n  dir/file\n', self.run_bzr('status')[0])
 
46
        self.assertEquals('modified:\n  dir/file\n', self.run_bzr('status')[0])
45
47
 
46
48
    def _prepare_rename_mod_tree(self):
47
49
        self.build_tree(['a/', 'a/b', 'a/c', 'a/d/', 'a/d/e', 'f/', 'f/g',
64
66
        os.chdir('dir')
65
67
        mutter('cd dir\n')
66
68
 
67
 
        self.assertEqual('1\n', self.run_bzr('revno')[0])
 
69
        self.assertEquals('1\n', self.run_bzr('revno')[0])
68
70
        self.run_bzr('revert %s file' % param)
69
 
        with open('file', 'rb') as f:
70
 
            self.assertEqual(b'spam', f.read())
 
71
        self.assertEquals('spam', open('file', 'rb').read())
71
72
 
72
73
    def test_revert_in_subdir(self):
73
74
        self.helper()
92
93
        """Test that revert DIRECTORY does what's expected"""
93
94
        self._prepare_rename_mod_tree()
94
95
        self.run_bzr('revert a')
95
 
        self.assertPathExists('a/b')
96
 
        self.assertPathExists('a/d')
97
 
        self.assertPathDoesNotExist('a/g')
 
96
        self.failUnlessExists('a/b')
 
97
        self.failUnlessExists('a/d')
 
98
        self.failIfExists('a/g')
98
99
        self.expectFailure(
99
100
            "j is in the delta revert applies because j was renamed too",
100
 
            self.assertPathExists, 'j')
101
 
        self.assertPathExists('h')
 
101
            self.failUnlessExists, 'j')
 
102
        self.failUnlessExists('h')
102
103
        self.run_bzr('revert f')
103
 
        self.assertPathDoesNotExist('j')
104
 
        self.assertPathDoesNotExist('h')
105
 
        self.assertPathExists('a/d/e')
 
104
        self.failIfExists('j')
 
105
        self.failIfExists('h')
 
106
        self.failUnlessExists('a/d/e')
106
107
 
107
108
    def test_revert_chatter(self):
108
109
        self._prepare_rename_mod_tree()
119
120
    def test_revert(self):
120
121
        self.run_bzr('init')
121
122
 
122
 
        with open('hello', 'wt') as f:
123
 
            f.write('foo')
 
123
        file('hello', 'wt').write('foo')
124
124
        self.run_bzr('add hello')
125
125
        self.run_bzr('commit -m setup hello')
126
126
 
127
 
        with open('goodbye', 'wt') as f:
128
 
            f.write('baz')
 
127
        file('goodbye', 'wt').write('baz')
129
128
        self.run_bzr('add goodbye')
130
129
        self.run_bzr('commit -m setup goodbye')
131
130
 
132
 
        with open('hello', 'wt') as f:
133
 
            f.write('bar')
134
 
        with open('goodbye', 'wt') as f:
135
 
            f.write('qux')
 
131
        file('hello', 'wt').write('bar')
 
132
        file('goodbye', 'wt').write('qux')
136
133
        self.run_bzr('revert hello')
137
 
        self.check_file_contents('hello', b'foo')
138
 
        self.check_file_contents('goodbye', b'qux')
 
134
        self.check_file_contents('hello', 'foo')
 
135
        self.check_file_contents('goodbye', 'qux')
139
136
        self.run_bzr('revert')
140
 
        self.check_file_contents('goodbye', b'baz')
 
137
        self.check_file_contents('goodbye', 'baz')
141
138
 
142
139
        os.mkdir('revertdir')
143
140
        self.run_bzr('add revertdir')
145
142
        os.rmdir('revertdir')
146
143
        self.run_bzr('revert')
147
144
 
148
 
        if breezy.osutils.has_symlinks():
 
145
        if bzrlib.osutils.has_symlinks():
149
146
            os.symlink('/unlikely/to/exist', 'symlink')
150
147
            self.run_bzr('add symlink')
151
148
            self.run_bzr('commit -m f')
152
149
            os.unlink('symlink')
153
150
            self.run_bzr('revert')
154
 
            self.assertPathExists('symlink')
 
151
            self.failUnlessExists('symlink')
155
152
            os.unlink('symlink')
156
153
            os.symlink('a-different-path', 'symlink')
157
154
            self.run_bzr('revert')
160
157
        else:
161
158
            self.log("skipping revert symlink tests")
162
159
 
163
 
        with open('hello', 'wt') as f:
164
 
            f.write('xyz')
 
160
        file('hello', 'wt').write('xyz')
165
161
        self.run_bzr('commit -m xyz hello')
166
162
        self.run_bzr('revert -r 1 hello')
167
 
        self.check_file_contents('hello', b'foo')
 
163
        self.check_file_contents('hello', 'foo')
168
164
        self.run_bzr('revert hello')
169
 
        self.check_file_contents('hello', b'xyz')
 
165
        self.check_file_contents('hello', 'xyz')
170
166
        os.chdir('revertdir')
171
167
        self.run_bzr('revert')
172
168
        os.chdir('..')
201
197
        self.run_bzr(['revert', '--forget-merges'])
202
198
        self.build_tree(['file'])
203
199
        first_rev_id = tree.commit('initial commit')
204
 
        self.build_tree_contents([('file', b'new content')])
 
200
        self.build_tree_contents([('file', 'new content')])
205
201
        existing_parents = tree.get_parent_ids()
206
 
        self.assertEqual([first_rev_id], existing_parents)
207
 
        merged_parents = existing_parents + [b'merged-in-rev']
 
202
        self.assertEquals([first_rev_id], existing_parents)
 
203
        merged_parents = existing_parents + ['merged-in-rev']
208
204
        tree.set_parent_ids(merged_parents)
209
 
        self.assertEqual(merged_parents, tree.get_parent_ids())
 
205
        self.assertEquals(merged_parents, tree.get_parent_ids())
210
206
        self.run_bzr(['revert', '--forget-merges'])
211
 
        self.assertEqual([first_rev_id], tree.get_parent_ids())
 
207
        self.assertEquals([first_rev_id], tree.get_parent_ids())
212
208
        # changed files are not reverted
213
 
        self.assertFileEqual(b'new content', 'file')
 
209
        self.assertFileEqual('new content', 'file')
214
210
        # you can give it the path of a tree
215
211
        self.run_bzr(['revert', '--forget-merges', tree.abspath('.')])