← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_diff.py

  • Committer: Vincent Ladeuil
  • Date: 2010-04-28 10:33:44 UTC
  • mfrom: (5171.2.3 401599-strict-warnings)
  • mto: This revision was merged to the branch mainline in revision 5191.
  • Revision ID: v.ladeuil+lp@free.fr-20100428103344-e32qf3cn1avdd2cb
Don't mention --no-strict when we just issue the warning about unclean trees

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
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
33
33
    transform,
34
34
    )
35
35
from bzrlib.symbol_versioning import deprecated_in
36
 
from bzrlib.tests import features, EncodingAdapter
37
 
from bzrlib.tests.blackbox.test_diff import subst_dates
38
 
from bzrlib.tests import (
39
 
    features,
40
 
    )
 
36
from bzrlib.tests import test_win32utils
 
37
 
 
38
 
 
39
class _AttribFeature(tests.Feature):
 
40
 
 
41
    def _probe(self):
 
42
        if (sys.platform not in ('cygwin', 'win32')):
 
43
            return False
 
44
        try:
 
45
            proc = subprocess.Popen(['attrib', '.'], stdout=subprocess.PIPE)
 
46
        except OSError, e:
 
47
            return False
 
48
        return (0 == proc.wait())
 
49
 
 
50
    def feature_name(self):
 
51
        return 'attrib Windows command-line tool'
 
52
 
 
53
AttribFeature = _AttribFeature()
 
54
 
 
55
 
 
56
compiled_patiencediff_feature = tests.ModuleAvailableFeature(
 
57
                                    'bzrlib._patiencediff_c')
41
58
 
42
59
 
43
60
def udiff_lines(old, new, allow_binary=False):
126
143
        self.check_patch(lines)
127
144
 
128
145
    def test_external_diff_binary_lang_c(self):
 
146
        old_env = {}
129
147
        for lang in ('LANG', 'LC_ALL', 'LANGUAGE'):
130
 
            self.overrideEnv(lang, 'C')
131
 
        lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
132
 
        # Older versions of diffutils say "Binary files", newer
133
 
        # versions just say "Files".
134
 
        self.assertContainsRe(lines[0], '(Binary f|F)iles old and new differ\n')
135
 
        self.assertEquals(lines[1:], ['\n'])
 
148
            old_env[lang] = osutils.set_or_unset_env(lang, 'C')
 
149
        try:
 
150
            lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
 
151
            # Older versions of diffutils say "Binary files", newer
 
152
            # versions just say "Files".
 
153
            self.assertContainsRe(lines[0],
 
154
                                  '(Binary f|F)iles old and new differ\n')
 
155
            self.assertEquals(lines[1:], ['\n'])
 
156
        finally:
 
157
            for lang, old_val in old_env.iteritems():
 
158
                osutils.set_or_unset_env(lang, old_val)
136
159
 
137
160
    def test_no_external_diff(self):
138
161
        """Check that NoDiff is raised when diff is not available"""
139
 
        # Make sure no 'diff' command is available
140
 
        # XXX: Weird, using None instead of '' breaks the test -- vila 20101216
141
 
        self.overrideEnv('PATH', '')
142
 
        self.assertRaises(errors.NoDiff, diff.external_diff,
143
 
                          'old', ['boo\n'], 'new', ['goo\n'],
144
 
                          StringIO(), diff_opts=['-u'])
 
162
        # Use os.environ['PATH'] to make sure no 'diff' command is available
 
163
        orig_path = os.environ['PATH']
 
164
        try:
 
165
            os.environ['PATH'] = ''
 
166
            self.assertRaises(errors.NoDiff, diff.external_diff,
 
167
                              'old', ['boo\n'], 'new', ['goo\n'],
 
168
                              StringIO(), diff_opts=['-u'])
 
169
        finally:
 
170
            os.environ['PATH'] = orig_path
145
171
 
146
172
    def test_internal_diff_default(self):
147
173
        # Default internal diff encoding is utf8
208
234
        output = StringIO.StringIO()
