← 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: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2012, 2014, 2016 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
17
17
import os
18
18
from cStringIO import StringIO
19
19
import subprocess
20
 
import sys
21
20
import tempfile
22
21
 
23
22
from bzrlib import (
32
31
    tests,
33
32
    transform,
34
33
    )
35
 
from bzrlib.symbol_versioning import deprecated_in
36
 
from bzrlib.tests import features
 
34
from bzrlib.tests import (
 
35
    features,
 
36
    EncodingAdapter,
 
37
)
37
38
from bzrlib.tests.blackbox.test_diff import subst_dates
38
 
 
39
 
 
40
 
class _AttribFeature(tests.Feature):
41
 
 
42
 
    def _probe(self):
43
 
        if (sys.platform not in ('cygwin', 'win32')):
44
 
            return False
45
 
        try:
46
 
            proc = subprocess.Popen(['attrib', '.'], stdout=subprocess.PIPE)
47
 
        except OSError, e:
48
 
            return False
49
 
        return (0 == proc.wait())
50
 
 
51
 
    def feature_name(self):
52
 
        return 'attrib Windows command-line tool'
53
 
 
54
 
AttribFeature = _AttribFeature()
55
 
 
56
 
 
57
 
compiled_patiencediff_feature = tests.ModuleAvailableFeature(
58
 
                                    'bzrlib._patiencediff_c')
 
39
from bzrlib.tests.scenarios import load_tests_apply_scenarios
 
40
 
 
41
 
 
42
load_tests = load_tests_apply_scenarios
59
43
 
60
44
 
61
45
def udiff_lines(old, new, allow_binary=False):
81
65
    return lines
82
66
 
83
67
 
 
68
class TestDiffOptions(tests.TestCase):
 
69
 
 
70
    def test_unified_added(self):
 
71
        """Check for default style '-u' only if no other style specified
 
72
        in 'diff-options'.
 
73
        """
 
74
        # Verify that style defaults to unified, id est '-u' appended
 
75
        # to option list, in the absence of an alternative style.
 
76
        self.assertEqual(['-a', '-u'], diff.default_style_unified(['-a']))
 
77
 
 
78
 
 
79
class TestDiffOptionsScenarios(tests.TestCase):
 
80
 
 
81
    scenarios = [(s, dict(style=s)) for s in diff.style_option_list]
 
82
    style = None # Set by load_tests_apply_scenarios from scenarios
 
83
 
 
84
    def test_unified_not_added(self):
 
85
        # Verify that for all valid style options, '-u' is not
 
86
        # appended to option list.
 
87
        ret_opts = diff.default_style_unified(diff_opts=["%s" % (self.style,)])
 
88
        self.assertEqual(["%s" % (self.style,)], ret_opts)
 
89
 
 
90
 
84
91
class TestDiff(tests.TestCase):
85
92
 
86
93
    def test_add_nl(self):
87
94
        """diff generates a valid diff for patches that add a newline"""
88
95
        lines = udiff_lines(['boo'], ['boo\n'])
89
96
        self.check_patch(lines)
90
 
        self.assertEquals(lines[4], '\\ No newline at end of file\n')
 
97
        self.assertEqual(lines[4], '\\ No newline at end of file\n')
91
98
            ## "expected no-nl, got %r" % lines[4]
92
99
 
93
100
    def test_add_nl_2(self):
96
103
        """
97
104
        lines = udiff_lines(['boo'], ['goo\n'])
98
105
        self.check_patch(lines)
99
 
        self.assertEquals(lines[4], '\\ No newline at end of file\n')
 
106
        self.assertEqual(lines[4], '\\ No newline at end of file\n')
100
107
            ## "expected no-nl, got %r" % lines[4]
101
108
 
102
109
    def test_remove_nl(self):
105
112
        """
106
113
        lines = udiff_lines(['boo\n'], ['boo'])
107
114
        self.check_patch(lines)
108
 
        self.assertEquals(lines[5], '\\ No newline at end of file\n')
 
115
        self.assertEqual(lines[5], '\\ No newline at end of file\n')
109
116
            ## "expected no-nl, got %r" % lines[5]
110
117
 
111
118
    def check_patch(self, lines):
112
 
        self.assert_(len(lines) > 1)
 
119
        self.assertTrue(len(lines) > 1)
113
120
            ## "Not enough lines for a file header for patch:\n%s" % "".join(lines)
114
 
        self.assert_(lines[0].startswith ('---'))
 
121
        self.assertTrue(lines[0].startswith ('---'))
115
122
            ## 'No orig line for patch:\n%s' % "".join(lines)
116
 
        self.assert_(lines[1].startswith ('+++'))
 
123
        self.assertTrue(lines[1].startswith ('+++'))
117
124
            ## 'No mod line for patch:\n%s' % "".join(lines)
118
 
        self.assert_(len(lines) > 2)
 
125
        self.assertTrue(len(lines) > 2)
