1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
|
# Copyright (C) 2005 by Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Black-box tests for bzr revert."""
import os
import bzrlib.osutils
from bzrlib.tests.blackbox import ExternalBase
from bzrlib.trace import mutter
class TestRevert(ExternalBase):
def _prepare_tree(self):
self.runbzr('init')
self.runbzr('mkdir dir')
f = file('dir/file', 'wb')
f.write('spam')
f.close()
self.runbzr('add dir/file')
self.runbzr('commit -m1')
# modify file
f = file('dir/file', 'wb')
f.write('eggs')
f.close()
# check status
self.assertEquals('modified:\n dir/file\n', self.capture('status'))
def helper(self, param=''):
self._prepare_tree()
# change dir
# revert to default revision for file in subdir does work
os.chdir('dir')
mutter('cd dir\n')
self.assertEquals('1\n', self.capture('revno'))
self.runbzr('revert %s file' % param)
self.assertEquals('spam', open('file', 'rb').read())
def test_revert_in_subdir(self):
self.helper()
def test_revert_to_revision_in_subdir(self):
# test case for bug #29424:
# revert to specific revision for file in subdir does not work
self.helper('-r 1')
def test_revert_in_checkout(self):
os.mkdir('brach')
os.chdir('brach')
self._prepare_tree()
self.runbzr('checkout --lightweight . ../sprach')
self.runbzr('commit -m more')
os.chdir('../sprach')
self.assertEqual('', self.capture('status'))
self.runbzr('revert')
self.assertEqual('', self.capture('status'))
def test_revert(self):
self.run_bzr('init')
file('hello', 'wt').write('foo')
self.run_bzr('add', 'hello')
self.run_bzr('commit', '-m', 'setup', 'hello')
file('goodbye', 'wt').write('baz')
self.run_bzr('add', 'goodbye')
self.run_bzr('commit', '-m', 'setup', 'goodbye')
file('hello', 'wt').write('bar')
file('goodbye', 'wt').write('qux')
self.run_bzr('revert', 'hello')
self.check_file_contents('hello', 'foo')
self.check_file_contents('goodbye', 'qux')
self.run_bzr('revert')
self.check_file_contents('goodbye', 'baz')
os.mkdir('revertdir')
self.run_bzr('add', 'revertdir')
self.run_bzr('commit', '-m', 'f')
os.rmdir('revertdir')
self.run_bzr('revert')
if bzrlib.osutils.has_symlinks():
os.symlink('/unlikely/to/exist', 'symlink')
self.run_bzr('add', 'symlink')
self.run_bzr('commit', '-m', 'f')
os.unlink('symlink')
self.run_bzr('revert')
self.failUnlessExists('symlink')
os.unlink('symlink')
os.symlink('a-different-path', 'symlink')
self.run_bzr('revert')
self.assertEqual('/unlikely/to/exist',
os.readlink('symlink'))
else:
self.log("skipping revert symlink tests")
file('hello', 'wt').write('xyz')
self.run_bzr('commit', '-m', 'xyz', 'hello')
self.run_bzr('revert', '-r', '1', 'hello')
self.check_file_contents('hello', 'foo')
self.run_bzr('revert', 'hello')
self.check_file_contents('hello', 'xyz')
os.chdir('revertdir')
self.run_bzr('revert')
os.chdir('..')
|