1
# Copyright (C) 2006-2012, 2016 Canonical Ltd
1
# Copyright (C) 2005, 2006 by Canonical Ltd
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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
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
18
"""Black-box tests for brz diff."""
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
"""Black-box tests for bzr diff.
27
from breezy.diff import (
29
format_registry as diff_format_registry,
31
from breezy.tests import (
36
def subst_dates(string):
37
"""Replace date strings with constant values."""
38
return re.sub(r'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [-\+]\d{4}',
39
'YYYY-MM-DD HH:MM:SS +ZZZZ', string)
42
class DiffBase(tests.TestCaseWithTransport):
43
"""Base class with common setup method"""
45
def make_example_branch(self):
46
tree = self.make_branch_and_tree('.')
47
self.build_tree_contents([
49
('goodbye', b'baz\n')])
57
class TestDiff(DiffBase):
24
from bzrlib.branch import Branch
25
from bzrlib.tests.blackbox import ExternalBase
28
class TestDiff(ExternalBase):
30
def make_example_branch(test):
31
# FIXME: copied from test_too_much -- share elsewhere?
33
file('hello', 'wt').write('foo')
34
test.runbzr('add hello')
35
test.runbzr('commit -m setup hello')
36
file('goodbye', 'wt').write('baz')
37
test.runbzr('add goodbye')
38
test.runbzr('commit -m setup goodbye')
59
40
def test_diff(self):
60
tree = self.make_example_branch()
61
self.build_tree_contents([('hello', b'hello world!')])
62
tree.commit(message='fixing hello')
63
output = self.run_bzr('diff -r 2..3', retcode=1)[0]
64
self.assertTrue('\n+hello world!' in output)
65
output = self.run_bzr('diff -c 3', retcode=1)[0]
66
self.assertTrue('\n+hello world!' in output)
67
output = self.run_bzr('diff -r last:3..last:1', retcode=1)[0]
68
self.assertTrue('\n+baz' in output)
69
output = self.run_bzr('diff -c last:2', retcode=1)[0]
70
self.assertTrue('\n+baz' in output)
71
self.build_tree(['moo'])
41
self.make_example_branch()
42
file('hello', 'wt').write('hello world!')
43
self.runbzr('commit -m fixing hello')
44
output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
45
self.assert_('\n+hello world!' in output)
46
output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
47
self.assert_('\n+baz' in output)
48
file('moo', 'wb').write('moo')
49
self.runbzr('add moo')
76
def test_diff_prefix(self):
77
"""diff --prefix appends to filenames in output"""
78
self.make_example_branch()
79
self.build_tree_contents([('hello', b'hello world!\n')])
80
out, err = self.run_bzr('diff --prefix old/:new/', retcode=1)
81
self.assertEqual(err, '')
82
self.assertEqualDiff(subst_dates(out), '''\
83
=== modified file 'hello'
84
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
85
+++ new/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
92
def test_diff_illegal_prefix_value(self):
93
# There was an error in error reporting for this option
94
out, err = self.run_bzr('diff --prefix old/', retcode=3)
95
self.assertContainsRe(err,
96
'--prefix expects two values separated by a colon')
98
def test_diff_p1(self):
99
"""diff -p1 produces lkml-style diffs"""
100
self.make_example_branch()
101
self.build_tree_contents([('hello', b'hello world!\n')])
102
out, err = self.run_bzr('diff -p1', retcode=1)
103
self.assertEqual(err, '')
104
self.assertEqualDiff(subst_dates(out), '''\
105
=== modified file 'hello'
106
--- old/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
107
+++ new/hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
114
def test_diff_p0(self):
115
"""diff -p0 produces diffs with no prefix"""
116
self.make_example_branch()
117
self.build_tree_contents([('hello', b'hello world!\n')])
118
out, err = self.run_bzr('diff -p0', retcode=1)
119
self.assertEqual(err, '')
120
self.assertEqualDiff(subst_dates(out), '''\
121
=== modified file 'hello'
122
--- hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
123
+++ hello\tYYYY-MM-DD HH:MM:SS +ZZZZ
130
53
def test_diff_nonexistent(self):
131
54
# Get an error from a file that does not exist at all
133
56
self.make_example_branch()
134
out, err = self.run_bzr('diff does-not-exist', retcode=3,
135
error_regexes=('not versioned.*does-not-exist',))
137
def test_diff_illegal_revision_specifiers(self):
138
out, err = self.run_bzr('diff -r 1..23..123', retcode=3,
139
error_regexes=('one or two revision specifiers',))
141
def test_diff_using_and_format(self):
142
out, err = self.run_bzr('diff --format=default --using=mydi', retcode=3,
143
error_regexes=('are mutually exclusive',))
145
def test_diff_nonexistent_revision(self):
146
out, err = self.run_bzr('diff -r 123', retcode=3,
147
error_regexes=("Requested revision: '123' does not "
148
"exist in branch:",))
150
def test_diff_nonexistent_dotted_revision(self):
151
out, err = self.run_bzr('diff -r 1.1', retcode=3)
152
self.assertContainsRe(err,
153
"Requested revision: '1.1' does not exist in branch:")
155
def test_diff_nonexistent_dotted_revision_change(self):
156
out, err = self.run_bzr('diff -c 1.1', retcode=3)
157
self.assertContainsRe(err,
158
"Requested revision: '1.1' does not exist in branch:")
57
out, err = self.runbzr('diff does-not-exist', retcode=3)
58
self.assertContainsRe(err, 'not versioned.*does-not-exist')
160
60
def test_diff_unversioned(self):
161
61
# Get an error when diffing a non-versioned file.
163
63
self.make_example_branch()
164
64
self.build_tree(['unversioned-file'])
165
out, err = self.run_bzr('diff unversioned-file', retcode=3)
65
out, err = self.runbzr('diff unversioned-file', retcode=3)
166
66
self.assertContainsRe(err, 'not versioned.*unversioned-file')
168
68
# TODO: What should diff say for a file deleted in working tree?
170
70
def example_branches(self):
171
branch1_tree = self.make_branch_and_tree('branch1')
172
self.build_tree(['branch1/file'], line_endings='binary')
173
self.build_tree(['branch1/file2'], line_endings='binary')
174
branch1_tree.add('file')
175
branch1_tree.add('file2')
176
branch1_tree.commit(message='add file and file2')
177
branch2_tree = branch1_tree.controldir.sprout(
178
'branch2').open_workingtree()
179
self.build_tree_contents([('branch2/file', b'new content\n')])
180
branch2_tree.commit(message='update file')
181
return branch1_tree, branch2_tree
183
def check_b2_vs_b1(self, cmd):
184
# Compare branch2 vs branch1 using cmd and check the result
185
out, err = self.run_bzr(cmd, retcode=1)
186
self.assertEqual('', err)
187
self.assertEqual("=== modified file 'file'\n"
188
"--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
189
"+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
192
"+contents of branch1/file\n"
193
"\n", subst_dates(out))
195
def check_b1_vs_b2(self, cmd):
196
# Compare branch1 vs branch2 using cmd and check the result
197
out, err = self.run_bzr(cmd, retcode=1)
198
self.assertEqual('', err)
199
self.assertEqualDiff("=== modified file 'file'\n"
200
"--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
201
"+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
203
"-contents of branch1/file\n"
205
"\n", subst_dates(out))
207
def check_no_diffs(self, cmd):
208
# Check that running cmd returns an empty diff
209
out, err = self.run_bzr(cmd, retcode=0)
210
self.assertEqual('', err)
211
self.assertEqual('', out)
71
self.build_tree(['branch1/', 'branch1/file'], line_endings='binary')
72
self.capture('init branch1')
73
self.capture('add branch1/file')
74
self.run_bzr_captured(['commit', '-m', 'add file', 'branch1'])
75
self.capture('branch branch1 branch2')
76
print >> open('branch2/file', 'wb'), 'new content'
77
self.run_bzr_captured(['commit', '-m', 'update file', 'branch2'])
213
79
def test_diff_branches(self):
214
80
self.example_branches()
215
# should open branch1 and diff against branch2,
216
self.check_b2_vs_b1('diff -r branch:branch2 branch1')
217
# Compare two working trees using various syntax forms
218
self.check_b2_vs_b1('diff --old branch2 --new branch1')
219
self.check_b2_vs_b1('diff --old branch2 branch1')
220
self.check_b2_vs_b1('diff branch2 --new branch1')
221
# Test with a selected file that was changed
222
self.check_b2_vs_b1('diff --old branch2 --new branch1 file')
223
self.check_b2_vs_b1('diff --old branch2 branch1/file')
224
self.check_b2_vs_b1('diff branch2/file --new branch1')
225
# Test with a selected file that was not changed
226
self.check_no_diffs('diff --old branch2 --new branch1 file2')
227
self.check_no_diffs('diff --old branch2 branch1/file2')
228
self.check_no_diffs('diff branch2/file2 --new branch1')
230
def test_diff_branches_no_working_trees(self):
231
branch1_tree, branch2_tree = self.example_branches()
232
# Compare a working tree to a branch without a WT
233
dir1 = branch1_tree.controldir
234
dir1.destroy_workingtree()
235
self.assertFalse(dir1.has_workingtree())
236
self.check_b2_vs_b1('diff --old branch2 --new branch1')
237
self.check_b2_vs_b1('diff --old branch2 branch1')
238
self.check_b2_vs_b1('diff branch2 --new branch1')
239
# Compare a branch without a WT to one with a WT
240
self.check_b1_vs_b2('diff --old branch1 --new branch2')
241
self.check_b1_vs_b2('diff --old branch1 branch2')
242
self.check_b1_vs_b2('diff branch1 --new branch2')
243
# Compare a branch with a WT against another without a WT
244
dir2 = branch2_tree.controldir
245
dir2.destroy_workingtree()
246
self.assertFalse(dir2.has_workingtree())
247
self.check_b1_vs_b2('diff --old branch1 --new branch2')
248
self.check_b1_vs_b2('diff --old branch1 branch2')
249
self.check_b1_vs_b2('diff branch1 --new branch2')
251
def test_diff_revno_branches(self):
252
self.example_branches()
253
branch2_tree = workingtree.WorkingTree.open_containing('branch2')[0]
254
self.build_tree_contents([('branch2/file', b'even newer content')])
255
branch2_tree.commit(message='update file once more')
257
out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
259
self.assertEqual('', err)
260
self.assertEqual('', out)
261
out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
263
self.assertEqual('', err)
264
self.assertEqualDiff("=== modified file 'file'\n"
265
"--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
266
"+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n"
269
"+contents of branch1/file\n"
270
"\n", subst_dates(out))
272
def test_diff_color_always(self):
273
from ...terminal import colorstring
274
from ... import colordiff
275
self.overrideAttr(colordiff, 'GLOBAL_COLORDIFFRC', None)
276
self.example_branches()
277
branch2_tree = workingtree.WorkingTree.open_containing('branch2')[0]
278
self.build_tree_contents([('branch2/file', b'even newer content')])
279
branch2_tree.commit(message='update file once more')
281
out, err = self.run_bzr('diff --color=always -r revno:2:branch2..revno:1:branch1',
283
self.assertEqual('', err)
284
self.assertEqualDiff((
285
colorstring(b"=== modified file 'file'\n", 'darkyellow') +
286
colorstring(b"--- old/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n", 'darkred') +
287
colorstring(b"+++ new/file\tYYYY-MM-DD HH:MM:SS +ZZZZ\n", 'darkblue') +
288
colorstring(b"@@ -1 +1 @@\n", 'darkgreen') +
289
colorstring(b"-new content\n", 'darkred') +
290
colorstring(b"+contents of branch1/file\n", 'darkblue') +
291
colorstring(b"\n", 'darkwhite')).decode(),
81
# should open branch1 and diff against branch2,
82
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2',
85
self.assertEquals(("=== modified file 'a/file'\n"
90
"+contents of branch1/file\n"
92
output = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
94
self.assertEqualDiff(("=== modified file 'a/file'\n"
99
"+contents of branch1/file\n"
294
102
def example_branch2(self):
295
branch1_tree = self.make_branch_and_tree('branch1')
296
self.build_tree_contents([('branch1/file1', b'original line\n')])
297
branch1_tree.add('file1')
298
branch1_tree.commit(message='first commit')
299
self.build_tree_contents([('branch1/file1', b'repo line\n')])
300
branch1_tree.commit(message='second commit')
103
self.build_tree(['branch1/', 'branch1/file1'], line_endings='binary')
104
self.capture('init branch1')
105
self.capture('add branch1/file1')
106
print >> open('branch1/file1', 'wb'), 'original line'
107
self.run_bzr_captured(['commit', '-m', 'first commit', 'branch1'])
109
print >> open('branch1/file1', 'wb'), 'repo line'
110
self.run_bzr_captured(['commit', '-m', 'second commit', 'branch1'])
303
112
def test_diff_to_working_tree(self):
304
113
self.example_branch2()
305
self.build_tree_contents([('branch1/file1', b'new line')])
306
output = self.run_bzr('diff -r 1.. branch1', retcode=1)
307
self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
309
def test_diff_to_working_tree_in_subdir(self):
310
self.example_branch2()
311
self.build_tree_contents([('branch1/file1', b'new line')])
312
os.mkdir('branch1/dir1')
313
output = self.run_bzr('diff -r 1..', retcode=1,
314
working_dir='branch1/dir1')
315
self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
317
def test_diff_across_rename(self):
318
"""The working tree path should always be considered for diffing"""
319
tree = self.make_example_branch()
320
self.run_bzr('diff -r 0..1 hello', retcode=1)
321
tree.rename_one('hello', 'hello1')
322
self.run_bzr('diff hello1', retcode=1)
323
self.run_bzr('diff -r 0..1 hello1', retcode=1)
325
def test_diff_to_branch_no_working_tree(self):
326
branch1_tree = self.example_branch2()
327
dir1 = branch1_tree.controldir
328
dir1.destroy_workingtree()
329
self.assertFalse(dir1.has_workingtree())
330
output = self.run_bzr('diff -r 1.. branch1', retcode=1)
331
self.assertContainsRe(output[0], '\n\\-original line\n\\+repo line\n')
333
def test_custom_format(self):
334
class BooDiffTree(DiffTree):
336
def show_diff(self, specific_files, extra_trees=None):
337
self.to_file.write("BOO!\n")
338
return super(BooDiffTree, self).show_diff(specific_files,
341
diff_format_registry.register("boo", BooDiffTree, "Scary diff format")
342
self.addCleanup(diff_format_registry.remove, "boo")
343
self.make_example_branch()
344
self.build_tree_contents([('hello', b'hello world!\n')])
345
output = self.run_bzr('diff --format=boo', retcode=1)
346
self.assertTrue("BOO!" in output[0])
347
output = self.run_bzr('diff -Fboo', retcode=1)
348
self.assertTrue("BOO!" in output[0])
350
def test_binary_diff_remove(self):
351
tree = self.make_branch_and_tree('.')
352
self.build_tree_contents([('a', b'\x00' * 20)])
354
tree.commit('add binary file')
356
output = self.run_bzr('diff', retcode=1)
358
"=== removed file 'a'\nBinary files old/a and new/a differ\n",
115
print >> open('branch1/file1', 'wb'), 'new line'
116
output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'], retcode=1)
117
self.assertTrue('\n-original line\n+new line\n' in output[0])
362
120
class TestCheckoutDiff(TestDiff):
364
122
def make_example_branch(self):
365
tree = super(TestCheckoutDiff, self).make_example_branch()
366
tree = tree.branch.create_checkout('checkout')
123
super(TestCheckoutDiff, self).make_example_branch()
124
self.runbzr('checkout . checkout')
367
125
os.chdir('checkout')
370
127
def example_branch2(self):
371
tree = super(TestCheckoutDiff, self).example_branch2()
128
super(TestCheckoutDiff, self).example_branch2()
372
129
os.mkdir('checkouts')
373
tree = tree.branch.create_checkout('checkouts/branch1')
130
self.runbzr('checkout branch1 checkouts/branch1')
374
131
os.chdir('checkouts')
377
133
def example_branches(self):
378
branch1_tree, branch2_tree = super(TestCheckoutDiff,
379
self).example_branches()
134
super(TestCheckoutDiff, self).example_branches()
380
135
os.mkdir('checkouts')
381
branch1_tree = branch1_tree.branch.create_checkout('checkouts/branch1')
382
branch2_tree = branch2_tree.branch.create_checkout('checkouts/branch2')
136
self.runbzr('checkout branch1 checkouts/branch1')
137
self.runbzr('checkout branch2 checkouts/branch2')
383
138
os.chdir('checkouts')
384
return branch1_tree, branch2_tree
387
class TestDiffLabels(DiffBase):
141
class TestDiffLabels(TestDiff):
389
143
def test_diff_label_removed(self):
390
tree = super(TestDiffLabels, self).make_example_branch()
391
tree.remove('hello', keep_files=False)
392
diff = self.run_bzr('diff', retcode=1)
393
self.assertTrue("=== removed file 'hello'" in diff[0])
144
super(TestDiffLabels, self).make_example_branch()
145
self.runbzr('remove hello')
146
diff = self.run_bzr_captured(['diff'], retcode=1)
147
self.assertTrue("=== removed file 'a/hello'" in diff[0])
395
149
def test_diff_label_added(self):
396
tree = super(TestDiffLabels, self).make_example_branch()
397
self.build_tree_contents([('barbar', b'barbar')])
399
diff = self.run_bzr('diff', retcode=1)
400
self.assertTrue("=== added file 'barbar'" in diff[0])
150
super(TestDiffLabels, self).make_example_branch()
151
file('barbar', 'wt').write('barbar')
152
self.runbzr('add barbar')
153
diff = self.run_bzr_captured(['diff'], retcode=1)
154
self.assertTrue("=== added file 'b/barbar'" in diff[0])
402
156
def test_diff_label_modified(self):
403
157
super(TestDiffLabels, self).make_example_branch()
404
self.build_tree_contents([('hello', b'barbar')])
405
diff = self.run_bzr('diff', retcode=1)
406
self.assertTrue("=== modified file 'hello'" in diff[0])
158
file('hello', 'wt').write('barbar')
159
diff = self.run_bzr_captured(['diff'], retcode=1)
160
self.assertTrue("=== modified file 'a/hello'" in diff[0])
408
162
def test_diff_label_renamed(self):
409
tree = super(TestDiffLabels, self).make_example_branch()
410
tree.rename_one('hello', 'gruezi')
411
diff = self.run_bzr('diff', retcode=1)
412
self.assertTrue("=== renamed file 'hello' => 'gruezi'" in diff[0])
415
class TestExternalDiff(DiffBase):
417
def test_external_diff(self):
418
"""Test that we can spawn an external diff process"""
419
self.disable_missing_extensions_warning()
420
# We have to use run_bzr_subprocess, because we need to
421
# test writing directly to stdout, (there was a bug in
422
# subprocess.py that we had to workaround).
423
# However, if 'diff' may not be available
424
self.make_example_branch()
425
out, err = self.run_bzr_subprocess(
426
'diff -Oprogress_bar=none -r 1 --diff-options -ub',
427
universal_newlines=True,
429
if b'Diff is not installed on this machine' in err:
430
raise tests.TestSkipped("No external 'diff' is available")
431
self.assertEqual(b'', err)
432
# We have to skip the stuff in the middle, because it depends
434
self.assertStartsWith(
436
b"=== added file 'goodbye'\n"
437
b"--- old/goodbye\t1970-01-01 00:00:00 +0000\n"
438
b"+++ new/goodbye\t")
439
self.assertEndsWith(out, b"\n@@ -0,0 +1 @@\n"
442
def test_external_diff_options_and_using(self):
443
"""Test that the options are passed correctly to an external diff process"""
444
self.requireFeature(features.diff_feature)
445
self.make_example_branch()
446
self.build_tree_contents([('hello', b'Foo\n')])
447
out, err = self.run_bzr('diff --diff-options -i --using diff',
449
self.assertEqual("=== modified file 'hello'\n", out)
450
self.assertEqual('', err)
453
class TestDiffOutput(DiffBase):
455
def test_diff_output(self):
456
# check that output doesn't mangle line-endings
457
self.make_example_branch()
458
self.build_tree_contents([('hello', b'hello world!\n')])
459
output = self.run_bzr_subprocess('diff', retcode=1)[0]
460
self.assertTrue(b'\n+hello world!\n' in output)
163
super(TestDiffLabels, self).make_example_branch()
164
self.runbzr('rename hello gruezi')
165
diff = self.run_bzr_captured(['diff'], retcode=1)
166
self.assertTrue("=== renamed file 'a/hello' => 'b/gruezi'" in diff[0])
added
removed
bzrlib/tests/blackbox/test_diff.py