119
126
            ## "No hunks for patch:\n%s" % "".join(lines)
120
 
        self.assert_(lines[2].startswith('@@'))
 
127
        self.assertTrue(lines[2].startswith('@@'))
121
128
            ## "No hunk header for patch:\n%s" % "".join(lines)
122
 
        self.assert_('@@' in lines[2][2:])
 
129
        self.assertTrue('@@' in lines[2][2:])
123
130
            ## "Unterminated hunk header for patch:\n%s" % "".join(lines)
124
131
 
125
132
    def test_binary_lines(self):
144
151
        self.check_patch(lines)
145
152
 
146
153
    def test_external_diff_binary_lang_c(self):
147
 
        old_env = {}
148
154
        for lang in ('LANG', 'LC_ALL', 'LANGUAGE'):
149
 
            old_env[lang] = osutils.set_or_unset_env(lang, 'C')
150
 
        try:
151
 
            lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
152
 
            # Older versions of diffutils say "Binary files", newer
153
 
            # versions just say "Files".
154
 
            self.assertContainsRe(lines[0],
155
 
                                  '(Binary f|F)iles old and new differ\n')
156
 
            self.assertEquals(lines[1:], ['\n'])
157
 
        finally:
158
 
            for lang, old_val in old_env.iteritems():
159
 
                osutils.set_or_unset_env(lang, old_val)
 
155
            self.overrideEnv(lang, 'C')
 
156
        lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
 
157
        # Older versions of diffutils say "Binary files", newer
 
158
        # versions just say "Files".
 
159
        self.assertContainsRe(lines[0], '(Binary f|F)iles old and new differ\n')
 
160
        self.assertEqual(lines[1:], ['\n'])
160
161
 
161
162
    def test_no_external_diff(self):
162
163
        """Check that NoDiff is raised when diff is not available"""
163
 
        # Use os.environ['PATH'] to make sure no 'diff' command is available
164
 
        orig_path = os.environ['PATH']
165
 
        try:
166
 
            os.environ['PATH'] = ''
167
 
            self.assertRaises(errors.NoDiff, diff.external_diff,
168
 
                              'old', ['boo\n'], 'new', ['goo\n'],
169
 
                              StringIO(), diff_opts=['-u'])
170
 
        finally:
171
 
            os.environ['PATH'] = orig_path
 
164
        # Make sure no 'diff' command is available
 
165
        # XXX: Weird, using None instead of '' breaks the test -- vila 20101216
 
166
        self.overrideEnv('PATH', '')
 
167
        self.assertRaises(errors.NoDiff, diff.external_diff,
 
168
                          'old', ['boo\n'], 'new', ['goo\n'],
 
169
                          StringIO(), diff_opts=['-u'])
172
170
 
173
171
    def test_internal_diff_default(self):
174
172
        # Default internal diff encoding is utf8
177
175
                           u'new_\xe5', ['new_text\n'], output)
178
176
        lines = output.getvalue().splitlines(True)
179
177
        self.check_patch(lines)