209
235
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
210
236
                            u'new_\xe5', ['new_text\n'], output)
211
 
        self.assertIsInstance(output.getvalue(), str,
 
237
        self.failUnless(isinstance(output.getvalue(), str),
212
238
            'internal_diff should return bytestrings')
213
239
 
214
240
 
231
257
        self.assertEqual(out.splitlines(True) + ['\n'], lines)
232
258
 
233
259
 
234
 
def get_diff_as_string(tree1, tree2, specific_files=None, working_tree=None):
235
 
    output = StringIO()
236
 
    if working_tree is not None:
237
 
        extra_trees = (working_tree,)
238
 
    else:
239
 
        extra_trees = ()
240
 
    diff.show_diff_trees(tree1, tree2, output,
241
 
        specific_files=specific_files,
242
 
        extra_trees=extra_trees, old_label='old/',
243
 
        new_label='new/')
244
 
    return output.getvalue()
245
 
 
246
 
 
247
 
class TestDiffDates(tests.TestCaseWithTransport):
 
260
class TestShowDiffTreesHelper(tests.TestCaseWithTransport):
 
261
    """Has a helper for running show_diff_trees"""
 
262
 
 
263
    def get_diff(self, tree1, tree2, specific_files=None, working_tree=None):
 
264
        output = StringIO()
 
265
        if working_tree is not None:
 
266
            extra_trees = (working_tree,)
 
267
        else:
 
268
            extra_trees = ()
 
269
        diff.show_diff_trees(tree1, tree2, output,
 
270
                             specific_files=specific_files,
 
271
                             extra_trees=extra_trees, old_label='old/',
 
272
                             new_label='new/')
 
273
        return output.getvalue()
 
274
 
 
275
 
 
276
class TestDiffDates(TestShowDiffTreesHelper):
248
277
 
249
278
    def setUp(self):
250
279
        super(TestDiffDates, self).setUp()
285
314
        os.utime('file1', (1144195200, 1144195200)) # 2006-04-05 00:00:00 UTC
286
315
 
287
316
    def test_diff_rev_tree_working_tree(self):
288
 
        output = get_diff_as_string(self.wt.basis_tree(), self.wt)
 
317
        output = self.get_diff(self.wt.basis_tree(), self.wt)
289
318
        # note that the date for old/file1 is from rev 2 rather than from
290
319
        # the basis revision (rev 4)
291
320
        self.assertEqualDiff(output, '''\
301
330
    def test_diff_rev_tree_rev_tree(self):
302
331
        tree1 = self.b.repository.revision_tree('rev-2')
303
332
        tree2 = self.b.repository.revision_tree('rev-3')
304
 
        output = get_diff_as_string(tree1, tree2)
 
333
        output = self.get_diff(tree1, tree2)
305
334
        self.assertEqualDiff(output, '''\
306
335
=== modified file 'file2'
307
336
--- old/file2\t2006-04-01 00:00:00 +0000
315
344
    def test_diff_add_files(self):
316
345
        tree1 = self.b.repository.revision_tree(_mod_revision.NULL_REVISION)
317
346
        tree2 = self.b.repository.revision_tree('rev-1')
318
 
        output = get_diff_as_string(tree1, tree2)
 
347
        output = self.get_diff(tree1, tree2)
319
348
        # the files have the epoch time stamp for the tree in which
320
349
        # they don't exist.
321
350
        self.assertEqualDiff(output, '''\
336
365
    def test_diff_remove_files(self):
337
366
        tree1 = self.b.repository.revision_tree('rev-3')
338
367
        tree2 = self.b.repository.revision_tree('rev-4')
339
 
        output = get_diff_as_string(tree1, tree2)
 
368
        output = self.get_diff(tree1, tree2)
340
369
        # the file has the epoch time stamp for the tree in which
341
370
        # it doesn't exist.
342
371
        self.assertEqualDiff(output, '''\
353
382
        self.wt.rename_one('file1', 'file1b')
354
383
        old_tree = self.b.repository.revision_tree('rev-1')
355
384
        new_tree = self.b.repository.revision_tree('rev-4')
356
 
        out = get_diff_as_string(old_tree, new_tree, specific_files=['file1b'],
 
385
        out = self.get_diff(old_tree, new_tree, specific_files=['file1b'],
357
386
                            working_tree=self.wt)
358
387
        self.assertContainsRe(out, 'file1\t')
359
388
 
365
394
        self.wt.rename_one('file1', 'dir1/file1')
366
395
        old_tree = self.b.repository.revision_tree('rev-1')
367
396
        new_tree = self.b.repository.revision_tree('rev-4')
368
 
        out = get_diff_as_string(old_tree, new_tree, specific_files=['dir1'],
 
397
        out = self.get_diff(old_tree, new_tree, specific_files=['dir1'],
369
398
                            working_tree=self.wt)
370
399
        self.assertContainsRe(out, 'file1\t')
371
 
        out = get_diff_as_string(old_tree, new_tree, specific_files=['dir2'],
 
400
        out = self.get_diff(old_tree, new_tree, specific_files=['dir2'],
372
401
                            working_tree=self.wt)
373
402
        self.assertNotContainsRe(out, 'file1\t')
374
403
 
375
404
 
376
 
class TestShowDiffTrees(tests.TestCaseWithTransport):
 
405
 
 
406
class TestShowDiffTrees(TestShowDiffTreesHelper):
377
407
    """Direct tests for show_diff_trees"""
378
408
 
379
409
    def test_modified_file(self):
384
414
        tree.commit('one', rev_id='rev-1')
385
415
 
386
416
        self.build_tree_contents([('tree/file', 'new contents\n')])
387
 
        d = get_diff_as_string(tree.basis_tree(), tree)
 
417
        d = self.get_diff(tree.basis_tree(), tree)
388
418
        self.assertContainsRe(d, "=== modified file 'file'\n")
389
419
        self.assertContainsRe(d, '--- old/file\t')
390
420
        self.assertContainsRe(d, '\\+\\+\\+ new/file\t')
401
431
 
402
432
        tree.rename_one('dir', 'other')
403
433
        self.build_tree_contents([('tree/other/file', 'new contents\n')])
404
 
        d = get_diff_as_string(tree.basis_tree(), tree)
 
434
        d = self.get_diff(tree.basis_tree(), tree)
405
435
        self.assertContainsRe(d, "=== renamed directory 'dir' => 'other'\n")
406
436
        self.assertContainsRe(d, "=== modified file 'other/file'\n")
407
437
        # XXX: This is technically incorrect, because it used to be at another
420
450
        tree.commit('one', rev_id='rev-1')
421
451
 
422
452
        tree.rename_one('dir', 'newdir')
423
 
        d = get_diff_as_string(tree.basis_tree(), tree)
 
453
        d = self.get_diff(tree.basis_tree(), tree)
424
454
        # Renaming a directory should be a single "you renamed this dir" even
425
455
        # when there are files inside.
426
456
        self.assertEqual(d, "=== renamed directory 'dir' => 'newdir'\n")
433
463
        tree.commit('one', rev_id='rev-1')
434
464
 
435
465
        tree.rename_one('file', 'newname')
436
 
        d = get_diff_as_string(tree.basis_tree(), tree)
 
466
        d = self.get_diff(tree.basis_tree(), tree)
437
467
        self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
438
468
        # We shouldn't have a --- or +++ line, because there is no content
439
469
        # change
448
478
 
449
479
        tree.rename_one('file', 'newname')
450
480
        self.build_tree_contents([('tree/newname', 'new contents\n')])
451
 
        d = get_diff_as_string(tree.basis_tree(), tree)
 
481
        d = self.get_diff(tree.basis_tree(), tree)
452
482
        self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
453
483
        self.assertContainsRe(d, '--- old/file\t')
454
484
        self.assertContainsRe(d, '\\+\\+\\+ new/newname\t')
478
508
        tree.rename_one('c', 'new-c')
479
509
        tree.rename_one('d', 'new-d')
480
510
 
481
 
        d = get_diff_as_string(tree.basis_tree(), tree)
 
511
        d = self.get_diff(tree.basis_tree(), tree)
482
512
 
483
513
        self.assertContainsRe(d, r"file 'a'.*\(properties changed:"
484
514
                                  ".*\+x to -x.*\)")
491
521
        self.assertNotContainsRe(d, r"file 'e'")
492
522
        self.assertNotContainsRe(d, r"file 'f'")
493
523
 
 
524
 
494
525
    def test_binary_unicode_filenames(self):
495
526
        """Test that contents of files are *not* encoded in UTF-8 when there
496
527
        is a binary file in the diff.
497
528
        """
498
529
        # See https://bugs.launchpad.net/bugs/110092.
499
 
        self.requireFeature(features.UnicodeFilenameFeature)
 
530
        self.requireFeature(tests.UnicodeFilenameFeature)
500
531
 
501
532
        # This bug isn't triggered with cStringIO.
502
533
        from StringIO import StringIO
521
552
 
522
553
    def test_unicode_filename(self):
523
554
        """Test when the filename are unicode."""
524
 
        self.requireFeature(features.UnicodeFilenameFeature)
 
555
        self.requireFeature(tests.UnicodeFilenameFeature)
525
556
 
526
557
        alpha, omega = u'\u03b1', u'\u03c9'
527
558
        autf8, outf8 = alpha.encode('utf8'), omega.encode('utf8')
542
573
        tree.add(['add_'+alpha], ['file-id'])
543
574
        self.build_tree_contents([('tree/mod_'+alpha, 'contents_mod\n')])
544
575
 
545
 
        d = get_diff_as_string(tree.basis_tree(), tree)
 
576
        d = self.get_diff(tree.basis_tree(), tree)
546
577
        self.assertContainsRe(d,
547
578
                "=== renamed file 'ren_%s' => 'ren_%s'\n"%(autf8, outf8))
548
579
        self.assertContainsRe(d, "=== added file 'add_%s'"%autf8)
549
580
        self.assertContainsRe(d, "=== modified file 'mod_%s'"%autf8)
550
581
        self.assertContainsRe(d, "=== removed file 'del_%s'"%autf8)
551
582
 
552
 
    def test_unicode_filename_path_encoding(self):
553
 
        """Test for bug #382699: unicode filenames on Windows should be shown
554
 
        in user encoding.
555
 
        """
556
 
        self.requireFeature(features.UnicodeFilenameFeature)
557
 
        # The word 'test' in Russian
558
 
        _russian_test = u'\u0422\u0435\u0441\u0442'
559
 
        directory = _russian_test + u'/'
560
 
        test_txt = _russian_test + u'.txt'
561
 
        u1234 = u'\u1234.txt'
562
 
 
563
 
        tree = self.make_branch_and_tree('.')
564
 
        self.build_tree_contents([
565
 
            (test_txt, 'foo\n'),
566
 
            (u1234, 'foo\n'),
567
 
            (directory, None),
568
 
            ])
569
 
        tree.add([test_txt, u1234, directory])
570
 
 
571
 
        sio = StringIO()
572
 
        diff.show_diff_trees(tree.basis_tree(), tree, sio,
573
 
            path_encoding='cp1251')
574
 
 
575
 
        output = subst_dates(sio.getvalue())
576
 
        shouldbe = ('''\
577
 
=== added directory '%(directory)s'
578
 
=== added file '%(test_txt)s'
579
 
--- a/%(test_txt)s\tYYYY-MM-DD HH:MM:SS +ZZZZ
580
 
+++ b/%(test_txt)s\tYYYY-MM-DD HH:MM:SS +ZZZZ
581
 
@@ -0,0 +1,1 @@
582
 
+foo
583
 
 
584
 
=== added file '?.txt'
585
 
--- a/?.txt\tYYYY-MM-DD HH:MM:SS +ZZZZ
586
 
+++ b/?.txt\tYYYY-MM-DD HH:MM:SS +ZZZZ
587
 
@@ -0,0 +1,1 @@
588
 
+foo
589
 
 
590
 
''' % {'directory': _russian_test.encode('cp1251'),
591
 
       'test_txt': test_txt.encode('cp1251'),
592
 
      })
593
 
        self.assertEqualDiff(output, shouldbe)
594
 
 
595
583
 
596
584
class DiffWasIs(diff.DiffPath):
597
585
 
690
678
             ' \@\@\n-old\n\+new\n\n')
691
679
 
692
680
    def test_diff_kind_change(self):
693
 
        self.requireFeature(features.SymlinkFeature)
 
681
        self.requireFeature(tests.SymlinkFeature)
694
682
        self.build_tree_contents([('old-tree/olddir/',),
695
683
                                  ('old-tree/olddir/oldfile', 'old\n')])
696
684
        self.old_tree.add('olddir')
1154
1142
 
1155
1143
class TestPatienceDiffLib_c(TestPatienceDiffLib):
1156
1144
 
1157
 
    _test_needs_features = [features.compiled_patiencediff_feature]
 
1145
    _test_needs_features = [compiled_patiencediff_feature]
1158
1146
 
1159
1147
    def setUp(self):
1160
1148
        super(TestPatienceDiffLib_c, self).setUp()
1250
1238
 
1251
1239
class TestPatienceDiffLibFiles_c(TestPatienceDiffLibFiles):
1252
1240
 
1253
 
    _test_needs_features = [features.compiled_patiencediff_feature]
 
1241
    _test_needs_features = [compiled_patiencediff_feature]
1254
1242
 
1255
1243
    def setUp(self):
1256
1244
        super(TestPatienceDiffLibFiles_c, self).setUp()
1262
1250
class TestUsingCompiledIfAvailable(tests.TestCase):
1263
1251
 
1264
1252
    def test_PatienceSequenceMatcher(self):
1265
 
        if features.compiled_patiencediff_feature.available():
 
1253
        if compiled_patiencediff_feature.available():
1266
1254
            from bzrlib._patiencediff_c import PatienceSequenceMatcher_c
1267
1255
            self.assertIs(PatienceSequenceMatcher_c,
1268
1256
                          patiencediff.PatienceSequenceMatcher)
1272
1260
                          patiencediff.PatienceSequenceMatcher)
1273
1261
 
1274
1262
    def test_unique_lcs(self):
1275
 
        if features.compiled_patiencediff_feature.available():
 
1263
        if compiled_patiencediff_feature.available():
1276
1264
            from bzrlib._patiencediff_c import unique_lcs_c
1277
1265
            self.assertIs(unique_lcs_c,
1278
1266
                          patiencediff.unique_lcs)
1282
1270
                          patiencediff.unique_lcs)
1283
1271
 
1284
1272
    def test_recurse_matches(self):
1285
 
        if features.compiled_patiencediff_feature.available():
 
1273
        if compiled_patiencediff_feature.available():
1286
1274
            from bzrlib._patiencediff_c import recurse_matches_c
1287
1275
            self.assertIs(recurse_matches_c,
1288
1276
                          patiencediff.recurse_matches)
1310
1298
                         diff_obj._get_command('old-path', 'new-path'))
1311
1299
 
1312
1300
    def test_from_string_path_with_backslashes(self):
1313
 
        self.requireFeature(features.backslashdir_feature)
 
1301
        self.requireFeature(test_win32utils.BackslashDirSeparatorFeature)
1314
1302
        tool = 'C:\\Tools\\Diff.exe'
1315
1303
        diff_obj = diff.DiffFromTool.from_string(tool, None, None, None)
1316
1304
        self.addCleanup(diff_obj.finish)
1338
1326
                         ' on this machine', str(e))
1339
1327
 
1340
1328
    def test_prepare_files_creates_paths_readable_by_windows_tool(self):
1341
 
        self.requireFeature(features.AttribFeature)
 
1329
        self.requireFeature(AttribFeature)
1342
1330
        output = StringIO()
1343
1331
        tree = self.make_branch_and_tree('tree')
1344
1332
        self.build_tree_contents([('tree/file', 'content')])
1403
1391
        diff_obj._prepare_files('file2-id', 'oldname2', 'newname2')
1404
1392
 
1405
1393
 
1406
 
class TestDiffFromToolEncodedFilename(tests.TestCaseWithTransport):
1407
 
 
1408
 
    def test_encodable_filename(self):
1409
 
        # Just checks file path for external diff tool.
1410
 
        # We cannot change CPython's internal encoding used by os.exec*.
1411
 
        import sys
1412
 
        diffobj = diff.DiffFromTool(['dummy', '@old_path', '@new_path'],
1413
 
                                    None, None, None)
1414
 
        for _, scenario in EncodingAdapter.encoding_scenarios:
1415
 
            encoding = scenario['encoding']
1416
 
            dirname  = scenario['info']['directory']
1417
 
            filename = scenario['info']['filename']
1418
 
 
1419
 
            self.overrideAttr(diffobj, '_fenc', lambda: encoding)
1420
 
            relpath = dirname + u'/' + filename
1421
 
            fullpath = diffobj._safe_filename('safe', relpath)
1422
 
            self.assertEqual(
1423
 
                    fullpath,
1424
 
                    fullpath.encode(encoding).decode(encoding)
1425
 
                    )
1426
 
            self.assert_(fullpath.startswith(diffobj._root + '/safe'))
1427
 
 
1428
 
    def test_unencodable_filename(self):
1429
 
        import sys
1430
 
        diffobj = diff.DiffFromTool(['dummy', '@old_path', '@new_path'],
1431
 
                                    None, None, None)
1432
 
        for _, scenario in EncodingAdapter.encoding_scenarios:
1433
 
            encoding = scenario['encoding']
1434
 
            dirname  = scenario['info']['directory']
1435
 
            filename = scenario['info']['filename']
1436
 
 
1437
 
            if encoding == 'iso-8859-1':
1438
 
                encoding = 'iso-8859-2'
1439
 
            else:
1440
 
                encoding = 'iso-8859-1'
1441
 
 
1442
 
            self.overrideAttr(diffobj, '_fenc', lambda: encoding)
1443
 
            relpath = dirname + u'/' + filename
1444
 
            fullpath = diffobj._safe_filename('safe', relpath)
1445
 
            self.assertEqual(
1446
 
                    fullpath,
1447
 
                    fullpath.encode(encoding).decode(encoding)
1448
 
                    )
1449
 
            self.assert_(fullpath.startswith(diffobj._root + '/safe'))
1450
 
 
1451
 
 
1452
1394
class TestGetTreesAndBranchesToDiffLocked(tests.TestCaseWithTransport):
1453
1395
 
1454
1396
    def call_gtabtd(self, path_list, revision_specs, old_url, new_url):
1455
 
        """Call get_trees_and_branches_to_diff_locked."""
 
1397
        """Call get_trees_and_branches_to_diff_locked.  Overridden by
 
1398
        TestGetTreesAndBranchesToDiff.
 
1399
        """
1456
1400
        return diff.get_trees_and_branches_to_diff_locked(
1457
1401
            path_list, revision_specs, old_url, new_url, self.addCleanup)
1458
1402
 
1495
1439
        self.assertEqual(tree.branch.base, new_branch.base)
1496
1440
        self.assertIs(None, specific_files)
1497
1441
        self.assertEqual(tree.basedir, extra_trees[0].basedir)
 
1442
 
 
1443
 
 
1444
class TestGetTreesAndBranchesToDiff(TestGetTreesAndBranchesToDiffLocked):
 
1445
    """Apply the tests for get_trees_and_branches_to_diff_locked to the
 
1446
    deprecated get_trees_and_branches_to_diff function.
 
1447
    """
 
1448
 
 
1449
    def call_gtabtd(self, path_list, revision_specs, old_url, new_url):
 
1450
        return self.applyDeprecated(
 
1451
            deprecated_in((2, 2, 0)), diff.get_trees_and_branches_to_diff,
 
1452
            path_list, revision_specs, old_url, new_url)
 
1453