1
# Copyright (C) 2005-2011 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
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
from cStringIO import StringIO
29
revision as _mod_revision,
35
from bzrlib.symbol_versioning import deprecated_in
36
from bzrlib.tests import features
37
from bzrlib.tests.blackbox.test_diff import subst_dates
40
class _AttribFeature(tests.Feature):
43
if (sys.platform not in ('cygwin', 'win32')):
46
proc = subprocess.Popen(['attrib', '.'], stdout=subprocess.PIPE)
49
return (0 == proc.wait())
51
def feature_name(self):
52
return 'attrib Windows command-line tool'
54
AttribFeature = _AttribFeature()
57
compiled_patiencediff_feature = tests.ModuleAvailableFeature(
58
'bzrlib._patiencediff_c')
61
def udiff_lines(old, new, allow_binary=False):
63
diff.internal_diff('old', old, 'new', new, output, allow_binary)
65
return output.readlines()
68
def external_udiff_lines(old, new, use_stringio=False):
70
# StringIO has no fileno, so it tests a different codepath
73
output = tempfile.TemporaryFile()
75
diff.external_diff('old', old, 'new', new, output, diff_opts=['-u'])
77
raise tests.TestSkipped('external "diff" not present to test')
79
lines = output.readlines()
84
class TestDiff(tests.TestCase):
86
def test_add_nl(self):
87
"""diff generates a valid diff for patches that add a newline"""
88
lines = udiff_lines(['boo'], ['boo\n'])
89
self.check_patch(lines)
90
self.assertEquals(lines[4], '\\ No newline at end of file\n')
91
## "expected no-nl, got %r" % lines[4]
93
def test_add_nl_2(self):
94
"""diff generates a valid diff for patches that change last line and
97
lines = udiff_lines(['boo'], ['goo\n'])
98
self.check_patch(lines)
99
self.assertEquals(lines[4], '\\ No newline at end of file\n')
100
## "expected no-nl, got %r" % lines[4]
102
def test_remove_nl(self):
103
"""diff generates a valid diff for patches that change last line and
106
lines = udiff_lines(['boo\n'], ['boo'])
107
self.check_patch(lines)
108
self.assertEquals(lines[5], '\\ No newline at end of file\n')
109
## "expected no-nl, got %r" % lines[5]
111
def check_patch(self, lines):
112
self.assert_(len(lines) > 1)
113
## "Not enough lines for a file header for patch:\n%s" % "".join(lines)
114
self.assert_(lines[0].startswith ('---'))
115
## 'No orig line for patch:\n%s' % "".join(lines)
116
self.assert_(lines[1].startswith ('+++'))
117
## 'No mod line for patch:\n%s' % "".join(lines)
118
self.assert_(len(lines) > 2)
119
## "No hunks for patch:\n%s" % "".join(lines)
120
self.assert_(lines[2].startswith('@@'))
121
## "No hunk header for patch:\n%s" % "".join(lines)
122
self.assert_('@@' in lines[2][2:])
123
## "Unterminated hunk header for patch:\n%s" % "".join(lines)
125
def test_binary_lines(self):
127
uni_lines = [1023 * 'a' + '\x00']
128
self.assertRaises(errors.BinaryFile, udiff_lines, uni_lines , empty)
129
self.assertRaises(errors.BinaryFile, udiff_lines, empty, uni_lines)
130
udiff_lines(uni_lines , empty, allow_binary=True)
131
udiff_lines(empty, uni_lines, allow_binary=True)
133
def test_external_diff(self):
134
lines = external_udiff_lines(['boo\n'], ['goo\n'])
135
self.check_patch(lines)
136
self.assertEqual('\n', lines[-1])
138
def test_external_diff_no_fileno(self):
139
# Make sure that we can handle not having a fileno, even
140
# if the diff is large
141
lines = external_udiff_lines(['boo\n']*10000,
144
self.check_patch(lines)
146
def test_external_diff_binary_lang_c(self):
147
for lang in ('LANG', 'LC_ALL', 'LANGUAGE'):
148
self.overrideEnv(lang, 'C')
149
lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
150
# Older versions of diffutils say "Binary files", newer
151
# versions just say "Files".
152
self.assertContainsRe(lines[0], '(Binary f|F)iles old and new differ\n')
153
self.assertEquals(lines[1:], ['\n'])
155
def test_no_external_diff(self):
156
"""Check that NoDiff is raised when diff is not available"""
157
# Make sure no 'diff' command is available
158
# XXX: Weird, using None instead of '' breaks the test -- vila 20101216
159
self.overrideEnv('PATH', '')
160
self.assertRaises(errors.NoDiff, diff.external_diff,
161
'old', ['boo\n'], 'new', ['goo\n'],
162
StringIO(), diff_opts=['-u'])
164
def test_internal_diff_default(self):
165
# Default internal diff encoding is utf8
167
diff.internal_diff(u'old_\xb5', ['old_text\n'],
168
u'new_\xe5', ['new_text\n'], output)
169
lines = output.getvalue().splitlines(True)
170
self.check_patch(lines)
171
self.assertEquals(['--- old_\xc2\xb5\n',
172
'+++ new_\xc3\xa5\n',
180
def test_internal_diff_utf8(self):
182
diff.internal_diff(u'old_\xb5', ['old_text\n'],
183
u'new_\xe5', ['new_text\n'], output,
184
path_encoding='utf8')
185
lines = output.getvalue().splitlines(True)
186
self.check_patch(lines)
187
self.assertEquals(['--- old_\xc2\xb5\n',
188
'+++ new_\xc3\xa5\n',
196
def test_internal_diff_iso_8859_1(self):
198
diff.internal_diff(u'old_\xb5', ['old_text\n'],
199
u'new_\xe5', ['new_text\n'], output,
200
path_encoding='iso-8859-1')
201
lines = output.getvalue().splitlines(True)
202
self.check_patch(lines)
203
self.assertEquals(['--- old_\xb5\n',
212
def test_internal_diff_no_content(self):
214
diff.internal_diff(u'old', [], u'new', [], output)
215
self.assertEqual('', output.getvalue())
217
def test_internal_diff_no_changes(self):
219
diff.internal_diff(u'old', ['text\n', 'contents\n'],
220
u'new', ['text\n', 'contents\n'],
222
self.assertEqual('', output.getvalue())
224
def test_internal_diff_returns_bytes(self):
226
output = StringIO.StringIO()
227
diff.internal_diff(u'old_\xb5', ['old_text\n'],
228
u'new_\xe5', ['new_text\n'], output)
229
self.assertIsInstance(output.getvalue(), str,
230
'internal_diff should return bytestrings')
233
class TestDiffFiles(tests.TestCaseInTempDir):
235
def test_external_diff_binary(self):
236
"""The output when using external diff should use diff's i18n error"""
237
# Make sure external_diff doesn't fail in the current LANG
238
lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
240
cmd = ['diff', '-u', '--binary', 'old', 'new']
241
open('old', 'wb').write('\x00foobar\n')
242
open('new', 'wb').write('foo\x00bar\n')
243
pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
244
stdin=subprocess.PIPE)
245
out, err = pipe.communicate()
246
# Diff returns '2' on Binary files.
247
self.assertEqual(2, pipe.returncode)
248
# We should output whatever diff tells us, plus a trailing newline
249
self.assertEqual(out.splitlines(True) + ['\n'], lines)
252
def get_diff_as_string(tree1, tree2, specific_files=None, working_tree=None):
254
if working_tree is not None:
255
extra_trees = (working_tree,)
258
diff.show_diff_trees(tree1, tree2, output,
259
specific_files=specific_files,
260
extra_trees=extra_trees, old_label='old/',
262
return output.getvalue()
265
class TestDiffDates(tests.TestCaseWithTransport):
268
super(TestDiffDates, self).setUp()
269
self.wt = self.make_branch_and_tree('.')
270
self.b = self.wt.branch
271
self.build_tree_contents([
272
('file1', 'file1 contents at rev 1\n'),
273
('file2', 'file2 contents at rev 1\n')
275
self.wt.add(['file1', 'file2'])
277
message='Revision 1',
278
timestamp=1143849600, # 2006-04-01 00:00:00 UTC
281
self.build_tree_contents([('file1', 'file1 contents at rev 2\n')])
283
message='Revision 2',
284
timestamp=1143936000, # 2006-04-02 00:00:00 UTC
287
self.build_tree_contents([('file2', 'file2 contents at rev 3\n')])
289
message='Revision 3',
290
timestamp=1144022400, # 2006-04-03 00:00:00 UTC
293
self.wt.remove(['file2'])
295
message='Revision 4',
296
timestamp=1144108800, # 2006-04-04 00:00:00 UTC
299
self.build_tree_contents([
300
('file1', 'file1 contents in working tree\n')
302
# set the date stamps for files in the working tree to known values
303
os.utime('file1', (1144195200, 1144195200)) # 2006-04-05 00:00:00 UTC
305
def test_diff_rev_tree_working_tree(self):
306
output = get_diff_as_string(self.wt.basis_tree(), self.wt)
307
# note that the date for old/file1 is from rev 2 rather than from
308
# the basis revision (rev 4)
309
self.assertEqualDiff(output, '''\
310
=== modified file 'file1'
311
--- old/file1\t2006-04-02 00:00:00 +0000
312
+++ new/file1\t2006-04-05 00:00:00 +0000
314
-file1 contents at rev 2
315
+file1 contents in working tree
319
def test_diff_rev_tree_rev_tree(self):
320
tree1 = self.b.repository.revision_tree('rev-2')
321
tree2 = self.b.repository.revision_tree('rev-3')
322
output = get_diff_as_string(tree1, tree2)
323
self.assertEqualDiff(output, '''\
324
=== modified file 'file2'
325
--- old/file2\t2006-04-01 00:00:00 +0000
326
+++ new/file2\t2006-04-03 00:00:00 +0000
328
-file2 contents at rev 1
329
+file2 contents at rev 3
333
def test_diff_add_files(self):
334
tree1 = self.b.repository.revision_tree(_mod_revision.NULL_REVISION)
335
tree2 = self.b.repository.revision_tree('rev-1')
336
output = get_diff_as_string(tree1, tree2)
337
# the files have the epoch time stamp for the tree in which
339
self.assertEqualDiff(output, '''\
340
=== added file 'file1'
341
--- old/file1\t1970-01-01 00:00:00 +0000
342
+++ new/file1\t2006-04-01 00:00:00 +0000
344
+file1 contents at rev 1
346
=== added file 'file2'
347
--- old/file2\t1970-01-01 00:00:00 +0000
348
+++ new/file2\t2006-04-01 00:00:00 +0000
350
+file2 contents at rev 1
354
def test_diff_remove_files(self):
355
tree1 = self.b.repository.revision_tree('rev-3')
356
tree2 = self.b.repository.revision_tree('rev-4')
357
output = get_diff_as_string(tree1, tree2)
358
# the file has the epoch time stamp for the tree in which
360
self.assertEqualDiff(output, '''\
361
=== removed file 'file2'
362
--- old/file2\t2006-04-03 00:00:00 +0000
363
+++ new/file2\t1970-01-01 00:00:00 +0000
365
-file2 contents at rev 3
369
def test_show_diff_specified(self):
370
"""A working tree filename can be used to identify a file"""
371
self.wt.rename_one('file1', 'file1b')
372
old_tree = self.b.repository.revision_tree('rev-1')
373
new_tree = self.b.repository.revision_tree('rev-4')
374
out = get_diff_as_string(old_tree, new_tree, specific_files=['file1b'],
375
working_tree=self.wt)
376
self.assertContainsRe(out, 'file1\t')
378
def test_recursive_diff(self):
379
"""Children of directories are matched"""
382
self.wt.add(['dir1', 'dir2'])
383
self.wt.rename_one('file1', 'dir1/file1')
384
old_tree = self.b.repository.revision_tree('rev-1')
385
new_tree = self.b.repository.revision_tree('rev-4')
386
out = get_diff_as_string(old_tree, new_tree, specific_files=['dir1'],
387
working_tree=self.wt)
388
self.assertContainsRe(out, 'file1\t')
389
out = get_diff_as_string(old_tree, new_tree, specific_files=['dir2'],
390
working_tree=self.wt)
391
self.assertNotContainsRe(out, 'file1\t')
394
class TestShowDiffTrees(tests.TestCaseWithTransport):
395
"""Direct tests for show_diff_trees"""
397
def test_modified_file(self):
398
"""Test when a file is modified."""
399
tree = self.make_branch_and_tree('tree')
400
self.build_tree_contents([('tree/file', 'contents\n')])
401
tree.add(['file'], ['file-id'])
402
tree.commit('one', rev_id='rev-1')
404
self.build_tree_contents([('tree/file', 'new contents\n')])
405
d = get_diff_as_string(tree.basis_tree(), tree)
406
self.assertContainsRe(d, "=== modified file 'file'\n")
407
self.assertContainsRe(d, '--- old/file\t')
408
self.assertContainsRe(d, '\\+\\+\\+ new/file\t')
409
self.assertContainsRe(d, '-contents\n'
412
def test_modified_file_in_renamed_dir(self):
413
"""Test when a file is modified in a renamed directory."""
414
tree = self.make_branch_and_tree('tree')
415
self.build_tree(['tree/dir/'])
416
self.build_tree_contents([('tree/dir/file', 'contents\n')])
417
tree.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
418
tree.commit('one', rev_id='rev-1')
420
tree.rename_one('dir', 'other')
421
self.build_tree_contents([('tree/other/file', 'new contents\n')])
422
d = get_diff_as_string(tree.basis_tree(), tree)
423
self.assertContainsRe(d, "=== renamed directory 'dir' => 'other'\n")
424
self.assertContainsRe(d, "=== modified file 'other/file'\n")
425
# XXX: This is technically incorrect, because it used to be at another
426
# location. What to do?
427
self.assertContainsRe(d, '--- old/dir/file\t')
428
self.assertContainsRe(d, '\\+\\+\\+ new/other/file\t')
429
self.assertContainsRe(d, '-contents\n'
432
def test_renamed_directory(self):
433
"""Test when only a directory is only renamed."""
434
tree = self.make_branch_and_tree('tree')
435
self.build_tree(['tree/dir/'])
436
self.build_tree_contents([('tree/dir/file', 'contents\n')])
437
tree.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
438
tree.commit('one', rev_id='rev-1')
440
tree.rename_one('dir', 'newdir')
441
d = get_diff_as_string(tree.basis_tree(), tree)
442
# Renaming a directory should be a single "you renamed this dir" even
443
# when there are files inside.
444
self.assertEqual(d, "=== renamed directory 'dir' => 'newdir'\n")
446
def test_renamed_file(self):
447
"""Test when a file is only renamed."""
448
tree = self.make_branch_and_tree('tree')
449
self.build_tree_contents([('tree/file', 'contents\n')])
450
tree.add(['file'], ['file-id'])
451
tree.commit('one', rev_id='rev-1')
453
tree.rename_one('file', 'newname')
454
d = get_diff_as_string(tree.basis_tree(), tree)
455
self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
456
# We shouldn't have a --- or +++ line, because there is no content
458
self.assertNotContainsRe(d, '---')
460
def test_renamed_and_modified_file(self):
461
"""Test when a file is only renamed."""
462
tree = self.make_branch_and_tree('tree')
463
self.build_tree_contents([('tree/file', 'contents\n')])
464
tree.add(['file'], ['file-id'])
465
tree.commit('one', rev_id='rev-1')
467
tree.rename_one('file', 'newname')
468
self.build_tree_contents([('tree/newname', 'new contents\n')])
469
d = get_diff_as_string(tree.basis_tree(), tree)
470
self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
471
self.assertContainsRe(d, '--- old/file\t')
472
self.assertContainsRe(d, '\\+\\+\\+ new/newname\t')
473
self.assertContainsRe(d, '-contents\n'
477
def test_internal_diff_exec_property(self):
478
tree = self.make_branch_and_tree('tree')
480
tt = transform.TreeTransform(tree)
481
tt.new_file('a', tt.root, 'contents\n', 'a-id', True)
482
tt.new_file('b', tt.root, 'contents\n', 'b-id', False)
483
tt.new_file('c', tt.root, 'contents\n', 'c-id', True)
484
tt.new_file('d', tt.root, 'contents\n', 'd-id', False)
485
tt.new_file('e', tt.root, 'contents\n', 'control-e-id', True)
486
tt.new_file('f', tt.root, 'contents\n', 'control-f-id', False)
488
tree.commit('one', rev_id='rev-1')
490
tt = transform.TreeTransform(tree)
491
tt.set_executability(False, tt.trans_id_file_id('a-id'))
492
tt.set_executability(True, tt.trans_id_file_id('b-id'))
493
tt.set_executability(False, tt.trans_id_file_id('c-id'))
494
tt.set_executability(True, tt.trans_id_file_id('d-id'))
496
tree.rename_one('c', 'new-c')
497
tree.rename_one('d', 'new-d')
499
d = get_diff_as_string(tree.basis_tree(), tree)
501
self.assertContainsRe(d, r"file 'a'.*\(properties changed:"
503
self.assertContainsRe(d, r"file 'b'.*\(properties changed:"
505
self.assertContainsRe(d, r"file 'c'.*\(properties changed:"
507
self.assertContainsRe(d, r"file 'd'.*\(properties changed:"
509
self.assertNotContainsRe(d, r"file 'e'")
510
self.assertNotContainsRe(d, r"file 'f'")
512
def test_binary_unicode_filenames(self):
513
"""Test that contents of files are *not* encoded in UTF-8 when there
514
is a binary file in the diff.
516
# See https://bugs.launchpad.net/bugs/110092.
517
self.requireFeature(tests.UnicodeFilenameFeature)
519
# This bug isn't triggered with cStringIO.
520
from StringIO import StringIO
521
tree = self.make_branch_and_tree('tree')
522
alpha, omega = u'\u03b1', u'\u03c9'
523
alpha_utf8, omega_utf8 = alpha.encode('utf8'), omega.encode('utf8')
524
self.build_tree_contents(
525
[('tree/' + alpha, chr(0)),
527
('The %s and the %s\n' % (alpha_utf8, omega_utf8)))])
528
tree.add([alpha], ['file-id'])
529
tree.add([omega], ['file-id-2'])
530
diff_content = StringIO()
531
diff.show_diff_trees(tree.basis_tree(), tree, diff_content)
532
d = diff_content.getvalue()
533
self.assertContainsRe(d, r"=== added file '%s'" % alpha_utf8)
534
self.assertContainsRe(d, "Binary files a/%s.*and b/%s.* differ\n"
535
% (alpha_utf8, alpha_utf8))
536
self.assertContainsRe(d, r"=== added file '%s'" % omega_utf8)
537
self.assertContainsRe(d, r"--- a/%s" % (omega_utf8,))
538
self.assertContainsRe(d, r"\+\+\+ b/%s" % (omega_utf8,))
540
def test_unicode_filename(self):
541
"""Test when the filename are unicode."""
542
self.requireFeature(tests.UnicodeFilenameFeature)
544
alpha, omega = u'\u03b1', u'\u03c9'
545
autf8, outf8 = alpha.encode('utf8'), omega.encode('utf8')
547
tree = self.make_branch_and_tree('tree')
548
self.build_tree_contents([('tree/ren_'+alpha, 'contents\n')])
549
tree.add(['ren_'+alpha], ['file-id-2'])
550
self.build_tree_contents([('tree/del_'+alpha, 'contents\n')])
551
tree.add(['del_'+alpha], ['file-id-3'])
552
self.build_tree_contents([('tree/mod_'+alpha, 'contents\n')])
553
tree.add(['mod_'+alpha], ['file-id-4'])
555
tree.commit('one', rev_id='rev-1')
557
tree.rename_one('ren_'+alpha, 'ren_'+omega)
558
tree.remove('del_'+alpha)
559
self.build_tree_contents([('tree/add_'+alpha, 'contents\n')])
560
tree.add(['add_'+alpha], ['file-id'])
561
self.build_tree_contents([('tree/mod_'+alpha, 'contents_mod\n')])
563
d = get_diff_as_string(tree.basis_tree(), tree)
564
self.assertContainsRe(d,
565
"=== renamed file 'ren_%s' => 'ren_%s'\n"%(autf8, outf8))
566
self.assertContainsRe(d, "=== added file 'add_%s'"%autf8)
567
self.assertContainsRe(d, "=== modified file 'mod_%s'"%autf8)
568
self.assertContainsRe(d, "=== removed file 'del_%s'"%autf8)
570
def test_unicode_filename_path_encoding(self):
571
"""Test for bug #382699: unicode filenames on Windows should be shown
574
self.requireFeature(tests.UnicodeFilenameFeature)
575
# The word 'test' in Russian
576
_russian_test = u'\u0422\u0435\u0441\u0442'
577
directory = _russian_test + u'/'
578
test_txt = _russian_test + u'.txt'
579
u1234 = u'\u1234.txt'
581
tree = self.make_branch_and_tree('.')
582
self.build_tree_contents([
587
tree.add([test_txt, u1234, directory])
590
diff.show_diff_trees(tree.basis_tree(), tree, sio,
591
path_encoding='cp1251')
593
output = subst_dates(sio.getvalue())
595
=== added directory '%(directory)s'
596
=== added file '%(test_txt)s'
597
--- a/%(test_txt)s\tYYYY-MM-DD HH:MM:SS +ZZZZ
598
+++ b/%(test_txt)s\tYYYY-MM-DD HH:MM:SS +ZZZZ
602
=== added file '?.txt'
603
--- a/?.txt\tYYYY-MM-DD HH:MM:SS +ZZZZ
604
+++ b/?.txt\tYYYY-MM-DD HH:MM:SS +ZZZZ
608
''' % {'directory': _russian_test.encode('cp1251'),
609
'test_txt': test_txt.encode('cp1251'),
611
self.assertEqualDiff(output, shouldbe)
614
class DiffWasIs(diff.DiffPath):
616
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
617
self.to_file.write('was: ')
618
self.to_file.write(self.old_tree.get_file(file_id).read())
619
self.to_file.write('is: ')
620
self.to_file.write(self.new_tree.get_file(file_id).read())
624
class TestDiffTree(tests.TestCaseWithTransport):
627
super(TestDiffTree, self).setUp()
628
self.old_tree = self.make_branch_and_tree('old-tree')
629
self.old_tree.lock_write()
630
self.addCleanup(self.old_tree.unlock)
631
self.new_tree = self.make_branch_and_tree('new-tree')
632
self.new_tree.lock_write()
633
self.addCleanup(self.new_tree.unlock)
634
self.differ = diff.DiffTree(self.old_tree, self.new_tree, StringIO())
636
def test_diff_text(self):
637
self.build_tree_contents([('old-tree/olddir/',),
638
('old-tree/olddir/oldfile', 'old\n')])
639
self.old_tree.add('olddir')
640
self.old_tree.add('olddir/oldfile', 'file-id')
641
self.build_tree_contents([('new-tree/newdir/',),
642
('new-tree/newdir/newfile', 'new\n')])
643
self.new_tree.add('newdir')
644
self.new_tree.add('newdir/newfile', 'file-id')
645
differ = diff.DiffText(self.old_tree, self.new_tree, StringIO())
646
differ.diff_text('file-id', None, 'old label', 'new label')
648
'--- old label\n+++ new label\n@@ -1,1 +0,0 @@\n-old\n\n',
649
differ.to_file.getvalue())
650
differ.to_file.seek(0)
651
differ.diff_text(None, 'file-id', 'old label', 'new label')
653
'--- old label\n+++ new label\n@@ -0,0 +1,1 @@\n+new\n\n',
654
differ.to_file.getvalue())
655
differ.to_file.seek(0)
656
differ.diff_text('file-id', 'file-id', 'old label', 'new label')
658
'--- old label\n+++ new label\n@@ -1,1 +1,1 @@\n-old\n+new\n\n',
659
differ.to_file.getvalue())
661
def test_diff_deletion(self):
662
self.build_tree_contents([('old-tree/file', 'contents'),
663
('new-tree/file', 'contents')])
664
self.old_tree.add('file', 'file-id')
665
self.new_tree.add('file', 'file-id')
666
os.unlink('new-tree/file')
667
self.differ.show_diff(None)
668
self.assertContainsRe(self.differ.to_file.getvalue(), '-contents')
670
def test_diff_creation(self):
671
self.build_tree_contents([('old-tree/file', 'contents'),
672
('new-tree/file', 'contents')])
673
self.old_tree.add('file', 'file-id')
674
self.new_tree.add('file', 'file-id')
675
os.unlink('old-tree/file')
676
self.differ.show_diff(None)
677
self.assertContainsRe(self.differ.to_file.getvalue(), '\+contents')
679
def test_diff_symlink(self):
680
differ = diff.DiffSymlink(self.old_tree, self.new_tree, StringIO())
681
differ.diff_symlink('old target', None)
682
self.assertEqual("=== target was 'old target'\n",
683
differ.to_file.getvalue())
685
differ = diff.DiffSymlink(self.old_tree, self.new_tree, StringIO())
686
differ.diff_symlink(None, 'new target')
687
self.assertEqual("=== target is 'new target'\n",
688
differ.to_file.getvalue())
690
differ = diff.DiffSymlink(self.old_tree, self.new_tree, StringIO())
691
differ.diff_symlink('old target', 'new target')
692
self.assertEqual("=== target changed 'old target' => 'new target'\n",
693
differ.to_file.getvalue())
696
self.build_tree_contents([('old-tree/olddir/',),
697
('old-tree/olddir/oldfile', 'old\n')])
698
self.old_tree.add('olddir')
699
self.old_tree.add('olddir/oldfile', 'file-id')
700
self.build_tree_contents([('new-tree/newdir/',),
701
('new-tree/newdir/newfile', 'new\n')])
702
self.new_tree.add('newdir')
703
self.new_tree.add('newdir/newfile', 'file-id')
704
self.differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile')
705
self.assertContainsRe(
706
self.differ.to_file.getvalue(),
707
r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+1,1'
708
' \@\@\n-old\n\+new\n\n')
710
def test_diff_kind_change(self):
711
self.requireFeature(tests.SymlinkFeature)
712
self.build_tree_contents([('old-tree/olddir/',),
713
('old-tree/olddir/oldfile', 'old\n')])
714
self.old_tree.add('olddir')
715
self.old_tree.add('olddir/oldfile', 'file-id')
716
self.build_tree(['new-tree/newdir/'])
717
os.symlink('new', 'new-tree/newdir/newfile')
718
self.new_tree.add('newdir')
719
self.new_tree.add('newdir/newfile', 'file-id')
720
self.differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile')
721
self.assertContainsRe(
722
self.differ.to_file.getvalue(),
723
r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+0,0'
725
self.assertContainsRe(self.differ.to_file.getvalue(),
726
"=== target is u'new'\n")
728
def test_diff_directory(self):
729
self.build_tree(['new-tree/new-dir/'])
730
self.new_tree.add('new-dir', 'new-dir-id')
731
self.differ.diff('new-dir-id', None, 'new-dir')
732
self.assertEqual(self.differ.to_file.getvalue(), '')
734
def create_old_new(self):
735
self.build_tree_contents([('old-tree/olddir/',),
736
('old-tree/olddir/oldfile', 'old\n')])
737
self.old_tree.add('olddir')
738
self.old_tree.add('olddir/oldfile', 'file-id')
739
self.build_tree_contents([('new-tree/newdir/',),
740
('new-tree/newdir/newfile', 'new\n')])
741
self.new_tree.add('newdir')
742
self.new_tree.add('newdir/newfile', 'file-id')
744
def test_register_diff(self):
745
self.create_old_new()
746
old_diff_factories = diff.DiffTree.diff_factories
747
diff.DiffTree.diff_factories=old_diff_factories[:]
748
diff.DiffTree.diff_factories.insert(0, DiffWasIs.from_diff_tree)
750
differ = diff.DiffTree(self.old_tree, self.new_tree, StringIO())
752
diff.DiffTree.diff_factories = old_diff_factories
753
differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile')
754
self.assertNotContainsRe(
755
differ.to_file.getvalue(),
756
r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+1,1'
757
' \@\@\n-old\n\+new\n\n')
758
self.assertContainsRe(differ.to_file.getvalue(),
759
'was: old\nis: new\n')
761
def test_extra_factories(self):
762
self.create_old_new()
763
differ = diff.DiffTree(self.old_tree, self.new_tree, StringIO(),
764
extra_factories=[DiffWasIs.from_diff_tree])
765
differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile')
766
self.assertNotContainsRe(
767
differ.to_file.getvalue(),
768
r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+1,1'
769
' \@\@\n-old\n\+new\n\n')
770
self.assertContainsRe(differ.to_file.getvalue(),
771
'was: old\nis: new\n')
773
def test_alphabetical_order(self):
774
self.build_tree(['new-tree/a-file'])
775
self.new_tree.add('a-file')
776
self.build_tree(['old-tree/b-file'])
777
self.old_tree.add('b-file')
778
self.differ.show_diff(None)
779
self.assertContainsRe(self.differ.to_file.getvalue(),
780
'.*a-file(.|\n)*b-file')
783
class TestPatienceDiffLib(tests.TestCase):
786
super(TestPatienceDiffLib, self).setUp()
787
self._unique_lcs = _patiencediff_py.unique_lcs_py
788
self._recurse_matches = _patiencediff_py.recurse_matches_py
789
self._PatienceSequenceMatcher = \
790
_patiencediff_py.PatienceSequenceMatcher_py
792
def test_diff_unicode_string(self):
793
a = ''.join([unichr(i) for i in range(4000, 4500, 3)])
794
b = ''.join([unichr(i) for i in range(4300, 4800, 2)])
795
sm = self._PatienceSequenceMatcher(None, a, b)
796
mb = sm.get_matching_blocks()
797
self.assertEquals(35, len(mb))
799
def test_unique_lcs(self):
800
unique_lcs = self._unique_lcs
801
self.assertEquals(unique_lcs('', ''), [])
802
self.assertEquals(unique_lcs('', 'a'), [])
803
self.assertEquals(unique_lcs('a', ''), [])
804
self.assertEquals(unique_lcs('a', 'a'), [(0,0)])
805
self.assertEquals(unique_lcs('a', 'b'), [])
806
self.assertEquals(unique_lcs('ab', 'ab'), [(0,0), (1,1)])
807
self.assertEquals(unique_lcs('abcde', 'cdeab'), [(2,0), (3,1), (4,2)])
808
self.assertEquals(unique_lcs('cdeab', 'abcde'), [(0,2), (1,3), (2,4)])
809
self.assertEquals(unique_lcs('abXde', 'abYde'), [(0,0), (1,1),
811
self.assertEquals(unique_lcs('acbac', 'abc'), [(2,1)])
813
def test_recurse_matches(self):
814
def test_one(a, b, matches):
816
self._recurse_matches(
817
a, b, 0, 0, len(a), len(b), test_matches, 10)
818
self.assertEquals(test_matches, matches)
820
test_one(['a', '', 'b', '', 'c'], ['a', 'a', 'b', 'c', 'c'],
821
[(0, 0), (2, 2), (4, 4)])
822
test_one(['a', 'c', 'b', 'a', 'c'], ['a', 'b', 'c'],
823
[(0, 0), (2, 1), (4, 2)])
824
# Even though 'bc' is not unique globally, and is surrounded by
825
# non-matching lines, we should still match, because they are locally
827
test_one('abcdbce', 'afbcgdbce', [(0,0), (1, 2), (2, 3), (3, 5),
828
(4, 6), (5, 7), (6, 8)])
830
# recurse_matches doesn't match non-unique
831
# lines surrounded by bogus text.
832
# The update has been done in patiencediff.SequenceMatcher instead
834
# This is what it could be
835
#test_one('aBccDe', 'abccde', [(0,0), (2,2), (3,3), (5,5)])
837
# This is what it currently gives:
838
test_one('aBccDe', 'abccde', [(0,0), (5,5)])
840
def assertDiffBlocks(self, a, b, expected_blocks):
841
"""Check that the sequence matcher returns the correct blocks.
843
:param a: A sequence to match
844
:param b: Another sequence to match
845
:param expected_blocks: The expected output, not including the final
846
matching block (len(a), len(b), 0)
848
matcher = self._PatienceSequenceMatcher(None, a, b)
849
blocks = matcher.get_matching_blocks()
851
self.assertEqual((len(a), len(b), 0), last)
852
self.assertEqual(expected_blocks, blocks)
854
def test_matching_blocks(self):
855
# Some basic matching tests
856
self.assertDiffBlocks('', '', [])
857
self.assertDiffBlocks([], [], [])
858
self.assertDiffBlocks('abc', '', [])
859
self.assertDiffBlocks('', 'abc', [])
860
self.assertDiffBlocks('abcd', 'abcd', [(0, 0, 4)])
861
self.assertDiffBlocks('abcd', 'abce', [(0, 0, 3)])
862
self.assertDiffBlocks('eabc', 'abce', [(1, 0, 3)])
863
self.assertDiffBlocks('eabce', 'abce', [(1, 0, 4)])
864
self.assertDiffBlocks('abcde', 'abXde', [(0, 0, 2), (3, 3, 2)])
865
self.assertDiffBlocks('abcde', 'abXYZde', [(0, 0, 2), (3, 5, 2)])
866
self.assertDiffBlocks('abde', 'abXYZde', [(0, 0, 2), (2, 5, 2)])
867
# This may check too much, but it checks to see that
868
# a copied block stays attached to the previous section,
870
# difflib would tend to grab the trailing longest match
871
# which would make the diff not look right
872
self.assertDiffBlocks('abcdefghijklmnop', 'abcdefxydefghijklmnop',
873
[(0, 0, 6), (6, 11, 10)])
875
# make sure it supports passing in lists
876
self.assertDiffBlocks(
879
'how are you today?\n'],
881
'how are you today?\n'],
882
[(0, 0, 1), (2, 1, 1)])
884
# non unique lines surrounded by non-matching lines
886
self.assertDiffBlocks('aBccDe', 'abccde', [(0,0,1), (5,5,1)])
888
# But they only need to be locally unique
889
self.assertDiffBlocks('aBcDec', 'abcdec', [(0,0,1), (2,2,1), (4,4,2)])
891
# non unique blocks won't be matched
892
self.assertDiffBlocks('aBcdEcdFg', 'abcdecdfg', [(0,0,1), (8,8,1)])
894
# but locally unique ones will
895
self.assertDiffBlocks('aBcdEeXcdFg', 'abcdecdfg', [(0,0,1), (2,2,2),
896
(5,4,1), (7,5,2), (10,8,1)])
898
self.assertDiffBlocks('abbabbXd', 'cabbabxd', [(7,7,1)])
899
self.assertDiffBlocks('abbabbbb', 'cabbabbc', [])
900
self.assertDiffBlocks('bbbbbbbb', 'cbbbbbbc', [])
902
def test_matching_blocks_tuples(self):
903
# Some basic matching tests
904
self.assertDiffBlocks([], [], [])
905
self.assertDiffBlocks([('a',), ('b',), ('c,')], [], [])
906
self.assertDiffBlocks([], [('a',), ('b',), ('c,')], [])
907
self.assertDiffBlocks([('a',), ('b',), ('c,')],
908
[('a',), ('b',), ('c,')],
910
self.assertDiffBlocks([('a',), ('b',), ('c,')],
911
[('a',), ('b',), ('d,')],
913
self.assertDiffBlocks([('d',), ('b',), ('c,')],
914
[('a',), ('b',), ('c,')],
916
self.assertDiffBlocks([('d',), ('a',), ('b',), ('c,')],
917
[('a',), ('b',), ('c,')],
919
self.assertDiffBlocks([('a', 'b'), ('c', 'd'), ('e', 'f')],
920
[('a', 'b'), ('c', 'X'), ('e', 'f')],
921
[(0, 0, 1), (2, 2, 1)])
922
self.assertDiffBlocks([('a', 'b'), ('c', 'd'), ('e', 'f')],
923
[('a', 'b'), ('c', 'dX'), ('e', 'f')],
924
[(0, 0, 1), (2, 2, 1)])
926
def test_opcodes(self):
927
def chk_ops(a, b, expected_codes):
928
s = self._PatienceSequenceMatcher(None, a, b)
929
self.assertEquals(expected_codes, s.get_opcodes())
933
chk_ops('abc', '', [('delete', 0,3, 0,0)])
934
chk_ops('', 'abc', [('insert', 0,0, 0,3)])
935
chk_ops('abcd', 'abcd', [('equal', 0,4, 0,4)])
936
chk_ops('abcd', 'abce', [('equal', 0,3, 0,3),
937
('replace', 3,4, 3,4)
939
chk_ops('eabc', 'abce', [('delete', 0,1, 0,0),
943
chk_ops('eabce', 'abce', [('delete', 0,1, 0,0),
946
chk_ops('abcde', 'abXde', [('equal', 0,2, 0,2),
947
('replace', 2,3, 2,3),
950
chk_ops('abcde', 'abXYZde', [('equal', 0,2, 0,2),
951
('replace', 2,3, 2,5),
954
chk_ops('abde', 'abXYZde', [('equal', 0,2, 0,2),
955
('insert', 2,2, 2,5),
958
chk_ops('abcdefghijklmnop', 'abcdefxydefghijklmnop',
959
[('equal', 0,6, 0,6),
960
('insert', 6,6, 6,11),
961
('equal', 6,16, 11,21)
966
, 'how are you today?\n'],
968
, 'how are you today?\n'],
969
[('equal', 0,1, 0,1),
970
('delete', 1,2, 1,1),
973
chk_ops('aBccDe', 'abccde',
974
[('equal', 0,1, 0,1),
975
('replace', 1,5, 1,5),
978
chk_ops('aBcDec', 'abcdec',
979
[('equal', 0,1, 0,1),
980
('replace', 1,2, 1,2),
982
('replace', 3,4, 3,4),
985
chk_ops('aBcdEcdFg', 'abcdecdfg',
986
[('equal', 0,1, 0,1),
987
('replace', 1,8, 1,8),
990
chk_ops('aBcdEeXcdFg', 'abcdecdfg',
991
[('equal', 0,1, 0,1),
992
('replace', 1,2, 1,2),
994
('delete', 4,5, 4,4),
996
('delete', 6,7, 5,5),
998
('replace', 9,10, 7,8),
999
('equal', 10,11, 8,9)
1002
def test_grouped_opcodes(self):
1003
def chk_ops(a, b, expected_codes, n=3):
1004
s = self._PatienceSequenceMatcher(None, a, b)
1005
self.assertEquals(expected_codes, list(s.get_grouped_opcodes(n)))
1009
chk_ops('abc', '', [[('delete', 0,3, 0,0)]])
1010
chk_ops('', 'abc', [[('insert', 0,0, 0,3)]])
1011
chk_ops('abcd', 'abcd', [])
1012
chk_ops('abcd', 'abce', [[('equal', 0,3, 0,3),
1013
('replace', 3,4, 3,4)
1015
chk_ops('eabc', 'abce', [[('delete', 0,1, 0,0),
1016
('equal', 1,4, 0,3),
1017
('insert', 4,4, 3,4)
1019
chk_ops('abcdefghijklmnop', 'abcdefxydefghijklmnop',
1020
[[('equal', 3,6, 3,6),
1021
('insert', 6,6, 6,11),
1022
('equal', 6,9, 11,14)
1024
chk_ops('abcdefghijklmnop', 'abcdefxydefghijklmnop',
1025
[[('equal', 2,6, 2,6),
1026
('insert', 6,6, 6,11),
1027
('equal', 6,10, 11,15)
1029
chk_ops('Xabcdef', 'abcdef',
1030
[[('delete', 0,1, 0,0),
1033
chk_ops('abcdef', 'abcdefX',
1034
[[('equal', 3,6, 3,6),
1035
('insert', 6,6, 6,7)
1039
def test_multiple_ranges(self):
1040
# There was an earlier bug where we used a bad set of ranges,
1041
# this triggers that specific bug, to make sure it doesn't regress
1042
self.assertDiffBlocks('abcdefghijklmnop',
1043
'abcXghiYZQRSTUVWXYZijklmnop',
1044
[(0, 0, 3), (6, 4, 3), (9, 20, 7)])
1046
self.assertDiffBlocks('ABCd efghIjk L',
1047
'AxyzBCn mo pqrstuvwI1 2 L',
1048
[(0,0,1), (1, 4, 2), (9, 19, 1), (12, 23, 3)])
1050
# These are rot13 code snippets.
1051
self.assertDiffBlocks('''\
1052
trg nqqrq jura lbh nqq n svyr va gur qverpgbel.
1054
gnxrf_netf = ['svyr*']
1055
gnxrf_bcgvbaf = ['ab-erphefr']
1057
qrs eha(frys, svyr_yvfg, ab_erphefr=Snyfr):
1058
sebz omeyvo.nqq vzcbeg fzneg_nqq, nqq_ercbegre_cevag, nqq_ercbegre_ahyy
1060
ercbegre = nqq_ercbegre_ahyy
1062
ercbegre = nqq_ercbegre_cevag
1063
fzneg_nqq(svyr_yvfg, abg ab_erphefr, ercbegre)
1066
pynff pzq_zxqve(Pbzznaq):
1067
'''.splitlines(True), '''\
1068
trg nqqrq jura lbh nqq n svyr va gur qverpgbel.
1070
--qel-eha jvyy fubj juvpu svyrf jbhyq or nqqrq, ohg abg npghnyyl
1073
gnxrf_netf = ['svyr*']
1074
gnxrf_bcgvbaf = ['ab-erphefr', 'qel-eha']
1076
qrs eha(frys, svyr_yvfg, ab_erphefr=Snyfr, qel_eha=Snyfr):
1081
# Guvf vf cbvagyrff, ohg V'q engure abg envfr na reebe
1082
npgvba = omeyvo.nqq.nqq_npgvba_ahyy
1084
npgvba = omeyvo.nqq.nqq_npgvba_cevag
1086
npgvba = omeyvo.nqq.nqq_npgvba_nqq
1088
npgvba = omeyvo.nqq.nqq_npgvba_nqq_naq_cevag
1090
omeyvo.nqq.fzneg_nqq(svyr_yvfg, abg ab_erphefr, npgvba)
1093
pynff pzq_zxqve(Pbzznaq):
1094
'''.splitlines(True)
1095
, [(0,0,1), (1, 4, 2), (9, 19, 1), (12, 23, 3)])
1097
def test_patience_unified_diff(self):
1098
txt_a = ['hello there\n',
1100
'how are you today?\n']
1101
txt_b = ['hello there\n',
1102
'how are you today?\n']
1103
unified_diff = patiencediff.unified_diff
1104
psm = self._PatienceSequenceMatcher
1105
self.assertEquals(['--- \n',
1107
'@@ -1,3 +1,2 @@\n',
1110
' how are you today?\n'
1112
, list(unified_diff(txt_a, txt_b,
1113
sequencematcher=psm)))
1114
txt_a = map(lambda x: x+'\n', 'abcdefghijklmnop')
1115
txt_b = map(lambda x: x+'\n', 'abcdefxydefghijklmnop')
1116
# This is the result with LongestCommonSubstring matching
1117
self.assertEquals(['--- \n',
1119
'@@ -1,6 +1,11 @@\n',
1131
, list(unified_diff(txt_a, txt_b)))
1132
# And the patience diff
1133
self.assertEquals(['--- \n',
1135
'@@ -4,6 +4,11 @@\n',
1148
, list(unified_diff(txt_a, txt_b,
1149
sequencematcher=psm)))
1151
def test_patience_unified_diff_with_dates(self):
1152
txt_a = ['hello there\n',
1154
'how are you today?\n']
1155
txt_b = ['hello there\n',
1156
'how are you today?\n']
1157
unified_diff = patiencediff.unified_diff
1158
psm = self._PatienceSequenceMatcher
1159
self.assertEquals(['--- a\t2008-08-08\n',
1160
'+++ b\t2008-09-09\n',
1161
'@@ -1,3 +1,2 @@\n',
1164
' how are you today?\n'
1166
, list(unified_diff(txt_a, txt_b,
1167
fromfile='a', tofile='b',
1168
fromfiledate='2008-08-08',
1169
tofiledate='2008-09-09',
1170
sequencematcher=psm)))
1173
class TestPatienceDiffLib_c(TestPatienceDiffLib):
1175
_test_needs_features = [compiled_patiencediff_feature]
1178
super(TestPatienceDiffLib_c, self).setUp()
1179
from bzrlib import _patiencediff_c
1180
self._unique_lcs = _patiencediff_c.unique_lcs_c
1181
self._recurse_matches = _patiencediff_c.recurse_matches_c
1182
self._PatienceSequenceMatcher = \
1183
_patiencediff_c.PatienceSequenceMatcher_c
1185
def test_unhashable(self):
1186
"""We should get a proper exception here."""
1187
# We need to be able to hash items in the sequence, lists are
1188
# unhashable, and thus cannot be diffed
1189
e = self.assertRaises(TypeError, self._PatienceSequenceMatcher,
1191
e = self.assertRaises(TypeError, self._PatienceSequenceMatcher,
1192
None, ['valid', []], [])
1193
e = self.assertRaises(TypeError, self._PatienceSequenceMatcher,
1194
None, ['valid'], [[]])
1195
e = self.assertRaises(TypeError, self._PatienceSequenceMatcher,
1196
None, ['valid'], ['valid', []])
1199
class TestPatienceDiffLibFiles(tests.TestCaseInTempDir):
1202
super(TestPatienceDiffLibFiles, self).setUp()
1203
self._PatienceSequenceMatcher = \
1204
_patiencediff_py.PatienceSequenceMatcher_py
1206
def test_patience_unified_diff_files(self):
1207
txt_a = ['hello there\n',
1209
'how are you today?\n']
1210
txt_b = ['hello there\n',
1211
'how are you today?\n']
1212
open('a1', 'wb').writelines(txt_a)
1213
open('b1', 'wb').writelines(txt_b)
1215
unified_diff_files = patiencediff.unified_diff_files
1216
psm = self._PatienceSequenceMatcher
1217
self.assertEquals(['--- a1\n',
1219
'@@ -1,3 +1,2 @@\n',
1222
' how are you today?\n',
1224
, list(unified_diff_files('a1', 'b1',
1225
sequencematcher=psm)))
1227
txt_a = map(lambda x: x+'\n', 'abcdefghijklmnop')
1228
txt_b = map(lambda x: x+'\n', 'abcdefxydefghijklmnop')
1229
open('a2', 'wb').writelines(txt_a)
1230
open('b2', 'wb').writelines(txt_b)
1232
# This is the result with LongestCommonSubstring matching
1233
self.assertEquals(['--- a2\n',
1235
'@@ -1,6 +1,11 @@\n',
1247
, list(unified_diff_files('a2', 'b2')))
1249
# And the patience diff
1250
self.assertEquals(['--- a2\n',
1252
'@@ -4,6 +4,11 @@\n',
1265
, list(unified_diff_files('a2', 'b2',
1266
sequencematcher=psm)))
1269
class TestPatienceDiffLibFiles_c(TestPatienceDiffLibFiles):
1271
_test_needs_features = [compiled_patiencediff_feature]
1274
super(TestPatienceDiffLibFiles_c, self).setUp()
1275
from bzrlib import _patiencediff_c
1276
self._PatienceSequenceMatcher = \
1277
_patiencediff_c.PatienceSequenceMatcher_c
1280
class TestUsingCompiledIfAvailable(tests.TestCase):
1282
def test_PatienceSequenceMatcher(self):
1283
if compiled_patiencediff_feature.available():
1284
from bzrlib._patiencediff_c import PatienceSequenceMatcher_c
1285
self.assertIs(PatienceSequenceMatcher_c,
1286
patiencediff.PatienceSequenceMatcher)
1288
from bzrlib._patiencediff_py import PatienceSequenceMatcher_py
1289
self.assertIs(PatienceSequenceMatcher_py,
1290
patiencediff.PatienceSequenceMatcher)
1292
def test_unique_lcs(self):
1293
if compiled_patiencediff_feature.available():
1294
from bzrlib._patiencediff_c import unique_lcs_c
1295
self.assertIs(unique_lcs_c,
1296
patiencediff.unique_lcs)
1298
from bzrlib._patiencediff_py import unique_lcs_py
1299
self.assertIs(unique_lcs_py,
1300
patiencediff.unique_lcs)
1302
def test_recurse_matches(self):
1303
if compiled_patiencediff_feature.available():
1304
from bzrlib._patiencediff_c import recurse_matches_c
1305
self.assertIs(recurse_matches_c,
1306
patiencediff.recurse_matches)
1308
from bzrlib._patiencediff_py import recurse_matches_py
1309
self.assertIs(recurse_matches_py,
1310
patiencediff.recurse_matches)
1313
class TestDiffFromTool(tests.TestCaseWithTransport):
1315
def test_from_string(self):
1316
diff_obj = diff.DiffFromTool.from_string('diff', None, None, None)
1317
self.addCleanup(diff_obj.finish)
1318
self.assertEqual(['diff', '@old_path', '@new_path'],
1319
diff_obj.command_template)
1321
def test_from_string_u5(self):
1322
diff_obj = diff.DiffFromTool.from_string('diff "-u 5"',
1324
self.addCleanup(diff_obj.finish)
1325
self.assertEqual(['diff', '-u 5', '@old_path', '@new_path'],
1326
diff_obj.command_template)
1327
self.assertEqual(['diff', '-u 5', 'old-path', 'new-path'],
1328
diff_obj._get_command('old-path', 'new-path'))
1330
def test_from_string_path_with_backslashes(self):
1331
self.requireFeature(features.backslashdir_feature)
1332
tool = 'C:\\Tools\\Diff.exe'
1333
diff_obj = diff.DiffFromTool.from_string(tool, None, None, None)
1334
self.addCleanup(diff_obj.finish)
1335
self.assertEqual(['C:\\Tools\\Diff.exe', '@old_path', '@new_path'],
1336
diff_obj.command_template)
1337
self.assertEqual(['C:\\Tools\\Diff.exe', 'old-path', 'new-path'],
1338
diff_obj._get_command('old-path', 'new-path'))
1340
def test_execute(self):
1342
diff_obj = diff.DiffFromTool(['python', '-c',
1343
'print "@old_path @new_path"'],
1345
self.addCleanup(diff_obj.finish)
1346
diff_obj._execute('old', 'new')
1347
self.assertEqual(output.getvalue().rstrip(), 'old new')
1349
def test_excute_missing(self):
1350
diff_obj = diff.DiffFromTool(['a-tool-which-is-unlikely-to-exist'],
1352
self.addCleanup(diff_obj.finish)
1353
e = self.assertRaises(errors.ExecutableMissing, diff_obj._execute,
1355
self.assertEqual('a-tool-which-is-unlikely-to-exist could not be found'
1356
' on this machine', str(e))
1358
def test_prepare_files_creates_paths_readable_by_windows_tool(self):
1359
self.requireFeature(AttribFeature)
1361
tree = self.make_branch_and_tree('tree')
1362
self.build_tree_contents([('tree/file', 'content')])
1363
tree.add('file', 'file-id')
1364
tree.commit('old tree')
1366
self.addCleanup(tree.unlock)
1367
basis_tree = tree.basis_tree()
1368
basis_tree.lock_read()
1369
self.addCleanup(basis_tree.unlock)
1370
diff_obj = diff.DiffFromTool(['python', '-c',
1371
'print "@old_path @new_path"'],
1372
basis_tree, tree, output)
1373
diff_obj._prepare_files('file-id', 'file', 'file')
1374
# The old content should be readonly
1375
self.assertReadableByAttrib(diff_obj._root, 'old\\file',
1377
# The new content should use the tree object, not a 'new' file anymore
1378
self.assertEndsWith(tree.basedir, 'work/tree')
1379
self.assertReadableByAttrib(tree.basedir, 'file', r'work\\tree\\file$')
1381
def assertReadableByAttrib(self, cwd, relpath, regex):
1382
proc = subprocess.Popen(['attrib', relpath],
1383
stdout=subprocess.PIPE,
1385
(result, err) = proc.communicate()
1386
self.assertContainsRe(result.replace('\r\n', '\n'), regex)
1388
def test_prepare_files(self):
1390
tree = self.make_branch_and_tree('tree')
1391
self.build_tree_contents([('tree/oldname', 'oldcontent')])
1392
self.build_tree_contents([('tree/oldname2', 'oldcontent2')])
1393
tree.add('oldname', 'file-id')
1394
tree.add('oldname2', 'file2-id')
1395
# Earliest allowable date on FAT32 filesystems is 1980-01-01
1396
tree.commit('old tree', timestamp=315532800)
1397
tree.rename_one('oldname', 'newname')
1398
tree.rename_one('oldname2', 'newname2')
1399
self.build_tree_contents([('tree/newname', 'newcontent')])
1400
self.build_tree_contents([('tree/newname2', 'newcontent2')])
1401
old_tree = tree.basis_tree()
1402
old_tree.lock_read()
1403
self.addCleanup(old_tree.unlock)
1405
self.addCleanup(tree.unlock)
1406
diff_obj = diff.DiffFromTool(['python', '-c',
1407
'print "@old_path @new_path"'],
1408
old_tree, tree, output)
1409
self.addCleanup(diff_obj.finish)
1410
self.assertContainsRe(diff_obj._root, 'bzr-diff-[^/]*')
1411
old_path, new_path = diff_obj._prepare_files('file-id', 'oldname',
1413
self.assertContainsRe(old_path, 'old/oldname$')
1414
self.assertEqual(315532800, os.stat(old_path).st_mtime)
1415
self.assertContainsRe(new_path, 'tree/newname$')
1416
self.assertFileEqual('oldcontent', old_path)
1417
self.assertFileEqual('newcontent', new_path)
1418
if osutils.host_os_dereferences_symlinks():
1419
self.assertTrue(os.path.samefile('tree/newname', new_path))
1420
# make sure we can create files with the same parent directories
1421
diff_obj._prepare_files('file2-id', 'oldname2', 'newname2')
1424
class TestGetTreesAndBranchesToDiffLocked(tests.TestCaseWithTransport):
1426
def call_gtabtd(self, path_list, revision_specs, old_url, new_url):
1427
"""Call get_trees_and_branches_to_diff_locked. Overridden by
1428
TestGetTreesAndBranchesToDiff.
1430
return diff.get_trees_and_branches_to_diff_locked(
1431
path_list, revision_specs, old_url, new_url, self.addCleanup)
1433
def test_basic(self):
1434
tree = self.make_branch_and_tree('tree')
1435
(old_tree, new_tree,
1436
old_branch, new_branch,
1437
specific_files, extra_trees) = self.call_gtabtd(
1438
['tree'], None, None, None)
1440
self.assertIsInstance(old_tree, revisiontree.RevisionTree)
1441
self.assertEqual(_mod_revision.NULL_REVISION,
1442
old_tree.get_revision_id())
1443
self.assertEqual(tree.basedir, new_tree.basedir)
1444
self.assertEqual(tree.branch.base, old_branch.base)
1445
self.assertEqual(tree.branch.base, new_branch.base)
1446
self.assertIs(None, specific_files)
1447
self.assertIs(None, extra_trees)
1449
def test_with_rev_specs(self):
1450
tree = self.make_branch_and_tree('tree')
1451
self.build_tree_contents([('tree/file', 'oldcontent')])
1452
tree.add('file', 'file-id')
1453
tree.commit('old tree', timestamp=0, rev_id="old-id")
1454
self.build_tree_contents([('tree/file', 'newcontent')])
1455
tree.commit('new tree', timestamp=0, rev_id="new-id")
1457
revisions = [revisionspec.RevisionSpec.from_string('1'),
1458
revisionspec.RevisionSpec.from_string('2')]
1459
(old_tree, new_tree,
1460
old_branch, new_branch,
1461
specific_files, extra_trees) = self.call_gtabtd(
1462
['tree'], revisions, None, None)
1464
self.assertIsInstance(old_tree, revisiontree.RevisionTree)
1465
self.assertEqual("old-id", old_tree.get_revision_id())
1466
self.assertIsInstance(new_tree, revisiontree.RevisionTree)
1467
self.assertEqual("new-id", new_tree.get_revision_id())
1468
self.assertEqual(tree.branch.base, old_branch.base)
1469
self.assertEqual(tree.branch.base, new_branch.base)
1470
self.assertIs(None, specific_files)
1471
self.assertEqual(tree.basedir, extra_trees[0].basedir)
1474
class TestGetTreesAndBranchesToDiff(TestGetTreesAndBranchesToDiffLocked):
1475
"""Apply the tests for get_trees_and_branches_to_diff_locked to the
1476
deprecated get_trees_and_branches_to_diff function.
1479
def call_gtabtd(self, path_list, revision_specs, old_url, new_url):
1480
return self.applyDeprecated(
1481
deprecated_in((2, 2, 0)), diff.get_trees_and_branches_to_diff,
1482
path_list, revision_specs, old_url, new_url)
added
removed
bzrlib/tests/test_diff.py