180
 
        self.assertEquals(['--- old_\xc2\xb5\n',
 
178
        self.assertEqual(['--- old_\xc2\xb5\n',
181
179
                           '+++ new_\xc3\xa5\n',
182
180
                           '@@ -1,1 +1,1 @@\n',
183
181
                           '-old_text\n',
193
191
                           path_encoding='utf8')
194
192
        lines = output.getvalue().splitlines(True)
195
193
        self.check_patch(lines)
196
 
        self.assertEquals(['--- old_\xc2\xb5\n',
 
194
        self.assertEqual(['--- old_\xc2\xb5\n',
197
195
                           '+++ new_\xc3\xa5\n',
198
196
                           '@@ -1,1 +1,1 @@\n',
199
197
                           '-old_text\n',
209
207
                           path_encoding='iso-8859-1')
210
208
        lines = output.getvalue().splitlines(True)
211
209
        self.check_patch(lines)
212
 
        self.assertEquals(['--- old_\xb5\n',
 
210
        self.assertEqual(['--- old_\xb5\n',
213
211
                           '+++ new_\xe5\n',
214
212
                           '@@ -1,1 +1,1 @@\n',
215
213
                           '-old_text\n',
235
233
        output = StringIO.StringIO()
236
234
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
237
235
                            u'new_\xe5', ['new_text\n'], output)
238
 
        self.failUnless(isinstance(output.getvalue(), str),
 
236
        self.assertIsInstance(output.getvalue(), str,
239
237
            'internal_diff should return bytestrings')
240
238
 
 
239
    def test_internal_diff_default_context(self):
 
240
        output = StringIO()
 
241
        diff.internal_diff('old', ['same_text\n','same_text\n','same_text\n',
 
242
                           'same_text\n','same_text\n','old_text\n'],
 
243
                           'new', ['same_text\n','same_text\n','same_text\n',
 
244
                           'same_text\n','same_text\n','new_text\n'], output)
 
245
        lines = output.getvalue().splitlines(True)
 
246
        self.check_patch(lines)
 
247
        self.assertEqual(['--- old\n',
 
248
                           '+++ new\n',
 
249
                           '@@ -3,4 +3,4 @@\n',
 
250
                           ' same_text\n',
 
251
                           ' same_text\n',
 
252
                           ' same_text\n',
 
253
                           '-old_text\n',
 
254
                           '+new_text\n',
 
255
                           '\n',
 
256
                          ]
 
257
                          , lines)
 
258
 
 
259
    def test_internal_diff_no_context(self):
 
260
        output = StringIO()
 
261
        diff.internal_diff('old', ['same_text\n','same_text\n','same_text\n',
 
262
                           'same_text\n','same_text\n','old_text\n'],
 
263
                           'new', ['same_text\n','same_text\n','same_text\n',
 
264
                           'same_text\n','same_text\n','new_text\n'], output,
 
265
                           context_lines=0)
 
266
        lines = output.getvalue().splitlines(True)
 
267
        self.check_patch(lines)
 
268
        self.assertEqual(['--- old\n',
 
269
                           '+++ new\n',
 
270
                           '@@ -6,1 +6,1 @@\n',
 
271
                           '-old_text\n',
 
272
                           '+new_text\n',
 
273
                           '\n',
 
274
                          ]
 
275
                          , lines)
 
276
 
 
277
    def test_internal_diff_more_context(self):
 
278
        output = StringIO()
 
279
        diff.internal_diff('old', ['same_text\n','same_text\n','same_text\n',
 
280
                           'same_text\n','same_text\n','old_text\n'],
 
281
                           'new', ['same_text\n','same_text\n','same_text\n',
 
282
                           'same_text\n','same_text\n','new_text\n'], output,
 
283
                           context_lines=4)
 
284
        lines = output.getvalue().splitlines(True)
 
285
        self.check_patch(lines)
 
286
        self.assertEqual(['--- old\n',
 
287
                           '+++ new\n',
 
288
                           '@@ -2,5 +2,5 @@\n',
 
289
                           ' same_text\n',
 
290
                           ' same_text\n',
 
291
                           ' same_text\n',
 
292
                           ' same_text\n',
 
293
                           '-old_text\n',
 
294
                           '+new_text\n',
 
295
                           '\n',
 
296
                          ]
 
297
                          , lines)
 
298
 
 
299
 
 
300
 
 
301
 
241
302
 
242
303
class TestDiffFiles(tests.TestCaseInTempDir):
243
304
 
247
308
        lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
248
309
 
249
310
        cmd = ['diff', '-u', '--binary', 'old', 'new']
250
 
        open('old', 'wb').write('\x00foobar\n')
251
 
        open('new', 'wb').write('foo\x00bar\n')
 
311
        with open('old', 'wb') as f: f.write('\x00foobar\n')
 
312
        with open('new', 'wb') as f: f.write('foo\x00bar\n')
252
313
        pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
253
314
                                     stdin=subprocess.PIPE)
254
315
        out, err = pipe.communicate()
258
319
        self.assertEqual(out.splitlines(True) + ['\n'], lines)
259
320
 
260
321
 
261
 
class TestShowDiffTreesHelper(tests.TestCaseWithTransport):
262
 
    """Has a helper for running show_diff_trees"""
263
 
 
264
 
    def get_diff(self, tree1, tree2, specific_files=None, working_tree=None):
265
 
        output = StringIO()
266
 
        if working_tree is not None:
267
 
            extra_trees = (working_tree,)
268
 
        else:
269
 
            extra_trees = ()
270
 
        diff.show_diff_trees(tree1, tree2, output,
271
 
                             specific_files=specific_files,
272
 
                             extra_trees=extra_trees, old_label='old/',
273
 
                             new_label='new/')
274
 
        return output.getvalue()
275
 
 
276
 
 
277
 
class TestDiffDates(TestShowDiffTreesHelper):
 
322
def get_diff_as_string(tree1, tree2, specific_files=None, working_tree=None):
 
323
    output = StringIO()
 
324
    if working_tree is not None:
 
325
        extra_trees = (working_tree,)
 
326
    else:
 
327
        extra_trees = ()
 
328
    diff.show_diff_trees(tree1, tree2, output,
 
329
        specific_files=specific_files,
 
330
        extra_trees=extra_trees, old_label='old/',
 
331
        new_label='new/')
 
332
    return output.getvalue()
 
333
 
 
334
 
 
335
class TestDiffDates(tests.TestCaseWithTransport):
278
336
 
279
337
    def setUp(self):
280
338
        super(TestDiffDates, self).setUp()
315
373
        os.utime('file1', (1144195200, 1144195200)) # 2006-04-05 00:00:00 UTC
316
374
 
317
375
    def test_diff_rev_tree_working_tree(self):
318
 
        output = self.get_diff(self.wt.basis_tree(), self.wt)
 
376
        output = get_diff_as_string(self.wt.basis_tree(), self.wt)
319
377
        # note that the date for old/file1 is from rev 2 rather than from
320
378
        # the basis revision (rev 4)
321
379
        self.assertEqualDiff(output, '''\
331
389
    def test_diff_rev_tree_rev_tree(self):
332
390
        tree1 = self.b.repository.revision_tree('rev-2')
333
391
        tree2 = self.b.repository.revision_tree('rev-3')
334
 
        output = self.get_diff(tree1, tree2)
 
392
        output = get_diff_as_string(tree1, tree2)
335
393
        self.assertEqualDiff(output, '''\
336
394
=== modified file 'file2'
337
395
--- old/file2\t2006-04-01 00:00:00 +0000
345
403
    def test_diff_add_files(self):
346
404
        tree1 = self.b.repository.revision_tree(_mod_revision.NULL_REVISION)
347
405
        tree2 = self.b.repository.revision_tree('rev-1')
348
 
        output = self.get_diff(tree1, tree2)
 
406
        output = get_diff_as_string(tree1, tree2)
349
407
        # the files have the epoch time stamp for the tree in which
350
408
        # they don't exist.
351
409
        self.assertEqualDiff(output, '''\
366
424
    def test_diff_remove_files(self):
367
425
        tree1 = self.b.repository.revision_tree('rev-3')
368
426
        tree2 = self.b.repository.revision_tree('rev-4')
369
 
        output = self.get_diff(tree1, tree2)
 
427
        output = get_diff_as_string(tree1, tree2)
370
428
        # the file has the epoch time stamp for the tree in which
371
429
        # it doesn't exist.
372
430
        self.assertEqualDiff(output, '''\
383
441
        self.wt.rename_one('file1', 'file1b')
384
442
        old_tree = self.b.repository.revision_tree('rev-1')
385
443
        new_tree = self.b.repository.revision_tree('rev-4')
386
 
        out = self.get_diff(old_tree, new_tree, specific_files=['file1b'],
 
444
        out = get_diff_as_string(old_tree, new_tree, specific_files=['file1b'],
387
445
                            working_tree=self.wt)
388
446
        self.assertContainsRe(out, 'file1\t')
389
447
 
395
453
        self.wt.rename_one('file1', 'dir1/file1')
396
454
        old_tree = self.b.repository.revision_tree('rev-1')
397
455
        new_tree = self.b.repository.revision_tree('rev-4')
398
 
        out = self.get_diff(old_tree, new_tree, specific_files=['dir1'],
 
456
        out = get_diff_as_string(old_tree, new_tree, specific_files=['dir1'],
399
457
                            working_tree=self.wt)
400
458
        self.assertContainsRe(out, 'file1\t')
401
 
        out = self.get_diff(old_tree, new_tree, specific_files=['dir2'],
 
459
        out = get_diff_as_string(old_tree, new_tree, specific_files=['dir2'],
402
460
                            working_tree=self.wt)
403
461
        self.assertNotContainsRe(out, 'file1\t')
404
462
 
405
463
 
406
 
 
407
 
class TestShowDiffTrees(TestShowDiffTreesHelper):
 
464
class TestShowDiffTrees(tests.TestCaseWithTransport):
408
465
    """Direct tests for show_diff_trees"""
409
466
 
410
467
    def test_modified_file(self):
415
472
        tree.commit('one', rev_id='rev-1')
416
473
 
417
474
        self.build_tree_contents([('tree/file', 'new contents\n')])
418
 
        d = self.get_diff(tree.basis_tree(), tree)
 
475
        d = get_diff_as_string(tree.basis_tree(), tree)
419
476
        self.assertContainsRe(d, "=== modified file 'file'\n")
420
477
        self.assertContainsRe(d, '--- old/file\t')
421
478
        self.assertContainsRe(d, '\\+\\+\\+ new/file\t')
432
489
 
433
490
        tree.rename_one('dir', 'other')
434
491
        self.build_tree_contents([('tree/other/file', 'new contents\n')])
435
 
        d = self.get_diff(tree.basis_tree(), tree)
 
492
        d = get_diff_as_string(tree.basis_tree(), tree)
436
493
        self.assertContainsRe(d, "=== renamed directory 'dir' => 'other'\n")
437
494
        self.assertContainsRe(d, "=== modified file 'other/file'\n")
438
495
        # XXX: This is technically incorrect, because it used to be at another
451
508
        tree.commit('one', rev_id='rev-1')
452
509
 
453
510
        tree.rename_one('dir', 'newdir')
454
 
        d = self.get_diff(tree.basis_tree(), tree)
 
511
        d = get_diff_as_string(tree.basis_tree(), tree)
455
512
        # Renaming a directory should be a single "you renamed this dir" even
456
513
        # when there are files inside.
457
514
        self.assertEqual(d, "=== renamed directory 'dir' => 'newdir'\n")
464
521
        tree.commit('one', rev_id='rev-1')
465
522
 
466
523
        tree.rename_one('file', 'newname')
467
 
        d = self.get_diff(tree.basis_tree(), tree)
 
524
        d = get_diff_as_string(tree.basis_tree(), tree)
468
525
        self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
469
526
        # We shouldn't have a --- or +++ line, because there is no content
470
527
        # change
479
536
 
480
537
        tree.rename_one('file', 'newname')
481
538
        self.build_tree_contents([('tree/newname', 'new contents\n')])
482
 
        d = self.get_diff(tree.basis_tree(), tree)
 
539
        d = get_diff_as_string(tree.basis_tree(), tree)
483
540
        self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
484
541
        self.assertContainsRe(d, '--- old/file\t')
485
542
        self.assertContainsRe(d, '\\+\\+\\+ new/newname\t')
509
566
        tree.rename_one('c', 'new-c')
510
567
        tree.rename_one('d', 'new-d')
511
568
 
512
 
        d = self.get_diff(tree.basis_tree(), tree)
 
569
        d = get_diff_as_string(tree.basis_tree(), tree)
513
570
 
514
571
        self.assertContainsRe(d, r"file 'a'.*\(properties changed:"
515
572
                                  ".*\+x to -x.*\)")
527
584
        is a binary file in the diff.
528
585
        """
529
586
        # See https://bugs.launchpad.net/bugs/110092.
530
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
587
        self.requireFeature(features.UnicodeFilenameFeature)
531
588
 
532
589
        # This bug isn't triggered with cStringIO.
533
590
        from StringIO import StringIO
552
609
 
553
610
    def test_unicode_filename(self):
554
611
        """Test when the filename are unicode."""
555
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
612
        self.requireFeature(features.UnicodeFilenameFeature)
556
613
 
557
614
        alpha, omega = u'\u03b1', u'\u03c9'
558
615
        autf8, outf8 = alpha.encode('utf8'), omega.encode('utf8')
573
630
        tree.add(['add_'+alpha], ['file-id'])
574
631
        self.build_tree_contents([('tree/mod_'+alpha, 'contents_mod\n')])
575
632
 
576
 
        d = self.get_diff(tree.basis_tree(), tree)
 
633
        d = get_diff_as_string(tree.basis_tree(), tree)
577
634
        self.assertContainsRe(d,
578
635
                "=== renamed file 'ren_%s' => 'ren_%s'\n"%(autf8, outf8))
579
636
        self.assertContainsRe(d, "=== added file 'add_%s'"%autf8)
584
641
        """Test for bug #382699: unicode filenames on Windows should be shown
585
642
        in user encoding.
586
643
        """
587
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
644
        self.requireFeature(features.UnicodeFilenameFeature)
588
645
        # The word 'test' in Russian
589
646
        _russian_test = u'\u0422\u0435\u0441\u0442'
590
647
        directory = _russian_test + u'/'
721
778
             ' \@\@\n-old\n\+new\n\n')
722
779
 
723
780
    def test_diff_kind_change(self):
724
 
        self.requireFeature(tests.SymlinkFeature)
 
781
        self.requireFeature(features.SymlinkFeature)
725
782
        self.build_tree_contents([('old-tree/olddir/',),
726
783
                                  ('old-tree/olddir/oldfile', 'old\n')])
727
784
        self.old_tree.add('olddir')
807
864
        b = ''.join([unichr(i) for i in range(4300, 4800, 2)])
808
865
        sm = self._PatienceSequenceMatcher(None, a, b)
809
866
        mb = sm.get_matching_blocks()
810
 
        self.assertEquals(35, len(mb))
 
867
        self.assertEqual(35, len(mb))
811
868
 
812
869
    def test_unique_lcs(self):
813
870
        unique_lcs = self._unique_lcs
814
 
        self.assertEquals(unique_lcs('', ''), [])
815
 
        self.assertEquals(unique_lcs('', 'a'), [])
816
 
        self.assertEquals(unique_lcs('a', ''), [])
817
 
        self.assertEquals(unique_lcs('a', 'a'), [(0,0)])
818
 
        self.assertEquals(unique_lcs('a', 'b'), [])
819
 
        self.assertEquals(unique_lcs('ab', 'ab'), [(0,0), (1,1)])
820
 
        self.assertEquals(unique_lcs('abcde', 'cdeab'), [(2,0), (3,1), (4,2)])
821
 
        self.assertEquals(unique_lcs('cdeab', 'abcde'), [(0,2), (1,3), (2,4)])
822
 
        self.assertEquals(unique_lcs('abXde', 'abYde'), [(0,0), (1,1),
 
871
        self.assertEqual(unique_lcs('', ''), [])
 
872
        self.assertEqual(unique_lcs('', 'a'), [])
 
873
        self.assertEqual(unique_lcs('a', ''), [])
 
874
        self.assertEqual(unique_lcs('a', 'a'), [(0,0)])
 
875
        self.assertEqual(unique_lcs('a', 'b'), [])
 
876
        self.assertEqual(unique_lcs('ab', 'ab'), [(0,0), (1,1)])
 
877
        self.assertEqual(unique_lcs('abcde', 'cdeab'), [(2,0), (3,1), (4,2)])
 
878
        self.assertEqual(unique_lcs('cdeab', 'abcde'), [(0,2), (1,3), (2,4)])
 
879
        self.assertEqual(unique_lcs('abXde', 'abYde'), [(0,0), (1,1),
823
880
                                                         (3,3), (4,4)])
824
 
        self.assertEquals(unique_lcs('acbac', 'abc'), [(2,1)])
 
881
        self.assertEqual(unique_lcs('acbac', 'abc'), [(2,1)])
825
882
 
826
883
    def test_recurse_matches(self):
827
884
        def test_one(a, b, matches):
828
885
            test_matches = []
829
886
            self._recurse_matches(
830
887
                a, b, 0, 0, len(a), len(b), test_matches, 10)
831
 
            self.assertEquals(test_matches, matches)
 
888
            self.assertEqual(test_matches, matches)
832
889
 
833
890
        test_one(['a', '', 'b', '', 'c'], ['a', 'a', 'b', 'c', 'c'],
834
891
                 [(0, 0), (2, 2), (4, 4)])
939
996
    def test_opcodes(self):
940
997
        def chk_ops(a, b, expected_codes):
941
998
            s = self._PatienceSequenceMatcher(None, a, b)
942
 
            self.assertEquals(expected_codes, s.get_opcodes())
 
999
            self.assertEqual(expected_codes, s.get_opcodes())
943
1000
 
944
1001
        chk_ops('', '', [])
945
1002
        chk_ops([], [], [])
1015
1072
    def test_grouped_opcodes(self):
1016
1073
        def chk_ops(a, b, expected_codes, n=3):
1017
1074
            s = self._PatienceSequenceMatcher(None, a, b)
1018
 
            self.assertEquals(expected_codes, list(s.get_grouped_opcodes(n)))
 
1075
            self.assertEqual(expected_codes, list(s.get_grouped_opcodes(n)))
1019
1076
 
1020
1077
        chk_ops('', '', [])
1021
1078
        chk_ops([], [], [])
1115
1172
                 'how are you today?\n']
1116
1173
        unified_diff = patiencediff.unified_diff
1117
1174
        psm = self._PatienceSequenceMatcher
1118
 
        self.assertEquals(['--- \n',
 
1175
        self.assertEqual(['--- \n',
1119
1176
                           '+++ \n',
1120
1177
                           '@@ -1,3 +1,2 @@\n',
1121
1178
                           ' hello there\n',
1127
1184
        txt_a = map(lambda x: x+'\n', 'abcdefghijklmnop')
1128
1185
        txt_b = map(lambda x: x+'\n', 'abcdefxydefghijklmnop')
1129
1186
        # This is the result with LongestCommonSubstring matching
1130
 
        self.assertEquals(['--- \n',
 
1187
        self.assertEqual(['--- \n',
1131
1188
                           '+++ \n',
1132
1189
                           '@@ -1,6 +1,11 @@\n',
1133
1190
                           ' a\n',
1143
1200
                           ' f\n']
1144
1201
                          , list(unified_diff(txt_a, txt_b)))
1145
1202
        # And the patience diff
1146
 
        self.assertEquals(['--- \n',
 
1203
        self.assertEqual(['--- \n',
1147
1204
                           '+++ \n',
1148
1205
                           '@@ -4,6 +4,11 @@\n',
1149
1206
                           ' d\n',
1169
1226
                 'how are you today?\n']
1170
1227
        unified_diff = patiencediff.unified_diff
1171
1228
        psm = self._PatienceSequenceMatcher
1172
 
        self.assertEquals(['--- a\t2008-08-08\n',
 
1229
        self.assertEqual(['--- a\t2008-08-08\n',
1173
1230
                           '+++ b\t2008-09-09\n',
1174
1231
                           '@@ -1,3 +1,2 @@\n',
1175
1232
                           ' hello there\n',
1185
1242
 
1186
1243
class TestPatienceDiffLib_c(TestPatienceDiffLib):
1187
1244
 
1188
 
    _test_needs_features = [compiled_patiencediff_feature]
 
1245
    _test_needs_features = [features.compiled_patiencediff_feature]
1189
1246
 
1190
1247
    def setUp(self):
1191
1248
        super(TestPatienceDiffLib_c, self).setUp()
1222
1279
                 'how are you today?\n']
1223
1280
        txt_b = ['hello there\n',
1224
1281
                 'how are you today?\n']
1225
 
        open('a1', 'wb').writelines(txt_a)
1226
 
        open('b1', 'wb').writelines(txt_b)
 
1282
        with open('a1', 'wb') as f: f.writelines(txt_a)
 
1283
        with open('b1', 'wb') as f: f.writelines(txt_b)
1227
1284
 
1228
1285
        unified_diff_files = patiencediff.unified_diff_files
1229
1286
        psm = self._PatienceSequenceMatcher
1230
 
        self.assertEquals(['--- a1\n',
 
1287
        self.assertEqual(['--- a1\n',
1231
1288
                           '+++ b1\n',
1232
1289
                           '@@ -1,3 +1,2 @@\n',
1233
1290
                           ' hello there\n',
1239
1296
 
1240
1297
        txt_a = map(lambda x: x+'\n', 'abcdefghijklmnop')
1241
1298
        txt_b = map(lambda x: x+'\n', 'abcdefxydefghijklmnop')
1242
 
        open('a2', 'wb').writelines(txt_a)
1243
 
        open('b2', 'wb').writelines(txt_b)
 
1299
        with open('a2', 'wb') as f: f.writelines(txt_a)
 
1300
        with open('b2', 'wb') as f: f.writelines(txt_b)
1244
1301
 
1245
1302
        # This is the result with LongestCommonSubstring matching
1246
 
        self.assertEquals(['--- a2\n',
 
1303
        self.assertEqual(['--- a2\n',
1247
1304
                           '+++ b2\n',
1248
1305
                           '@@ -1,6 +1,11 @@\n',
1249
1306
                           ' a\n',
1260
1317
                          , list(unified_diff_files('a2', 'b2')))
1261
1318
 
1262
1319
        # And the patience diff
1263
 
        self.assertEquals(['--- a2\n',
1264
 
                           '+++ b2\n',
1265
 
                           '@@ -4,6 +4,11 @@\n',
1266
 
                           ' d\n',
1267
 
                           ' e\n',
1268
 
                           ' f\n',
1269
 
                           '+x\n',
1270
 
                           '+y\n',
1271
 
                           '+d\n',
1272
 
                           '+e\n',
1273
 
                           '+f\n',
1274
 
                           ' g\n',
1275
 
                           ' h\n',
1276
 
                           ' i\n',
1277
 
                          ]
1278
 
                          , list(unified_diff_files('a2', 'b2',
1279
 
                                 sequencematcher=psm)))
 
1320
        self.assertEqual(['--- a2\n',
 
1321
                          '+++ b2\n',
 
1322
                          '@@ -4,6 +4,11 @@\n',
 
1323
                          ' d\n',
 
1324
                          ' e\n',
 
1325
                          ' f\n',
 
1326
                          '+x\n',
 
1327
                          '+y\n',
 
1328
                          '+d\n',
 
1329
                          '+e\n',
 
1330
                          '+f\n',
 
1331
                          ' g\n',
 
1332
                          ' h\n',
 
1333
                          ' i\n'],
 
1334
                         list(unified_diff_files('a2', 'b2',
 
1335
                                                 sequencematcher=psm)))
1280
1336
 
1281
1337
 
1282
1338
class TestPatienceDiffLibFiles_c(TestPatienceDiffLibFiles):
1283
1339
 
1284
 
    _test_needs_features = [compiled_patiencediff_feature]
 
1340
    _test_needs_features = [features.compiled_patiencediff_feature]
1285
1341
 
1286
1342
    def setUp(self):
1287
1343
        super(TestPatienceDiffLibFiles_c, self).setUp()
1293
1349
class TestUsingCompiledIfAvailable(tests.TestCase):
1294
1350
 
1295
1351
    def test_PatienceSequenceMatcher(self):
1296
 
        if compiled_patiencediff_feature.available():
 
1352
        if features.compiled_patiencediff_feature.available():
1297
1353
            from bzrlib._patiencediff_c import PatienceSequenceMatcher_c
1298
1354
            self.assertIs(PatienceSequenceMatcher_c,
1299
1355
                          patiencediff.PatienceSequenceMatcher)
1303
1359
                          patiencediff.PatienceSequenceMatcher)
1304
1360
 
1305
1361
    def test_unique_lcs(self):
1306
 
        if compiled_patiencediff_feature.available():
 
1362
        if features.compiled_patiencediff_feature.available():
1307
1363
            from bzrlib._patiencediff_c import unique_lcs_c
1308
1364
            self.assertIs(unique_lcs_c,
1309
1365
                          patiencediff.unique_lcs)
1313
1369
                          patiencediff.unique_lcs)
1314
1370
 
1315
1371
    def test_recurse_matches(self):
1316
 
        if compiled_patiencediff_feature.available():
 
1372
        if features.compiled_patiencediff_feature.available():
1317
1373
            from bzrlib._patiencediff_c import recurse_matches_c
1318
1374
            self.assertIs(recurse_matches_c,
1319
1375
                          patiencediff.recurse_matches)
1359
1415
        diff_obj._execute('old', 'new')
1360
1416
        self.assertEqual(output.getvalue().rstrip(), 'old new')
1361
1417
 
1362
 
    def test_excute_missing(self):
 
1418
    def test_execute_missing(self):
1363
1419
        diff_obj = diff.DiffFromTool(['a-tool-which-is-unlikely-to-exist'],
1364
1420
                                     None, None, None)
1365
1421
        self.addCleanup(diff_obj.finish)
1369
1425
                         ' on this machine', str(e))
1370
1426
 
1371
1427
    def test_prepare_files_creates_paths_readable_by_windows_tool(self):
1372
 
        self.requireFeature(AttribFeature)
 
1428
        self.requireFeature(features.AttribFeature)
1373
1429
        output = StringIO()
1374
1430
        tree = self.make_branch_and_tree('tree')
1375
1431
        self.build_tree_contents([('tree/file', 'content')])
1434
1490
        diff_obj._prepare_files('file2-id', 'oldname2', 'newname2')
1435
1491
 
1436
1492
 
 
1493
class TestDiffFromToolEncodedFilename(tests.TestCaseWithTransport):
 
1494
 
 
1495
    def test_encodable_filename(self):
 
1496
        # Just checks file path for external diff tool.
 
1497
        # We cannot change CPython's internal encoding used by os.exec*.
 
1498
        diffobj = diff.DiffFromTool(['dummy', '@old_path', '@new_path'],
 
1499
                                    None, None, None)
 
1500
        for _, scenario in EncodingAdapter.encoding_scenarios:
 
1501
            encoding = scenario['encoding']
 
1502
            dirname = scenario['info']['directory']
 
1503
            filename = scenario['info']['filename']
 
1504
 
 
1505
            self.overrideAttr(diffobj, '_fenc', lambda: encoding)
 
1506
            relpath = dirname + u'/' + filename
 
1507
            fullpath = diffobj._safe_filename('safe', relpath)
 
1508
            self.assertEqual(fullpath,
 
1509
                             fullpath.encode(encoding).decode(encoding))
 
1510
            self.assertTrue(fullpath.startswith(diffobj._root + '/safe'))
 
1511
 
 
1512
    def test_unencodable_filename(self):
 
1513
        diffobj = diff.DiffFromTool(['dummy', '@old_path', '@new_path'],
 
1514
                                    None, None, None)
 
1515
        for _, scenario in EncodingAdapter.encoding_scenarios:
 
1516
            encoding = scenario['encoding']
 
1517
            dirname = scenario['info']['directory']
 
1518
            filename = scenario['info']['filename']
 
1519
 
 
1520
            if encoding == 'iso-8859-1':
 
1521
                encoding = 'iso-8859-2'
 
1522
            else:
 
1523
                encoding = 'iso-8859-1'
 
1524
 
 
1525
            self.overrideAttr(diffobj, '_fenc', lambda: encoding)
 
1526
            relpath = dirname + u'/' + filename
 
1527
            fullpath = diffobj._safe_filename('safe', relpath)
 
1528
            self.assertEqual(fullpath,
 
1529
                             fullpath.encode(encoding).decode(encoding))
 
1530
            self.assertTrue(fullpath.startswith(diffobj._root + '/safe'))
 
1531
 
 
1532
 
1437
1533
class TestGetTreesAndBranchesToDiffLocked(tests.TestCaseWithTransport):
1438
1534
 
1439
1535
    def call_gtabtd(self, path_list, revision_specs, old_url, new_url):
1440
 
        """Call get_trees_and_branches_to_diff_locked.  Overridden by
1441
 
        TestGetTreesAndBranchesToDiff.
1442
 
        """
 
1536
        """Call get_trees_and_branches_to_diff_locked."""
1443
1537
        return diff.get_trees_and_branches_to_diff_locked(
1444
1538
            path_list, revision_specs, old_url, new_url, self.addCleanup)
1445
1539
 
1482
1576
        self.assertEqual(tree.branch.base, new_branch.base)
1483
1577
        self.assertIs(None, specific_files)
1484
1578
        self.assertEqual(tree.basedir, extra_trees[0].basedir)
1485
 
 
1486
 
 
1487
 
class TestGetTreesAndBranchesToDiff(TestGetTreesAndBranchesToDiffLocked):
1488
 
    """Apply the tests for get_trees_and_branches_to_diff_locked to the
1489
 
    deprecated get_trees_and_branches_to_diff function.
1490
 
    """
1491
 
 
1492
 
    def call_gtabtd(self, path_list, revision_specs, old_url, new_url):
1493
 
        return self.applyDeprecated(
1494
 
            deprecated_in((2, 2, 0)), diff.get_trees_and_branches_to_diff,
1495
 
            path_list, revision_specs, old_url, new_url)
1496