25
from bzrlib import workingtree
26
25
from bzrlib.branch import Branch
27
from bzrlib.tests import TestSkipped
26
from bzrlib.clone import copy_branch
28
27
from bzrlib.tests.blackbox import ExternalBase
31
def subst_dates(string):
32
"""Replace date strings with constant values."""
33
return re.sub(r'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [-\+]\d{4}',
34
'YYYY-MM-DD HH:MM:SS +ZZZZ', string)
37
class DiffBase(ExternalBase):
38
"""Base class with common setup method"""
40
def make_example_branch(self):
41
tree = self.make_branch_and_tree('.')
42
self.build_tree_contents([
44
('goodbye', 'baz\n')])
52
class TestDiff(DiffBase):
30
class TestDiff(ExternalBase):
31
def example_branch(test):
32
# FIXME: copied from test_too_much -- share elsewhere?
34
file('hello', 'wt').write('foo')
35
test.runbzr('add hello')
36
test.runbzr('commit -m setup hello')
37
file('goodbye', 'wt').write('baz')
38
test.runbzr('add goodbye')
39
test.runbzr('commit -m setup goodbye')
54
41
def test_diff(self):
55
tree = self.make_example_branch()
56
self.build_tree_contents([('hello', 'hello world!')])
57
tree.commit(message='fixing hello')
58
output = self.run_bzr('diff -r 2..3', retcode=1)[0]
59
self.assert_('\n+hello world!' in output)
60
output = self.run_bzr('diff -c 3', retcode=1)[0]
61
self.assert_('\n+hello world!' in output)
62
output = self.run_bzr('diff -r last:3..last:1', retcode=1)[0]
63
self.assert_('\n+baz' in output)
64
output = self.run_bzr('diff -c last:2', retcode=1)[0]
65
self.assert_('\n+baz' in output)
66
self.build_tree(['moo'])
43
file('hello', 'wt').write('hello world!')
44
self.runbzr('commit -m fixing hello')
45
output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
46
self.assert_('\n+hello world!' in output)
47
output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
48
self.assert_('\n+baz' in output)
49
file('moo', 'wb').write('moo')
50
self.runbzr('add moo')
71
def test_diff_prefix(self):
72
"""diff --prefix appends to filenames in output"""
73
self.make_example_branch()
74
self.build_tree_contents([('hello', 'hello world!\n')])
75
out, err = self.run_bzr('diff --prefix old/:new/', retcode=1)
76
self.assertEquals(err, '')
77
self.assertEqualDiff(subst_dates(out), '''\
78
=== modified file 'hello'
79
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
80
+++ new/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
87
def test_diff_illegal_prefix_value(self):
88
# There was an error in error reporting for this option
89
out, err = self.run_bzr('diff --prefix old/', retcode=3)
90
self.assertContainsRe(err,
91
'--prefix expects two values separated by a colon')
93
def test_diff_p1(self):
94
"""diff -p1 produces lkml-style diffs"""
95
self.make_example_branch()
96
self.build_tree_contents([('hello', 'hello world!\n')])
97
out, err = self.run_bzr('diff -p1', retcode=1)
98
self.assertEquals(err, '')
99
self.assertEqualDiff(subst_dates(out), '''\
100
=== modified file 'hello'
101
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
102
+++ new/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
109
def test_diff_p0(self):
110
"""diff -p0 produces diffs with no prefix"""
111
self.make_example_branch()
112
self.build_tree_contents([('hello', 'hello world!\n')])
113
out, err = self.run_bzr('diff -p0', retcode=1)
114
self.assertEquals(err, '')
115
self.assertEqualDiff(subst_dates(out), '''\
116
=== modified file 'hello'
117
--- hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
118
+++ hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
125
def test_diff_nonexistent(self):
126
# Get an error from a file that does not exist at all
128
self.make_example_branch()
129
out, err = self.run_bzr('diff does-not-exist', retcode=3)
130
self.assertContainsRe(err, 'not versioned.*does-not-exist')
132
def test_diff_illegal_revision_specifiers(self):
133
out, err = self.run_bzr('diff -r 1..23..123', retcode=3)
134
self.assertContainsRe(err, 'one or two revision specifiers')
136
def test_diff_unversioned(self):
137
# Get an error when diffing a non-versioned file.
139
self.make_example_branch()
140
self.build_tree(['unversioned-file'])
141
out, err = self.run_bzr('diff unversioned-file', retcode=3)
142
self.assertContainsRe(err, 'not versioned.*unversioned-file')
144
# TODO: What should diff say for a file deleted in working tree?
146
def example_branches(self):
147
branch1_tree = self.make_branch_and_tree('branch1')
148
self.build_tree(['branch1/file'], line_endings='binary')
149
branch1_tree.add('file')
150
branch1_tree.commit(message='add file')
151
branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
152
self.build_tree_contents([('branch2/file', 'new content\n')])
153
branch2_tree.commit(message='update file')
154
return branch1_tree, branch2_tree
156
54
def test_diff_branches(self):
157
self.example_branches()
55
self.build_tree(['branch1/', 'branch1/file', 'branch2/'], line_endings='binary')
56
branch = Branch.initialize('branch1')
57
branch.working_tree().add(['file'])
58
branch.working_tree().commit('add file')
59
copy_branch(branch, 'branch2')
60
print >> open('branch2/file', 'wb'), 'new content'
61
branch2 = Branch.open('branch2')
62
branch2.working_tree().commit('update file')
158
63
# should open branch1 and diff against branch2,
159
out, err = self.run_bzr('diff -r branch:branch2 branch1',
161
self.assertEquals('', err)
162
self.assertEquals("=== modified file 'file'\n"
163
"--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
164
"+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
167
"+contents of branch1/file\n"
168
"\n", subst_dates(out))
169
out, err = self.run_bzr('diff branch2 branch1',
171
self.assertEquals('', err)
172
self.assertEqualDiff("=== modified file 'file'\n"
173
"--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
174
"+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
177
"+contents of branch1/file\n"
178
"\n", subst_dates(out))
180
def test_diff_revno_branches(self):
181
self.example_branches()
182
branch2_tree = workingtree.WorkingTree.open_containing('branch2')[0]
183
self.build_tree_contents([('branch2/file', 'even newer content')])
184
branch2_tree.commit(message='update file once more')
186
out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
188
self.assertEquals('', err)
189
self.assertEquals('', out)
190
out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
192
self.assertEquals('', err)
193
self.assertEqualDiff("=== modified file 'file'\n"
194
"--- file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
195
"+++ file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
198
"+contents of branch1/file\n"
199
"\n", subst_dates(out))
201
def example_branch2(self):
202
branch1_tree = self.make_branch_and_tree('branch1')
203
self.build_tree_contents([('branch1/file1', 'original line\n')])
204
branch1_tree.add('file1')
205
branch1_tree.commit(message='first commit')
206
self.build_tree_contents([('branch1/file1', 'repo line\n')])
207
branch1_tree.commit(message='second commit')
64
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2',
67
self.assertEquals(("=== modified file 'file'\n"
72
"+contents of branch1/file\n"
74
output = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
76
self.assertEqualDiff(("=== modified file 'file'\n"
81
"+contents of branch1/file\n"
210
84
def test_diff_to_working_tree(self):
211
self.example_branch2()
212
self.build_tree_contents([('branch1/file1', 'new line')])
213
output = self.run_bzr('diff -r 1.. branch1', retcode=1)
214
self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
216
def test_diff_across_rename(self):
217
"""The working tree path should always be considered for diffing"""
218
tree = self.make_example_branch()
219
self.run_bzr('diff -r 0..1 hello', retcode=1)
220
tree.rename_one('hello', 'hello1')
221
self.run_bzr('diff hello1', retcode=1)
222
self.run_bzr('diff -r 0..1 hello1', retcode=1)
225
class TestCheckoutDiff(TestDiff):
227
def make_example_branch(self):
228
tree = super(TestCheckoutDiff, self).make_example_branch()
229
tree = tree.branch.create_checkout('checkout')
233
def example_branch2(self):
234
tree = super(TestCheckoutDiff, self).example_branch2()
235
os.mkdir('checkouts')
236
tree = tree.branch.create_checkout('checkouts/branch1')
237
os.chdir('checkouts')
240
def example_branches(self):
241
branch1_tree, branch2_tree = super(TestCheckoutDiff, self).example_branches()
242
os.mkdir('checkouts')
243
branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
244
branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
245
os.chdir('checkouts')
246
return branch1_tree, branch2_tree
249
class TestDiffLabels(DiffBase):
251
def test_diff_label_removed(self):
252
tree = super(TestDiffLabels, self).make_example_branch()
253
tree.remove('hello', keep_files=False)
254
diff = self.run_bzr('diff', retcode=1)
255
self.assertTrue("=== removed file 'hello'" in diff[0])
257
def test_diff_label_added(self):
258
tree = super(TestDiffLabels, self).make_example_branch()
259
self.build_tree_contents([('barbar', 'barbar')])
261
diff = self.run_bzr('diff', retcode=1)
262
self.assertTrue("=== added file 'barbar'" in diff[0])
264
def test_diff_label_modified(self):
265
super(TestDiffLabels, self).make_example_branch()
266
self.build_tree_contents([('hello', 'barbar')])
267
diff = self.run_bzr('diff', retcode=1)
268
self.assertTrue("=== modified file 'hello'" in diff[0])
270
def test_diff_label_renamed(self):
271
tree = super(TestDiffLabels, self).make_example_branch()
272
tree.rename_one('hello', 'gruezi')
273
diff = self.run_bzr('diff', retcode=1)
274
self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])
277
class TestExternalDiff(DiffBase):
279
def test_external_diff(self):
280
"""Test that we can spawn an external diff process"""
281
# We have to use run_bzr_subprocess, because we need to
282
# test writing directly to stdout, (there was a bug in
283
# subprocess.py that we had to workaround).
284
# However, if 'diff' may not be available
285
self.make_example_branch()
286
orig_progress = os.environ.get('BZR_PROGRESS_BAR')
288
os.environ['BZR_PROGRESS_BAR'] = 'none'
289
out, err = self.run_bzr_subprocess('diff -r 1 --diff-options -ub',
290
universal_newlines=True,
293
if orig_progress is None:
294
del os.environ['BZR_PROGRESS_BAR']
296
os.environ['BZR_PROGRESS_BAR'] = orig_progress
298
if 'Diff is not installed on this machine' in err:
299
raise TestSkipped("No external 'diff' is available")
300
self.assertEqual('', err)
301
# We have to skip the stuff in the middle, because it depends
303
self.assertStartsWith(out, "=== added file 'goodbye'\n"
304
"--- goodbye\t1970-01-01 00:00:00 +0000\n"
306
self.assertEndsWith(out, "\n@@ -0,0 +1 @@\n"
310
class TestDiffOutput(DiffBase):
312
def test_diff_output(self):
313
# check that output doesn't mangle line-endings
314
self.make_example_branch()
315
self.build_tree_contents([('hello', 'hello world!\n')])
316
output = self.run_bzr_subprocess('diff', retcode=1)[0]
317
self.assert_('\n+hello world!\n' in output)
85
self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')
86
branch = Branch.initialize('branch1')
87
branch.working_tree().add(['file1'])
88
print >> open('branch1/file1', 'wb'), 'original line'
89
branch.working_tree().commit('first commit')
91
print >> open('branch1/file1', 'wb'), 'repo line'
92
branch.working_tree().commit('second commit')
94
print >> open('branch1/file1', 'wb'), 'new line'
95
output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'], retcode=1)
96
self.assertTrue('\n-original line\n+new line\n' in output[0])
added
removed
bzrlib/tests/blackbox/test_diff.py
