35
35
from bzrlib.symbol_versioning import deprecated_in
36
from bzrlib.tests import features
36
from bzrlib.tests import features, EncodingAdapter
37
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')
38
from bzrlib.tests import (
61
43
def udiff_lines(old, new, allow_binary=False):
226
208
output = StringIO.StringIO()
227
209
diff.internal_diff(u'old_\xb5', ['old_text\n'],
228
210
u'new_\xe5', ['new_text\n'], output)
229
self.failUnless(isinstance(output.getvalue(), str),
211
self.assertIsInstance(output.getvalue(), str,
230
212
'internal_diff should return bytestrings')
214
def test_internal_diff_default_context(self):
216
diff.internal_diff('old', ['same_text\n','same_text\n','same_text\n',
217
'same_text\n','same_text\n','old_text\n'],
218
'new', ['same_text\n','same_text\n','same_text\n',
219
'same_text\n','same_text\n','new_text\n'], output)
220
lines = output.getvalue().splitlines(True)
221
self.check_patch(lines)
222
self.assertEquals(['--- old\n',
234
def test_internal_diff_no_context(self):
236
diff.internal_diff('old', ['same_text\n','same_text\n','same_text\n',
237
'same_text\n','same_text\n','old_text\n'],
238
'new', ['same_text\n','same_text\n','same_text\n',
239
'same_text\n','same_text\n','new_text\n'], output,
241
lines = output.getvalue().splitlines(True)
242
self.check_patch(lines)
243
self.assertEquals(['--- old\n',
252
def test_internal_diff_more_context(self):
254
diff.internal_diff('old', ['same_text\n','same_text\n','same_text\n',
255
'same_text\n','same_text\n','old_text\n'],
256
'new', ['same_text\n','same_text\n','same_text\n',
257
'same_text\n','same_text\n','new_text\n'], output,
259
lines = output.getvalue().splitlines(True)
260
self.check_patch(lines)
261
self.assertEquals(['--- old\n',
233
278
class TestDiffFiles(tests.TestCaseInTempDir):
238
283
lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
240
285
cmd = ['diff', '-u', '--binary', 'old', 'new']
241
open('old', 'wb').write('\x00foobar\n')
242
open('new', 'wb').write('foo\x00bar\n')
286
with open('old', 'wb') as f: f.write('\x00foobar\n')
287
with open('new', 'wb') as f: f.write('foo\x00bar\n')
243
288
pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
244
289
stdin=subprocess.PIPE)
245
290
out, err = pipe.communicate()
249
294
self.assertEqual(out.splitlines(True) + ['\n'], lines)
252
class TestShowDiffTreesHelper(tests.TestCaseWithTransport):
253
"""Has a helper for running show_diff_trees"""
255
def get_diff(self, tree1, tree2, specific_files=None, working_tree=None):
257
if working_tree is not None:
258
extra_trees = (working_tree,)
261
diff.show_diff_trees(tree1, tree2, output,
262
specific_files=specific_files,
263
extra_trees=extra_trees, old_label='old/',
265
return output.getvalue()
268
class TestDiffDates(TestShowDiffTreesHelper):
297
def get_diff_as_string(tree1, tree2, specific_files=None, working_tree=None):
299
if working_tree is not None:
300
extra_trees = (working_tree,)
303
diff.show_diff_trees(tree1, tree2, output,
304
specific_files=specific_files,
305
extra_trees=extra_trees, old_label='old/',
307
return output.getvalue()
310
class TestDiffDates(tests.TestCaseWithTransport):
271
313
super(TestDiffDates, self).setUp()
306
348
os.utime('file1', (1144195200, 1144195200)) # 2006-04-05 00:00:00 UTC
308
350
def test_diff_rev_tree_working_tree(self):
309
output = self.get_diff(self.wt.basis_tree(), self.wt)
351
output = get_diff_as_string(self.wt.basis_tree(), self.wt)
310
352
# note that the date for old/file1 is from rev 2 rather than from
311
353
# the basis revision (rev 4)
312
354
self.assertEqualDiff(output, '''\
322
364
def test_diff_rev_tree_rev_tree(self):
323
365
tree1 = self.b.repository.revision_tree('rev-2')
324
366
tree2 = self.b.repository.revision_tree('rev-3')
325
output = self.get_diff(tree1, tree2)
367
output = get_diff_as_string(tree1, tree2)
326
368
self.assertEqualDiff(output, '''\
327
369
=== modified file 'file2'
328
370
--- old/file2\t2006-04-01 00:00:00 +0000
336
378
def test_diff_add_files(self):
337
379
tree1 = self.b.repository.revision_tree(_mod_revision.NULL_REVISION)
338
380
tree2 = self.b.repository.revision_tree('rev-1')
339
output = self.get_diff(tree1, tree2)
381
output = get_diff_as_string(tree1, tree2)
340
382
# the files have the epoch time stamp for the tree in which
341
383
# they don't exist.
342
384
self.assertEqualDiff(output, '''\
357
399
def test_diff_remove_files(self):
358
400
tree1 = self.b.repository.revision_tree('rev-3')
359
401
tree2 = self.b.repository.revision_tree('rev-4')
360
output = self.get_diff(tree1, tree2)
402
output = get_diff_as_string(tree1, tree2)
361
403
# the file has the epoch time stamp for the tree in which
362
404
# it doesn't exist.
363
405
self.assertEqualDiff(output, '''\
374
416
self.wt.rename_one('file1', 'file1b')
375
417
old_tree = self.b.repository.revision_tree('rev-1')
376
418
new_tree = self.b.repository.revision_tree('rev-4')
377
out = self.get_diff(old_tree, new_tree, specific_files=['file1b'],
419
out = get_diff_as_string(old_tree, new_tree, specific_files=['file1b'],
378
420
working_tree=self.wt)
379
421
self.assertContainsRe(out, 'file1\t')
386
428
self.wt.rename_one('file1', 'dir1/file1')
387
429
old_tree = self.b.repository.revision_tree('rev-1')
388
430
new_tree = self.b.repository.revision_tree('rev-4')
389
out = self.get_diff(old_tree, new_tree, specific_files=['dir1'],
431
out = get_diff_as_string(old_tree, new_tree, specific_files=['dir1'],
390
432
working_tree=self.wt)
391
433
self.assertContainsRe(out, 'file1\t')
392
out = self.get_diff(old_tree, new_tree, specific_files=['dir2'],
434
out = get_diff_as_string(old_tree, new_tree, specific_files=['dir2'],
393
435
working_tree=self.wt)
394
436
self.assertNotContainsRe(out, 'file1\t')
398
class TestShowDiffTrees(TestShowDiffTreesHelper):
439
class TestShowDiffTrees(tests.TestCaseWithTransport):
399
440
"""Direct tests for show_diff_trees"""
401
442
def test_modified_file(self):
406
447
tree.commit('one', rev_id='rev-1')
408
449
self.build_tree_contents([('tree/file', 'new contents\n')])
409
d = self.get_diff(tree.basis_tree(), tree)
450
d = get_diff_as_string(tree.basis_tree(), tree)
410
451
self.assertContainsRe(d, "=== modified file 'file'\n")
411
452
self.assertContainsRe(d, '--- old/file\t')
412
453
self.assertContainsRe(d, '\\+\\+\\+ new/file\t')
424
465
tree.rename_one('dir', 'other')
425
466
self.build_tree_contents([('tree/other/file', 'new contents\n')])
426
d = self.get_diff(tree.basis_tree(), tree)
467
d = get_diff_as_string(tree.basis_tree(), tree)
427
468
self.assertContainsRe(d, "=== renamed directory 'dir' => 'other'\n")
428
469
self.assertContainsRe(d, "=== modified file 'other/file'\n")
429
470
# XXX: This is technically incorrect, because it used to be at another
442
483
tree.commit('one', rev_id='rev-1')
444
485
tree.rename_one('dir', 'newdir')
445
d = self.get_diff(tree.basis_tree(), tree)
486
d = get_diff_as_string(tree.basis_tree(), tree)
446
487
# Renaming a directory should be a single "you renamed this dir" even
447
488
# when there are files inside.
448
489
self.assertEqual(d, "=== renamed directory 'dir' => 'newdir'\n")
455
496
tree.commit('one', rev_id='rev-1')
457
498
tree.rename_one('file', 'newname')
458
d = self.get_diff(tree.basis_tree(), tree)
499
d = get_diff_as_string(tree.basis_tree(), tree)
459
500
self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
460
501
# We shouldn't have a --- or +++ line, because there is no content
471
512
tree.rename_one('file', 'newname')
472
513
self.build_tree_contents([('tree/newname', 'new contents\n')])
473
d = self.get_diff(tree.basis_tree(), tree)
514
d = get_diff_as_string(tree.basis_tree(), tree)
474
515
self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
475
516
self.assertContainsRe(d, '--- old/file\t')
476
517
self.assertContainsRe(d, '\\+\\+\\+ new/newname\t')
500
541
tree.rename_one('c', 'new-c')
501
542
tree.rename_one('d', 'new-d')
503
d = self.get_diff(tree.basis_tree(), tree)
544
d = get_diff_as_string(tree.basis_tree(), tree)
505
546
self.assertContainsRe(d, r"file 'a'.*\(properties changed:"
506
547
".*\+x to -x.*\)")
544
585
def test_unicode_filename(self):
545
586
"""Test when the filename are unicode."""
546
self.requireFeature(tests.UnicodeFilenameFeature)
587
self.requireFeature(features.UnicodeFilenameFeature)
548
589
alpha, omega = u'\u03b1', u'\u03c9'
549
590
autf8, outf8 = alpha.encode('utf8'), omega.encode('utf8')
564
605
tree.add(['add_'+alpha], ['file-id'])
565
606
self.build_tree_contents([('tree/mod_'+alpha, 'contents_mod\n')])
567
d = self.get_diff(tree.basis_tree(), tree)
608
d = get_diff_as_string(tree.basis_tree(), tree)
568
609
self.assertContainsRe(d,
569
610
"=== renamed file 'ren_%s' => 'ren_%s'\n"%(autf8, outf8))
570
611
self.assertContainsRe(d, "=== added file 'add_%s'"%autf8)
712
753
' \@\@\n-old\n\+new\n\n')
714
755
def test_diff_kind_change(self):
715
self.requireFeature(tests.SymlinkFeature)
756
self.requireFeature(features.SymlinkFeature)
716
757
self.build_tree_contents([('old-tree/olddir/',),
717
758
('old-tree/olddir/oldfile', 'old\n')])
718
759
self.old_tree.add('olddir')
1213
1254
'how are you today?\n']
1214
1255
txt_b = ['hello there\n',
1215
1256
'how are you today?\n']
1216
open('a1', 'wb').writelines(txt_a)
1217
open('b1', 'wb').writelines(txt_b)
1257
with open('a1', 'wb') as f: f.writelines(txt_a)
1258
with open('b1', 'wb') as f: f.writelines(txt_b)
1219
1260
unified_diff_files = patiencediff.unified_diff_files
1220
1261
psm = self._PatienceSequenceMatcher
1231
1272
txt_a = map(lambda x: x+'\n', 'abcdefghijklmnop')
1232
1273
txt_b = map(lambda x: x+'\n', 'abcdefxydefghijklmnop')
1233
open('a2', 'wb').writelines(txt_a)
1234
open('b2', 'wb').writelines(txt_b)
1274
with open('a2', 'wb') as f: f.writelines(txt_a)
1275
with open('b2', 'wb') as f: f.writelines(txt_b)
1236
1277
# This is the result with LongestCommonSubstring matching
1237
1278
self.assertEquals(['--- a2\n',
1284
1325
class TestUsingCompiledIfAvailable(tests.TestCase):
1286
1327
def test_PatienceSequenceMatcher(self):
1287
if compiled_patiencediff_feature.available():
1328
if features.compiled_patiencediff_feature.available():
1288
1329
from bzrlib._patiencediff_c import PatienceSequenceMatcher_c
1289
1330
self.assertIs(PatienceSequenceMatcher_c,
1290
1331
patiencediff.PatienceSequenceMatcher)
1425
1466
diff_obj._prepare_files('file2-id', 'oldname2', 'newname2')
1469
class TestDiffFromToolEncodedFilename(tests.TestCaseWithTransport):
1471
def test_encodable_filename(self):
1472
# Just checks file path for external diff tool.
1473
# We cannot change CPython's internal encoding used by os.exec*.
1475
diffobj = diff.DiffFromTool(['dummy', '@old_path', '@new_path'],
1477
for _, scenario in EncodingAdapter.encoding_scenarios:
1478
encoding = scenario['encoding']
1479
dirname = scenario['info']['directory']
1480
filename = scenario['info']['filename']
1482
self.overrideAttr(diffobj, '_fenc', lambda: encoding)
1483
relpath = dirname + u'/' + filename
1484
fullpath = diffobj._safe_filename('safe', relpath)
1487
fullpath.encode(encoding).decode(encoding)
1489
self.assert_(fullpath.startswith(diffobj._root + '/safe'))
1491
def test_unencodable_filename(self):
1493
diffobj = diff.DiffFromTool(['dummy', '@old_path', '@new_path'],
1495
for _, scenario in EncodingAdapter.encoding_scenarios:
1496
encoding = scenario['encoding']
1497
dirname = scenario['info']['directory']
1498
filename = scenario['info']['filename']
1500
if encoding == 'iso-8859-1':
1501
encoding = 'iso-8859-2'
1503
encoding = 'iso-8859-1'
1505
self.overrideAttr(diffobj, '_fenc', lambda: encoding)
1506
relpath = dirname + u'/' + filename
1507
fullpath = diffobj._safe_filename('safe', relpath)
1510
fullpath.encode(encoding).decode(encoding)
1512
self.assert_(fullpath.startswith(diffobj._root + '/safe'))
1428
1515
class TestGetTreesAndBranchesToDiffLocked(tests.TestCaseWithTransport):
1430
1517
def call_gtabtd(self, path_list, revision_specs, old_url, new_url):
1431
"""Call get_trees_and_branches_to_diff_locked. Overridden by
1432
TestGetTreesAndBranchesToDiff.
1518
"""Call get_trees_and_branches_to_diff_locked."""
1434
1519
return diff.get_trees_and_branches_to_diff_locked(
1435
1520
path_list, revision_specs, old_url, new_url, self.addCleanup)
1473
1558
self.assertEqual(tree.branch.base, new_branch.base)
1474
1559
self.assertIs(None, specific_files)
1475
1560
self.assertEqual(tree.basedir, extra_trees[0].basedir)
1478
class TestGetTreesAndBranchesToDiff(TestGetTreesAndBranchesToDiffLocked):
1479
"""Apply the tests for get_trees_and_branches_to_diff_locked to the
1480
deprecated get_trees_and_branches_to_diff function.
1483
def call_gtabtd(self, path_list, revision_specs, old_url, new_url):
1484
return self.applyDeprecated(
1485
deprecated_in((2, 2, 0)), diff.get_trees_and_branches_to_diff,
1486
path_list, revision_specs, old_url, new_url)