46
self.assertEquals('modified:\n dir/file\n', self.run_bzr('status')[0])
46
self.assertEquals('modified:\n dir/file\n', self.capture('status'))
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',
51
51
self.run_bzr('init')
52
52
self.run_bzr('add')
53
self.run_bzr('commit -m 1')
53
self.run_bzr('commit', '-m', '1')
54
54
wt = WorkingTree.open('.')
55
55
wt.rename_one('a/b', 'f/b')
56
56
wt.rename_one('a/d/e', 'f/e')
84
84
self._prepare_tree()
85
self.run_bzr('checkout --lightweight . ../sprach')
86
self.run_bzr('commit -m more')
85
self.runbzr('checkout --lightweight . ../sprach')
86
self.runbzr('commit -m more')
87
87
os.chdir('../sprach')
88
self.assertEqual('', self.run_bzr('status')[0])
89
self.run_bzr('revert')
90
self.assertEqual('', self.run_bzr('status')[0])
88
self.assertEqual('', self.capture('status'))
90
self.assertEqual('', self.capture('status'))
92
92
def test_revert_dirname(self):
93
93
"""Test that revert DIRECTORY does what's expected"""
94
94
self._prepare_rename_mod_tree()
95
self.run_bzr('revert a')
95
self.run_bzr('revert', 'a')
96
96
self.failUnlessExists('a/b')
97
97
self.failUnlessExists('a/d')
98
98
self.failIfExists('a/g')
99
99
self.failUnlessExists('j')
100
100
self.failUnlessExists('h')
101
self.run_bzr('revert f')
101
self.run_bzr('revert', 'f')
102
102
self.failIfExists('j')
103
103
self.failIfExists('h')
104
104
self.failUnlessExists('a/d/e')
106
def test_revert_chatter(self):
107
self._prepare_rename_mod_tree()
108
chatter = self.run_bzr('revert')[1]
109
self.assertEqualDiff(
118
106
def test_revert(self):
119
107
self.run_bzr('init')
121
109
file('hello', 'wt').write('foo')
122
self.run_bzr('add hello')
123
self.run_bzr('commit -m setup hello')
110
self.run_bzr('add', 'hello')
111
self.run_bzr('commit', '-m', 'setup', 'hello')
125
113
file('goodbye', 'wt').write('baz')
126
self.run_bzr('add goodbye')
127
self.run_bzr('commit -m setup goodbye')
114
self.run_bzr('add', 'goodbye')
115
self.run_bzr('commit', '-m', 'setup', 'goodbye')
129
117
file('hello', 'wt').write('bar')
130
118
file('goodbye', 'wt').write('qux')
131
self.run_bzr('revert hello')
119
self.run_bzr('revert', 'hello')
132
120
self.check_file_contents('hello', 'foo')
133
121
self.check_file_contents('goodbye', 'qux')
134
122
self.run_bzr('revert')
135
123
self.check_file_contents('goodbye', 'baz')
137
125
os.mkdir('revertdir')
138
self.run_bzr('add revertdir')
139
self.run_bzr('commit -m f')
126
self.run_bzr('add', 'revertdir')
127
self.run_bzr('commit', '-m', 'f')
140
128
os.rmdir('revertdir')
141
129
self.run_bzr('revert')
143
131
if bzrlib.osutils.has_symlinks():
144
132
os.symlink('/unlikely/to/exist', 'symlink')
145
self.run_bzr('add symlink')
146
self.run_bzr('commit -m f')
133
self.run_bzr('add', 'symlink')
134
self.run_bzr('commit', '-m', 'f')
147
135
os.unlink('symlink')
148
136
self.run_bzr('revert')
149
137
self.failUnlessExists('symlink')
156
144
self.log("skipping revert symlink tests")
158
146
file('hello', 'wt').write('xyz')
159
self.run_bzr('commit -m xyz hello')
160
self.run_bzr('revert -r 1 hello')
147
self.run_bzr('commit', '-m', 'xyz', 'hello')
148
self.run_bzr('revert', '-r', '1', 'hello')
161
149
self.check_file_contents('hello', 'foo')
162
self.run_bzr('revert hello')
150
self.run_bzr('revert', 'hello')
163
151
self.check_file_contents('hello', 'xyz')
164
152
os.chdir('revertdir')
165
153
self.run_bzr('revert')
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'])
174
out, err = self.run_bzr('revert')
175
self.assertEqual('', out)
176
self.assertEqual('- file\n', err)
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'])
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)