/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_diff.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-28 01:35:49 UTC
  • mfrom: (3036.1.4 check)
  • Revision ID: pqm@pqm.ubuntu.com-20071128013549-w54seazrf4oeywb9
(robertc) Fix check to correctly report unreferenced texts. (Robert
        Collins, John A Meinel, 162931, 165071)

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, 2006 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
18
from cStringIO import StringIO
 
19
import errno
19
20
import subprocess
20
 
import sys
21
 
import tempfile
 
21
from tempfile import TemporaryFile
22
22
 
23
 
from bzrlib import (
24
 
    diff,
25
 
    errors,
26
 
    osutils,
27
 
    patiencediff,
28
 
    _patiencediff_py,
29
 
    revision as _mod_revision,
30
 
    revisionspec,
31
 
    revisiontree,
32
 
    tests,
33
 
    transform,
 
23
from bzrlib.diff import (
 
24
    internal_diff,
 
25
    external_diff,
 
26
    DiffPath,
 
27
    show_diff_trees,
 
28
    DiffSymlink,
 
29
    DiffTree,
 
30
    DiffText,
34
31
    )
35
 
from bzrlib.symbol_versioning import deprecated_in
36
 
from bzrlib.tests import test_win32utils
37
 
 
38
 
 
39
 
class _AttribFeature(tests.Feature):
 
32
from bzrlib.errors import BinaryFile, NoDiff
 
33
import bzrlib.osutils as osutils
 
34
import bzrlib.patiencediff
 
35
import bzrlib._patiencediff_py
 
36
from bzrlib.tests import (Feature, TestCase, TestCaseWithTransport,
 
37
                          TestCaseInTempDir, TestSkipped)
 
38
 
 
39
 
 
40
class _CompiledPatienceDiffFeature(Feature):
40
41
 
41
42
    def _probe(self):
42
 
        if (sys.platform not in ('cygwin', 'win32')):
43
 
            return False
44
43
        try:
45
 
            proc = subprocess.Popen(['attrib', '.'], stdout=subprocess.PIPE)
46
 
        except OSError, e:
 
44
            import bzrlib._patiencediff_c
 
45
        except ImportError:
47
46
            return False
48
 
        return (0 == proc.wait())
 
47
        return True
49
48
 
50
49
    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')
58
 
 
 
50
        return 'bzrlib._patiencediff_c'
 
51
 
 
52
CompiledPatienceDiffFeature = _CompiledPatienceDiffFeature()
 
53
 
 
54
 
 
55
class _UnicodeFilename(Feature):
 
56
    """Does the filesystem support Unicode filenames?"""
 
57
 
 
58
    def _probe(self):
 
59
        try:
 
60
            os.stat(u'\u03b1')
 
61
        except UnicodeEncodeError:
 
62
            return False
 
63
        except (IOError, OSError):
 
64
            # The filesystem allows the Unicode filename but the file doesn't
 
65
            # exist.
 
66
            return True
 
67
        else:
 
68
            # The filesystem allows the Unicode filename and the file exists,
 
69
            # for some reason.
 
70
            return True
 
71
 
 
72
UnicodeFilename = _UnicodeFilename()
 
73
 
 
74
 
 
75
class TestUnicodeFilename(TestCase):
 
76
 
 
77
    def test_probe_passes(self):
 
78
        """UnicodeFilename._probe passes."""
 
79
        # We can't test much more than that because the behaviour depends
 
80
        # on the platform.
 
81
        UnicodeFilename._probe()
 
82
        
59
83
 
60
84
def udiff_lines(old, new, allow_binary=False):
61
85
    output = StringIO()
62
 
    diff.internal_diff('old', old, 'new', new, output, allow_binary)
 
86
    internal_diff('old', old, 'new', new, output, allow_binary)
63
87
    output.seek(0, 0)
64
88
    return output.readlines()
65
89
 
69
93
        # StringIO has no fileno, so it tests a different codepath
70
94
        output = StringIO()
71
95
    else:
72
 
        output = tempfile.TemporaryFile()
 
96
        output = TemporaryFile()
73
97
    try:
74
 
        diff.external_diff('old', old, 'new', new, output, diff_opts=['-u'])
75
 
    except errors.NoDiff:
76
 
        raise tests.TestSkipped('external "diff" not present to test')
 
98
        external_diff('old', old, 'new', new, output, diff_opts=['-u'])
 
99
    except NoDiff:
 
100
        raise TestSkipped('external "diff" not present to test')
77
101
    output.seek(0, 0)
78
102
    lines = output.readlines()
79
103
    output.close()
80
104
    return lines
81
105
 
82
106
 
83
 
class TestDiff(tests.TestCase):
 
107
class TestDiff(TestCase):
84
108
 
85
109
    def test_add_nl(self):
86
110
        """diff generates a valid diff for patches that add a newline"""
122
146
            ## "Unterminated hunk header for patch:\n%s" % "".join(lines)
123
147
 
124
148
    def test_binary_lines(self):
125
 
        empty = []
126
 
        uni_lines = [1023 * 'a' + '\x00']
127
 
        self.assertRaises(errors.BinaryFile, udiff_lines, uni_lines , empty)
128
 
        self.assertRaises(errors.BinaryFile, udiff_lines, empty, uni_lines)
129
 
        udiff_lines(uni_lines , empty, allow_binary=True)
130
 
        udiff_lines(empty, uni_lines, allow_binary=True)
 
149
        self.assertRaises(BinaryFile, udiff_lines, [1023 * 'a' + '\x00'], [])
 
150
        self.assertRaises(BinaryFile, udiff_lines, [], [1023 * 'a' + '\x00'])
 
151
        udiff_lines([1023 * 'a' + '\x00'], [], allow_binary=True)
 
152
        udiff_lines([], [1023 * 'a' + '\x00'], allow_binary=True)
131
153
 
132
154
    def test_external_diff(self):
133
155
        lines = external_udiff_lines(['boo\n'], ['goo\n'])
163
185
        orig_path = os.environ['PATH']
164
186
        try:
165
187
            os.environ['PATH'] = ''
166
 
            self.assertRaises(errors.NoDiff, diff.external_diff,
 
188
            self.assertRaises(NoDiff, external_diff,
167
189
                              'old', ['boo\n'], 'new', ['goo\n'],
168
190
                              StringIO(), diff_opts=['-u'])
169
191
        finally:
170
192
            os.environ['PATH'] = orig_path
171
 
 
 
193
        
172
194
    def test_internal_diff_default(self):
173
195
        # Default internal diff encoding is utf8
174
196
        output = StringIO()
175
 
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
176
 
                           u'new_\xe5', ['new_text\n'], output)
 
197
        internal_diff(u'old_\xb5', ['old_text\n'],
 
198
                    u'new_\xe5', ['new_text\n'], output)
177
199
        lines = output.getvalue().splitlines(True)
178
200
        self.check_patch(lines)
179
201
        self.assertEquals(['--- old_\xc2\xb5\n',
187
209
 
188
210
    def test_internal_diff_utf8(self):
189
211
        output = StringIO()
190
 
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
191
 
                           u'new_\xe5', ['new_text\n'], output,
192
 
                           path_encoding='utf8')
 
212
        internal_diff(u'old_\xb5', ['old_text\n'],
 
213
                    u'new_\xe5', ['new_text\n'], output,
 
214
                    path_encoding='utf8')
193
215
        lines = output.getvalue().splitlines(True)
194
216
        self.check_patch(lines)
195
217
        self.assertEquals(['--- old_\xc2\xb5\n',
203
225
 
204
226
    def test_internal_diff_iso_8859_1(self):
205
227
        output = StringIO()
206
 
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
207
 
                           u'new_\xe5', ['new_text\n'], output,
208
 
                           path_encoding='iso-8859-1')
 
228
        internal_diff(u'old_\xb5', ['old_text\n'],
 
229
                    u'new_\xe5', ['new_text\n'], output,
 
230
                    path_encoding='iso-8859-1')
209
231
        lines = output.getvalue().splitlines(True)
210
232
        self.check_patch(lines)
211
233
        self.assertEquals(['--- old_\xb5\n',
217
239
                          ]
218
240
                          , lines)
219
241
 
220
 
    def test_internal_diff_no_content(self):
221
 
        output = StringIO()
222
 
        diff.internal_diff(u'old', [], u'new', [], output)
223
 
        self.assertEqual('', output.getvalue())
224
 
 
225
 
    def test_internal_diff_no_changes(self):
226
 
        output = StringIO()
227
 
        diff.internal_diff(u'old', ['text\n', 'contents\n'],
228
 
                           u'new', ['text\n', 'contents\n'],
229
 
                           output)
230
 
        self.assertEqual('', output.getvalue())
231
 
 
232
242
    def test_internal_diff_returns_bytes(self):
233
243
        import StringIO
234
244
        output = StringIO.StringIO()
235
 
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
236
 
                            u'new_\xe5', ['new_text\n'], output)
 
245
        internal_diff(u'old_\xb5', ['old_text\n'],
 
246
                    u'new_\xe5', ['new_text\n'], output)
237
247
        self.failUnless(isinstance(output.getvalue(), str),
238
248
            'internal_diff should return bytestrings')
239
249
 
240
250
 
241
 
class TestDiffFiles(tests.TestCaseInTempDir):
 
251
class TestDiffFiles(TestCaseInTempDir):
242
252
 
243
253
    def test_external_diff_binary(self):
244
254
        """The output when using external diff should use diff's i18n error"""
257
267
        self.assertEqual(out.splitlines(True) + ['\n'], lines)
258
268
 
259
269
 
260
 
class TestShowDiffTreesHelper(tests.TestCaseWithTransport):
 
270
class TestShowDiffTreesHelper(TestCaseWithTransport):
261
271
    """Has a helper for running show_diff_trees"""
262
272
 
263
273
    def get_diff(self, tree1, tree2, specific_files=None, working_tree=None):
266
276
            extra_trees = (working_tree,)
267
277
        else:
268
278
            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/')
 
279
        show_diff_trees(tree1, tree2, output, specific_files=specific_files,
 
280
                        extra_trees=extra_trees, old_label='old/',
 
281
                        new_label='new/')
273
282
        return output.getvalue()
274
283
 
275
284
 
340
349
+file2 contents at rev 3
341
350
 
342
351
''')
343
 
 
 
352
        
344
353
    def test_diff_add_files(self):
345
 
        tree1 = self.b.repository.revision_tree(_mod_revision.NULL_REVISION)
 
354
        tree1 = self.b.repository.revision_tree(None)
346
355
        tree2 = self.b.repository.revision_tree('rev-1')
347
356
        output = self.get_diff(tree1, tree2)
348
357
        # the files have the epoch time stamp for the tree in which
382
391
        self.wt.rename_one('file1', 'file1b')
383
392
        old_tree = self.b.repository.revision_tree('rev-1')
384
393
        new_tree = self.b.repository.revision_tree('rev-4')
385
 
        out = self.get_diff(old_tree, new_tree, specific_files=['file1b'],
 
394
        out = self.get_diff(old_tree, new_tree, specific_files=['file1b'], 
386
395
                            working_tree=self.wt)
387
396
        self.assertContainsRe(out, 'file1\t')
388
397
 
394
403
        self.wt.rename_one('file1', 'dir1/file1')
395
404
        old_tree = self.b.repository.revision_tree('rev-1')
396
405
        new_tree = self.b.repository.revision_tree('rev-4')
397
 
        out = self.get_diff(old_tree, new_tree, specific_files=['dir1'],
 
406
        out = self.get_diff(old_tree, new_tree, specific_files=['dir1'], 
398
407
                            working_tree=self.wt)
399
408
        self.assertContainsRe(out, 'file1\t')
400
 
        out = self.get_diff(old_tree, new_tree, specific_files=['dir2'],
 
409
        out = self.get_diff(old_tree, new_tree, specific_files=['dir2'], 
401
410
                            working_tree=self.wt)
402
411
        self.assertNotContainsRe(out, 'file1\t')
403
412
 
414
423
        tree.commit('one', rev_id='rev-1')
415
424
 
416
425
        self.build_tree_contents([('tree/file', 'new contents\n')])
417
 
        d = self.get_diff(tree.basis_tree(), tree)
418
 
        self.assertContainsRe(d, "=== modified file 'file'\n")
419
 
        self.assertContainsRe(d, '--- old/file\t')
420
 
        self.assertContainsRe(d, '\\+\\+\\+ new/file\t')
421
 
        self.assertContainsRe(d, '-contents\n'
422
 
                                 '\\+new contents\n')
 
426
        diff = self.get_diff(tree.basis_tree(), tree)
 
427
        self.assertContainsRe(diff, "=== modified file 'file'\n")
 
428
        self.assertContainsRe(diff, '--- old/file\t')
 
429
        self.assertContainsRe(diff, '\\+\\+\\+ new/file\t')
 
430
        self.assertContainsRe(diff, '-contents\n'
 
431
                                    '\\+new contents\n')
423
432
 
424
433
    def test_modified_file_in_renamed_dir(self):
425
434
        """Test when a file is modified in a renamed directory."""
431
440
 
432
441
        tree.rename_one('dir', 'other')
433
442
        self.build_tree_contents([('tree/other/file', 'new contents\n')])
434
 
        d = self.get_diff(tree.basis_tree(), tree)
435
 
        self.assertContainsRe(d, "=== renamed directory 'dir' => 'other'\n")
436
 
        self.assertContainsRe(d, "=== modified file 'other/file'\n")
 
443
        diff = self.get_diff(tree.basis_tree(), tree)
 
444
        self.assertContainsRe(diff, "=== renamed directory 'dir' => 'other'\n")
 
445
        self.assertContainsRe(diff, "=== modified file 'other/file'\n")
437
446
        # XXX: This is technically incorrect, because it used to be at another
438
447
        # location. What to do?
439
 
        self.assertContainsRe(d, '--- old/dir/file\t')
440
 
        self.assertContainsRe(d, '\\+\\+\\+ new/other/file\t')
441
 
        self.assertContainsRe(d, '-contents\n'
442
 
                                 '\\+new contents\n')
 
448
        self.assertContainsRe(diff, '--- old/dir/file\t')
 
449
        self.assertContainsRe(diff, '\\+\\+\\+ new/other/file\t')
 
450
        self.assertContainsRe(diff, '-contents\n'
 
451
                                    '\\+new contents\n')
443
452
 
444
453
    def test_renamed_directory(self):
445
454
        """Test when only a directory is only renamed."""
450
459
        tree.commit('one', rev_id='rev-1')
451
460
 
452
461
        tree.rename_one('dir', 'newdir')
453
 
        d = self.get_diff(tree.basis_tree(), tree)
 
462
        diff = self.get_diff(tree.basis_tree(), tree)
454
463
        # Renaming a directory should be a single "you renamed this dir" even
455
464
        # when there are files inside.
456
 
        self.assertEqual(d, "=== renamed directory 'dir' => 'newdir'\n")
 
465
        self.assertEqual("=== renamed directory 'dir' => 'newdir'\n", diff)
457
466
 
458
467
    def test_renamed_file(self):
459
468
        """Test when a file is only renamed."""
463
472
        tree.commit('one', rev_id='rev-1')
464
473
 
465
474
        tree.rename_one('file', 'newname')
466
 
        d = self.get_diff(tree.basis_tree(), tree)
467
 
        self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
 
475
        diff = self.get_diff(tree.basis_tree(), tree)
 
476
        self.assertContainsRe(diff, "=== renamed file 'file' => 'newname'\n")
468
477
        # We shouldn't have a --- or +++ line, because there is no content
469
478
        # change
470
 
        self.assertNotContainsRe(d, '---')
 
479
        self.assertNotContainsRe(diff, '---')
471
480
 
472
481
    def test_renamed_and_modified_file(self):
473
482
        """Test when a file is only renamed."""
478
487
 
479
488
        tree.rename_one('file', 'newname')
480
489
        self.build_tree_contents([('tree/newname', 'new contents\n')])
481
 
        d = self.get_diff(tree.basis_tree(), tree)
482
 
        self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
483
 
        self.assertContainsRe(d, '--- old/file\t')
484
 
        self.assertContainsRe(d, '\\+\\+\\+ new/newname\t')
485
 
        self.assertContainsRe(d, '-contents\n'
486
 
                                 '\\+new contents\n')
487
 
 
488
 
 
489
 
    def test_internal_diff_exec_property(self):
490
 
        tree = self.make_branch_and_tree('tree')
491
 
 
492
 
        tt = transform.TreeTransform(tree)
493
 
        tt.new_file('a', tt.root, 'contents\n', 'a-id', True)
494
 
        tt.new_file('b', tt.root, 'contents\n', 'b-id', False)
495
 
        tt.new_file('c', tt.root, 'contents\n', 'c-id', True)
496
 
        tt.new_file('d', tt.root, 'contents\n', 'd-id', False)
497
 
        tt.new_file('e', tt.root, 'contents\n', 'control-e-id', True)
498
 
        tt.new_file('f', tt.root, 'contents\n', 'control-f-id', False)
499
 
        tt.apply()
500
 
        tree.commit('one', rev_id='rev-1')
501
 
 
502
 
        tt = transform.TreeTransform(tree)
503
 
        tt.set_executability(False, tt.trans_id_file_id('a-id'))
504
 
        tt.set_executability(True, tt.trans_id_file_id('b-id'))
505
 
        tt.set_executability(False, tt.trans_id_file_id('c-id'))
506
 
        tt.set_executability(True, tt.trans_id_file_id('d-id'))
507
 
        tt.apply()
508
 
        tree.rename_one('c', 'new-c')
509
 
        tree.rename_one('d', 'new-d')
510
 
 
511
 
        d = self.get_diff(tree.basis_tree(), tree)
512
 
 
513
 
        self.assertContainsRe(d, r"file 'a'.*\(properties changed:"
514
 
                                  ".*\+x to -x.*\)")
515
 
        self.assertContainsRe(d, r"file 'b'.*\(properties changed:"
516
 
                                  ".*-x to \+x.*\)")
517
 
        self.assertContainsRe(d, r"file 'c'.*\(properties changed:"
518
 
                                  ".*\+x to -x.*\)")
519
 
        self.assertContainsRe(d, r"file 'd'.*\(properties changed:"
520
 
                                  ".*-x to \+x.*\)")
521
 
        self.assertNotContainsRe(d, r"file 'e'")
522
 
        self.assertNotContainsRe(d, r"file 'f'")
523
 
 
 
490
        diff = self.get_diff(tree.basis_tree(), tree)
 
491
        self.assertContainsRe(diff, "=== renamed file 'file' => 'newname'\n")
 
492
        self.assertContainsRe(diff, '--- old/file\t')
 
493
        self.assertContainsRe(diff, '\\+\\+\\+ new/newname\t')
 
494
        self.assertContainsRe(diff, '-contents\n'
 
495
                                    '\\+new contents\n')
524
496
 
525
497
    def test_binary_unicode_filenames(self):
526
498
        """Test that contents of files are *not* encoded in UTF-8 when there
527
499
        is a binary file in the diff.
528
500
        """
529
501
        # See https://bugs.launchpad.net/bugs/110092.
530
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
502
        self.requireFeature(UnicodeFilename)
531
503
 
532
504
        # This bug isn't triggered with cStringIO.
533
505
        from StringIO import StringIO
541
513
        tree.add([alpha], ['file-id'])
542
514
        tree.add([omega], ['file-id-2'])
543
515
        diff_content = StringIO()
544
 
        diff.show_diff_trees(tree.basis_tree(), tree, diff_content)
545
 
        d = diff_content.getvalue()
546
 
        self.assertContainsRe(d, r"=== added file '%s'" % alpha_utf8)
547
 
        self.assertContainsRe(d, "Binary files a/%s.*and b/%s.* differ\n"
548
 
                              % (alpha_utf8, alpha_utf8))
549
 
        self.assertContainsRe(d, r"=== added file '%s'" % omega_utf8)
550
 
        self.assertContainsRe(d, r"--- a/%s" % (omega_utf8,))
551
 
        self.assertContainsRe(d, r"\+\+\+ b/%s" % (omega_utf8,))
 
516
        show_diff_trees(tree.basis_tree(), tree, diff_content)
 
517
        diff = diff_content.getvalue()
 
518
        self.assertContainsRe(diff, r"=== added file '%s'" % alpha_utf8)
 
519
        self.assertContainsRe(
 
520
            diff, "Binary files a/%s.*and b/%s.* differ\n" % (alpha_utf8, alpha_utf8))
 
521
        self.assertContainsRe(diff, r"=== added file '%s'" % omega_utf8)
 
522
        self.assertContainsRe(diff, r"--- a/%s" % (omega_utf8,))
 
523
        self.assertContainsRe(diff, r"\+\+\+ b/%s" % (omega_utf8,))
552
524
 
553
525
    def test_unicode_filename(self):
554
526
        """Test when the filename are unicode."""
555
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
527
        self.requireFeature(UnicodeFilename)
556
528
 
557
529
        alpha, omega = u'\u03b1', u'\u03c9'
558
530
        autf8, outf8 = alpha.encode('utf8'), omega.encode('utf8')
573
545
        tree.add(['add_'+alpha], ['file-id'])
574
546
        self.build_tree_contents([('tree/mod_'+alpha, 'contents_mod\n')])
575
547
 
576
 
        d = self.get_diff(tree.basis_tree(), tree)
577
 
        self.assertContainsRe(d,
 
548
        diff = self.get_diff(tree.basis_tree(), tree)
 
549
        self.assertContainsRe(diff,
578
550
                "=== renamed file 'ren_%s' => 'ren_%s'\n"%(autf8, outf8))
579
 
        self.assertContainsRe(d, "=== added file 'add_%s'"%autf8)
580
 
        self.assertContainsRe(d, "=== modified file 'mod_%s'"%autf8)
581
 
        self.assertContainsRe(d, "=== removed file 'del_%s'"%autf8)
582
 
 
583
 
 
584
 
class DiffWasIs(diff.DiffPath):
 
551
        self.assertContainsRe(diff, "=== added file 'add_%s'"%autf8)
 
552
        self.assertContainsRe(diff, "=== modified file 'mod_%s'"%autf8)
 
553
        self.assertContainsRe(diff, "=== removed file 'del_%s'"%autf8)
 
554
 
 
555
 
 
556
class DiffWasIs(DiffPath):
585
557
 
586
558
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
587
559
        self.to_file.write('was: ')
591
563
        pass
592
564
 
593
565
 
594
 
class TestDiffTree(tests.TestCaseWithTransport):
 
566
class TestDiffTree(TestCaseWithTransport):
595
567
 
596
568
    def setUp(self):
597
 
        super(TestDiffTree, self).setUp()
 
569
        TestCaseWithTransport.setUp(self)
598
570
        self.old_tree = self.make_branch_and_tree('old-tree')
599
571
        self.old_tree.lock_write()
600
572
        self.addCleanup(self.old_tree.unlock)
601
573
        self.new_tree = self.make_branch_and_tree('new-tree')
602
574
        self.new_tree.lock_write()
603
575
        self.addCleanup(self.new_tree.unlock)
604
 
        self.differ = diff.DiffTree(self.old_tree, self.new_tree, StringIO())
 
576
        self.differ = DiffTree(self.old_tree, self.new_tree, StringIO())
605
577
 
606
578
    def test_diff_text(self):
607
579
        self.build_tree_contents([('old-tree/olddir/',),
612
584
                                  ('new-tree/newdir/newfile', 'new\n')])
613
585
        self.new_tree.add('newdir')
614
586
        self.new_tree.add('newdir/newfile', 'file-id')
615
 
        differ = diff.DiffText(self.old_tree, self.new_tree, StringIO())
 
587
        differ = DiffText(self.old_tree, self.new_tree, StringIO())
616
588
        differ.diff_text('file-id', None, 'old label', 'new label')
617
589
        self.assertEqual(
618
590
            '--- old label\n+++ new label\n@@ -1,1 +0,0 @@\n-old\n\n',
628
600
            '--- old label\n+++ new label\n@@ -1,1 +1,1 @@\n-old\n+new\n\n',
629
601
            differ.to_file.getvalue())
630
602
 
631
 
    def test_diff_deletion(self):
632
 
        self.build_tree_contents([('old-tree/file', 'contents'),
633
 
                                  ('new-tree/file', 'contents')])
634
 
        self.old_tree.add('file', 'file-id')
635
 
        self.new_tree.add('file', 'file-id')
636
 
        os.unlink('new-tree/file')
637
 
        self.differ.show_diff(None)
638
 
        self.assertContainsRe(self.differ.to_file.getvalue(), '-contents')
639
 
 
640
 
    def test_diff_creation(self):
641
 
        self.build_tree_contents([('old-tree/file', 'contents'),
642
 
                                  ('new-tree/file', 'contents')])
643
 
        self.old_tree.add('file', 'file-id')
644
 
        self.new_tree.add('file', 'file-id')
645
 
        os.unlink('old-tree/file')
646
 
        self.differ.show_diff(None)
647
 
        self.assertContainsRe(self.differ.to_file.getvalue(), '\+contents')
648
 
 
649
603
    def test_diff_symlink(self):
650
 
        differ = diff.DiffSymlink(self.old_tree, self.new_tree, StringIO())
 
604
        differ = DiffSymlink(self.old_tree, self.new_tree, StringIO())
651
605
        differ.diff_symlink('old target', None)
652
606
        self.assertEqual("=== target was 'old target'\n",
653
607
                         differ.to_file.getvalue())
654
608
 
655
 
        differ = diff.DiffSymlink(self.old_tree, self.new_tree, StringIO())
 
609
        differ = DiffSymlink(self.old_tree, self.new_tree, StringIO())
656
610
        differ.diff_symlink(None, 'new target')
657
611
        self.assertEqual("=== target is 'new target'\n",
658
612
                         differ.to_file.getvalue())
659
613
 
660
 
        differ = diff.DiffSymlink(self.old_tree, self.new_tree, StringIO())
 
614
        differ = DiffSymlink(self.old_tree, self.new_tree, StringIO())
661
615
        differ.diff_symlink('old target', 'new target')
662
616
        self.assertEqual("=== target changed 'old target' => 'new target'\n",
663
617
                         differ.to_file.getvalue())
678
632
             ' \@\@\n-old\n\+new\n\n')
679
633
 
680
634
    def test_diff_kind_change(self):
681
 
        self.requireFeature(tests.SymlinkFeature)
682
635
        self.build_tree_contents([('old-tree/olddir/',),
683
636
                                  ('old-tree/olddir/oldfile', 'old\n')])
684
637
        self.old_tree.add('olddir')
693
646
            r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+0,0'
694
647
             ' \@\@\n-old\n\n')
695
648
        self.assertContainsRe(self.differ.to_file.getvalue(),
696
 
                              "=== target is u'new'\n")
 
649
                              "=== target is 'new'\n")
697
650
 
698
651
    def test_diff_directory(self):
699
652
        self.build_tree(['new-tree/new-dir/'])
713
666
 
714
667
    def test_register_diff(self):
715
668
        self.create_old_new()
716
 
        old_diff_factories = diff.DiffTree.diff_factories
717
 
        diff.DiffTree.diff_factories=old_diff_factories[:]
718
 
        diff.DiffTree.diff_factories.insert(0, DiffWasIs.from_diff_tree)
 
669
        old_diff_factories = DiffTree.diff_factories
 
670
        DiffTree.diff_factories=old_diff_factories[:]
 
671
        DiffTree.diff_factories.insert(0, DiffWasIs.from_diff_tree)
719
672
        try:
720
 
            differ = diff.DiffTree(self.old_tree, self.new_tree, StringIO())
 
673
            differ = DiffTree(self.old_tree, self.new_tree, StringIO())
721
674
        finally:
722
 
            diff.DiffTree.diff_factories = old_diff_factories
 
675
            DiffTree.diff_factories = old_diff_factories
723
676
        differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile')
724
677
        self.assertNotContainsRe(
725
678
            differ.to_file.getvalue(),
730
683
 
731
684
    def test_extra_factories(self):
732
685
        self.create_old_new()
733
 
        differ = diff.DiffTree(self.old_tree, self.new_tree, StringIO(),
734
 
                               extra_factories=[DiffWasIs.from_diff_tree])
 
686
        differ = DiffTree(self.old_tree, self.new_tree, StringIO(),
 
687
                            extra_factories=[DiffWasIs.from_diff_tree])
735
688
        differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile')
736
689
        self.assertNotContainsRe(
737
690
            differ.to_file.getvalue(),
740
693
        self.assertContainsRe(differ.to_file.getvalue(),
741
694
                              'was: old\nis: new\n')
742
695
 
743
 
    def test_alphabetical_order(self):
744
 
        self.build_tree(['new-tree/a-file'])
745
 
        self.new_tree.add('a-file')
746
 
        self.build_tree(['old-tree/b-file'])
747
 
        self.old_tree.add('b-file')
748
 
        self.differ.show_diff(None)
749
 
        self.assertContainsRe(self.differ.to_file.getvalue(),
750
 
            '.*a-file(.|\n)*b-file')
751
 
 
752
 
 
753
 
class TestPatienceDiffLib(tests.TestCase):
 
696
 
 
697
class TestPatienceDiffLib(TestCase):
754
698
 
755
699
    def setUp(self):
756
700
        super(TestPatienceDiffLib, self).setUp()
757
 
        self._unique_lcs = _patiencediff_py.unique_lcs_py
758
 
        self._recurse_matches = _patiencediff_py.recurse_matches_py
 
701
        self._unique_lcs = bzrlib._patiencediff_py.unique_lcs_py
 
702
        self._recurse_matches = bzrlib._patiencediff_py.recurse_matches_py
759
703
        self._PatienceSequenceMatcher = \
760
 
            _patiencediff_py.PatienceSequenceMatcher_py
761
 
 
762
 
    def test_diff_unicode_string(self):
763
 
        a = ''.join([unichr(i) for i in range(4000, 4500, 3)])
764
 
        b = ''.join([unichr(i) for i in range(4300, 4800, 2)])
765
 
        sm = self._PatienceSequenceMatcher(None, a, b)
766
 
        mb = sm.get_matching_blocks()
767
 
        self.assertEquals(35, len(mb))
 
704
            bzrlib._patiencediff_py.PatienceSequenceMatcher_py
768
705
 
769
706
    def test_unique_lcs(self):
770
707
        unique_lcs = self._unique_lcs
776
713
        self.assertEquals(unique_lcs('ab', 'ab'), [(0,0), (1,1)])
777
714
        self.assertEquals(unique_lcs('abcde', 'cdeab'), [(2,0), (3,1), (4,2)])
778
715
        self.assertEquals(unique_lcs('cdeab', 'abcde'), [(0,2), (1,3), (2,4)])
779
 
        self.assertEquals(unique_lcs('abXde', 'abYde'), [(0,0), (1,1),
 
716
        self.assertEquals(unique_lcs('abXde', 'abYde'), [(0,0), (1,1), 
780
717
                                                         (3,3), (4,4)])
781
718
        self.assertEquals(unique_lcs('acbac', 'abc'), [(2,1)])
782
719
 
797
734
        test_one('abcdbce', 'afbcgdbce', [(0,0), (1, 2), (2, 3), (3, 5),
798
735
                                          (4, 6), (5, 7), (6, 8)])
799
736
 
800
 
        # recurse_matches doesn't match non-unique
 
737
        # recurse_matches doesn't match non-unique 
801
738
        # lines surrounded by bogus text.
802
739
        # The update has been done in patiencediff.SequenceMatcher instead
803
740
 
807
744
        # This is what it currently gives:
808
745
        test_one('aBccDe', 'abccde', [(0,0), (5,5)])
809
746
 
810
 
    def assertDiffBlocks(self, a, b, expected_blocks):
811
 
        """Check that the sequence matcher returns the correct blocks.
812
 
 
813
 
        :param a: A sequence to match
814
 
        :param b: Another sequence to match
815
 
        :param expected_blocks: The expected output, not including the final
816
 
            matching block (len(a), len(b), 0)
817
 
        """
818
 
        matcher = self._PatienceSequenceMatcher(None, a, b)
819
 
        blocks = matcher.get_matching_blocks()
820
 
        last = blocks.pop()
821
 
        self.assertEqual((len(a), len(b), 0), last)
822
 
        self.assertEqual(expected_blocks, blocks)
823
 
 
824
747
    def test_matching_blocks(self):
 
748
        def chk_blocks(a, b, expected_blocks):
 
749
            # difflib always adds a signature of the total
 
750
            # length, with no matching entries at the end
 
751
            s = self._PatienceSequenceMatcher(None, a, b)
 
752
            blocks = s.get_matching_blocks()
 
753
            self.assertEquals((len(a), len(b), 0), blocks[-1])
 
754
            self.assertEquals(expected_blocks, blocks[:-1])
 
755
 
825
756
        # Some basic matching tests
826
 
        self.assertDiffBlocks('', '', [])
827
 
        self.assertDiffBlocks([], [], [])
828
 
        self.assertDiffBlocks('abc', '', [])
829
 
        self.assertDiffBlocks('', 'abc', [])
830
 
        self.assertDiffBlocks('abcd', 'abcd', [(0, 0, 4)])
831
 
        self.assertDiffBlocks('abcd', 'abce', [(0, 0, 3)])
832
 
        self.assertDiffBlocks('eabc', 'abce', [(1, 0, 3)])
833
 
        self.assertDiffBlocks('eabce', 'abce', [(1, 0, 4)])
834
 
        self.assertDiffBlocks('abcde', 'abXde', [(0, 0, 2), (3, 3, 2)])
835
 
        self.assertDiffBlocks('abcde', 'abXYZde', [(0, 0, 2), (3, 5, 2)])
836
 
        self.assertDiffBlocks('abde', 'abXYZde', [(0, 0, 2), (2, 5, 2)])
837
 
        # This may check too much, but it checks to see that
 
757
        chk_blocks('', '', [])
 
758
        chk_blocks([], [], [])
 
759
        chk_blocks('abc', '', [])
 
760
        chk_blocks('', 'abc', [])
 
761
        chk_blocks('abcd', 'abcd', [(0, 0, 4)])
 
762
        chk_blocks('abcd', 'abce', [(0, 0, 3)])
 
763
        chk_blocks('eabc', 'abce', [(1, 0, 3)])
 
764
        chk_blocks('eabce', 'abce', [(1, 0, 4)])
 
765
        chk_blocks('abcde', 'abXde', [(0, 0, 2), (3, 3, 2)])
 
766
        chk_blocks('abcde', 'abXYZde', [(0, 0, 2), (3, 5, 2)])
 
767
        chk_blocks('abde', 'abXYZde', [(0, 0, 2), (2, 5, 2)])
 
768
        # This may check too much, but it checks to see that 
838
769
        # a copied block stays attached to the previous section,
839
770
        # not the later one.
840
771
        # difflib would tend to grab the trailing longest match
841
772
        # which would make the diff not look right
842
 
        self.assertDiffBlocks('abcdefghijklmnop', 'abcdefxydefghijklmnop',
843
 
                              [(0, 0, 6), (6, 11, 10)])
 
773
        chk_blocks('abcdefghijklmnop', 'abcdefxydefghijklmnop',
 
774
                   [(0, 0, 6), (6, 11, 10)])
844
775
 
845
776
        # make sure it supports passing in lists
846
 
        self.assertDiffBlocks(
 
777
        chk_blocks(
847
778
                   ['hello there\n',
848
779
                    'world\n',
849
780
                    'how are you today?\n'],
853
784
 
854
785
        # non unique lines surrounded by non-matching lines
855
786
        # won't be found
856
 
        self.assertDiffBlocks('aBccDe', 'abccde', [(0,0,1), (5,5,1)])
 
787
        chk_blocks('aBccDe', 'abccde', [(0,0,1), (5,5,1)])
857
788
 
858
789
        # But they only need to be locally unique
859
 
        self.assertDiffBlocks('aBcDec', 'abcdec', [(0,0,1), (2,2,1), (4,4,2)])
 
790
        chk_blocks('aBcDec', 'abcdec', [(0,0,1), (2,2,1), (4,4,2)])
860
791
 
861
792
        # non unique blocks won't be matched
862
 
        self.assertDiffBlocks('aBcdEcdFg', 'abcdecdfg', [(0,0,1), (8,8,1)])
 
793
        chk_blocks('aBcdEcdFg', 'abcdecdfg', [(0,0,1), (8,8,1)])
863
794
 
864
795
        # but locally unique ones will
865
 
        self.assertDiffBlocks('aBcdEeXcdFg', 'abcdecdfg', [(0,0,1), (2,2,2),
 
796
        chk_blocks('aBcdEeXcdFg', 'abcdecdfg', [(0,0,1), (2,2,2),
866
797
                                              (5,4,1), (7,5,2), (10,8,1)])
867
798
 
868
 
        self.assertDiffBlocks('abbabbXd', 'cabbabxd', [(7,7,1)])
869
 
        self.assertDiffBlocks('abbabbbb', 'cabbabbc', [])
870
 
        self.assertDiffBlocks('bbbbbbbb', 'cbbbbbbc', [])
871
 
 
872
 
    def test_matching_blocks_tuples(self):
873
 
        # Some basic matching tests
874
 
        self.assertDiffBlocks([], [], [])
875
 
        self.assertDiffBlocks([('a',), ('b',), ('c,')], [], [])
876
 
        self.assertDiffBlocks([], [('a',), ('b',), ('c,')], [])
877
 
        self.assertDiffBlocks([('a',), ('b',), ('c,')],
878
 
                              [('a',), ('b',), ('c,')],
879
 
                              [(0, 0, 3)])
880
 
        self.assertDiffBlocks([('a',), ('b',), ('c,')],
881
 
                              [('a',), ('b',), ('d,')],
882
 
                              [(0, 0, 2)])
883
 
        self.assertDiffBlocks([('d',), ('b',), ('c,')],
884
 
                              [('a',), ('b',), ('c,')],
885
 
                              [(1, 1, 2)])
886
 
        self.assertDiffBlocks([('d',), ('a',), ('b',), ('c,')],
887
 
                              [('a',), ('b',), ('c,')],
888
 
                              [(1, 0, 3)])
889
 
        self.assertDiffBlocks([('a', 'b'), ('c', 'd'), ('e', 'f')],
890
 
                              [('a', 'b'), ('c', 'X'), ('e', 'f')],
891
 
                              [(0, 0, 1), (2, 2, 1)])
892
 
        self.assertDiffBlocks([('a', 'b'), ('c', 'd'), ('e', 'f')],
893
 
                              [('a', 'b'), ('c', 'dX'), ('e', 'f')],
894
 
                              [(0, 0, 1), (2, 2, 1)])
 
799
        chk_blocks('abbabbXd', 'cabbabxd', [(7,7,1)])
 
800
        chk_blocks('abbabbbb', 'cabbabbc', [])
 
801
        chk_blocks('bbbbbbbb', 'cbbbbbbc', [])
895
802
 
896
803
    def test_opcodes(self):
897
804
        def chk_ops(a, b, expected_codes):
940
847
                 ('delete', 1,2, 1,1),
941
848
                 ('equal',  2,3, 1,2),
942
849
                ])
943
 
        chk_ops('aBccDe', 'abccde',
 
850
        chk_ops('aBccDe', 'abccde', 
944
851
                [('equal',   0,1, 0,1),
945
852
                 ('replace', 1,5, 1,5),
946
853
                 ('equal',   5,6, 5,6),
947
854
                ])
948
 
        chk_ops('aBcDec', 'abcdec',
 
855
        chk_ops('aBcDec', 'abcdec', 
949
856
                [('equal',   0,1, 0,1),
950
857
                 ('replace', 1,2, 1,2),
951
858
                 ('equal',   2,3, 2,3),
952
859
                 ('replace', 3,4, 3,4),
953
860
                 ('equal',   4,6, 4,6),
954
861
                ])
955
 
        chk_ops('aBcdEcdFg', 'abcdecdfg',
 
862
        chk_ops('aBcdEcdFg', 'abcdecdfg', 
956
863
                [('equal',   0,1, 0,1),
957
864
                 ('replace', 1,8, 1,8),
958
865
                 ('equal',   8,9, 8,9)
959
866
                ])
960
 
        chk_ops('aBcdEeXcdFg', 'abcdecdfg',
 
867
        chk_ops('aBcdEeXcdFg', 'abcdecdfg', 
961
868
                [('equal',   0,1, 0,1),
962
869
                 ('replace', 1,2, 1,2),
963
870
                 ('equal',   2,4, 2,4),
1009
916
    def test_multiple_ranges(self):
1010
917
        # There was an earlier bug where we used a bad set of ranges,
1011
918
        # this triggers that specific bug, to make sure it doesn't regress
1012
 
        self.assertDiffBlocks('abcdefghijklmnop',
1013
 
                              'abcXghiYZQRSTUVWXYZijklmnop',
1014
 
                              [(0, 0, 3), (6, 4, 3), (9, 20, 7)])
1015
 
 
1016
 
        self.assertDiffBlocks('ABCd efghIjk  L',
1017
 
                              'AxyzBCn mo pqrstuvwI1 2  L',
1018
 
                              [(0,0,1), (1, 4, 2), (9, 19, 1), (12, 23, 3)])
 
919
        def chk_blocks(a, b, expected_blocks):
 
920
            # difflib always adds a signature of the total
 
921
            # length, with no matching entries at the end
 
922
            s = self._PatienceSequenceMatcher(None, a, b)
 
923
            blocks = s.get_matching_blocks()
 
924
            x = blocks.pop()
 
925
            self.assertEquals(x, (len(a), len(b), 0))
 
926
            self.assertEquals(expected_blocks, blocks)
 
927
 
 
928
        chk_blocks('abcdefghijklmnop'
 
929
                 , 'abcXghiYZQRSTUVWXYZijklmnop'
 
930
                 , [(0, 0, 3), (6, 4, 3), (9, 20, 7)])
 
931
 
 
932
        chk_blocks('ABCd efghIjk  L'
 
933
                 , 'AxyzBCn mo pqrstuvwI1 2  L'
 
934
                 , [(0,0,1), (1, 4, 2), (9, 19, 1), (12, 23, 3)])
1019
935
 
1020
936
        # These are rot13 code snippets.
1021
 
        self.assertDiffBlocks('''\
 
937
        chk_blocks('''\
1022
938
    trg nqqrq jura lbh nqq n svyr va gur qverpgbel.
1023
939
    """
1024
940
    gnxrf_netf = ['svyr*']
1025
941
    gnxrf_bcgvbaf = ['ab-erphefr']
1026
 
 
 
942
  
1027
943
    qrs eha(frys, svyr_yvfg, ab_erphefr=Snyfr):
1028
944
        sebz omeyvo.nqq vzcbeg fzneg_nqq, nqq_ercbegre_cevag, nqq_ercbegre_ahyy
1029
945
        vs vf_dhvrg():
1037
953
'''.splitlines(True), '''\
1038
954
    trg nqqrq jura lbh nqq n svyr va gur qverpgbel.
1039
955
 
1040
 
    --qel-eha jvyy fubj juvpu svyrf jbhyq or nqqrq, ohg abg npghnyyl
 
956
    --qel-eha jvyy fubj juvpu svyrf jbhyq or nqqrq, ohg abg npghnyyl 
1041
957
    nqq gurz.
1042
958
    """
1043
959
    gnxrf_netf = ['svyr*']
1070
986
                 'how are you today?\n']
1071
987
        txt_b = ['hello there\n',
1072
988
                 'how are you today?\n']
1073
 
        unified_diff = patiencediff.unified_diff
 
989
        unified_diff = bzrlib.patiencediff.unified_diff
1074
990
        psm = self._PatienceSequenceMatcher
1075
 
        self.assertEquals(['--- \n',
1076
 
                           '+++ \n',
 
991
        self.assertEquals([ '---  \n',
 
992
                           '+++  \n',
1077
993
                           '@@ -1,3 +1,2 @@\n',
1078
994
                           ' hello there\n',
1079
995
                           '-world\n',
1084
1000
        txt_a = map(lambda x: x+'\n', 'abcdefghijklmnop')
1085
1001
        txt_b = map(lambda x: x+'\n', 'abcdefxydefghijklmnop')
1086
1002
        # This is the result with LongestCommonSubstring matching
1087
 
        self.assertEquals(['--- \n',
1088
 
                           '+++ \n',
 
1003
        self.assertEquals(['---  \n',
 
1004
                           '+++  \n',
1089
1005
                           '@@ -1,6 +1,11 @@\n',
1090
1006
                           ' a\n',
1091
1007
                           ' b\n',
1100
1016
                           ' f\n']
1101
1017
                          , list(unified_diff(txt_a, txt_b)))
1102
1018
        # And the patience diff
1103
 
        self.assertEquals(['--- \n',
1104
 
                           '+++ \n',
 
1019
        self.assertEquals(['---  \n',
 
1020
                           '+++  \n',
1105
1021
                           '@@ -4,6 +4,11 @@\n',
1106
1022
                           ' d\n',
1107
1023
                           ' e\n',
1118
1034
                          , list(unified_diff(txt_a, txt_b,
1119
1035
                                 sequencematcher=psm)))
1120
1036
 
1121
 
    def test_patience_unified_diff_with_dates(self):
1122
 
        txt_a = ['hello there\n',
1123
 
                 'world\n',
1124
 
                 'how are you today?\n']
1125
 
        txt_b = ['hello there\n',
1126
 
                 'how are you today?\n']
1127
 
        unified_diff = patiencediff.unified_diff
1128
 
        psm = self._PatienceSequenceMatcher
1129
 
        self.assertEquals(['--- a\t2008-08-08\n',
1130
 
                           '+++ b\t2008-09-09\n',
1131
 
                           '@@ -1,3 +1,2 @@\n',
1132
 
                           ' hello there\n',
1133
 
                           '-world\n',
1134
 
                           ' how are you today?\n'
1135
 
                          ]
1136
 
                          , list(unified_diff(txt_a, txt_b,
1137
 
                                 fromfile='a', tofile='b',
1138
 
                                 fromfiledate='2008-08-08',
1139
 
                                 tofiledate='2008-09-09',
1140
 
                                 sequencematcher=psm)))
1141
 
 
1142
1037
 
1143
1038
class TestPatienceDiffLib_c(TestPatienceDiffLib):
1144
1039
 
1145
 
    _test_needs_features = [compiled_patiencediff_feature]
 
1040
    _test_needs_features = [CompiledPatienceDiffFeature]
1146
1041
 
1147
1042
    def setUp(self):
1148
1043
        super(TestPatienceDiffLib_c, self).setUp()
1149
 
        from bzrlib import _patiencediff_c
1150
 
        self._unique_lcs = _patiencediff_c.unique_lcs_c
1151
 
        self._recurse_matches = _patiencediff_c.recurse_matches_c
 
1044
        import bzrlib._patiencediff_c
 
1045
        self._unique_lcs = bzrlib._patiencediff_c.unique_lcs_c
 
1046
        self._recurse_matches = bzrlib._patiencediff_c.recurse_matches_c
1152
1047
        self._PatienceSequenceMatcher = \
1153
 
            _patiencediff_c.PatienceSequenceMatcher_c
1154
 
 
1155
 
    def test_unhashable(self):
1156
 
        """We should get a proper exception here."""
1157
 
        # We need to be able to hash items in the sequence, lists are
1158
 
        # unhashable, and thus cannot be diffed
1159
 
        e = self.assertRaises(TypeError, self._PatienceSequenceMatcher,
1160
 
                                         None, [[]], [])
1161
 
        e = self.assertRaises(TypeError, self._PatienceSequenceMatcher,
1162
 
                                         None, ['valid', []], [])
1163
 
        e = self.assertRaises(TypeError, self._PatienceSequenceMatcher,
1164
 
                                         None, ['valid'], [[]])
1165
 
        e = self.assertRaises(TypeError, self._PatienceSequenceMatcher,
1166
 
                                         None, ['valid'], ['valid', []])
1167
 
 
1168
 
 
1169
 
class TestPatienceDiffLibFiles(tests.TestCaseInTempDir):
 
1048
            bzrlib._patiencediff_c.PatienceSequenceMatcher_c
 
1049
 
 
1050
 
 
1051
class TestPatienceDiffLibFiles(TestCaseInTempDir):
1170
1052
 
1171
1053
    def setUp(self):
1172
1054
        super(TestPatienceDiffLibFiles, self).setUp()
1173
1055
        self._PatienceSequenceMatcher = \
1174
 
            _patiencediff_py.PatienceSequenceMatcher_py
 
1056
            bzrlib._patiencediff_py.PatienceSequenceMatcher_py
1175
1057
 
1176
1058
    def test_patience_unified_diff_files(self):
1177
1059
        txt_a = ['hello there\n',
1182
1064
        open('a1', 'wb').writelines(txt_a)
1183
1065
        open('b1', 'wb').writelines(txt_b)
1184
1066
 
1185
 
        unified_diff_files = patiencediff.unified_diff_files
 
1067
        unified_diff_files = bzrlib.patiencediff.unified_diff_files
1186
1068
        psm = self._PatienceSequenceMatcher
1187
 
        self.assertEquals(['--- a1\n',
1188
 
                           '+++ b1\n',
 
1069
        self.assertEquals(['--- a1 \n',
 
1070
                           '+++ b1 \n',
1189
1071
                           '@@ -1,3 +1,2 @@\n',
1190
1072
                           ' hello there\n',
1191
1073
                           '-world\n',
1200
1082
        open('b2', 'wb').writelines(txt_b)
1201
1083
 
1202
1084
        # This is the result with LongestCommonSubstring matching
1203
 
        self.assertEquals(['--- a2\n',
1204
 
                           '+++ b2\n',
 
1085
        self.assertEquals(['--- a2 \n',
 
1086
                           '+++ b2 \n',
1205
1087
                           '@@ -1,6 +1,11 @@\n',
1206
1088
                           ' a\n',
1207
1089
                           ' b\n',
1217
1099
                          , list(unified_diff_files('a2', 'b2')))
1218
1100
 
1219
1101
        # And the patience diff
1220
 
        self.assertEquals(['--- a2\n',
1221
 
                           '+++ b2\n',
 
1102
        self.assertEquals(['--- a2 \n',
 
1103
                           '+++ b2 \n',
1222
1104
                           '@@ -4,6 +4,11 @@\n',
1223
1105
                           ' d\n',
1224
1106
                           ' e\n',
1238
1120
 
1239
1121
class TestPatienceDiffLibFiles_c(TestPatienceDiffLibFiles):
1240
1122
 
1241
 
    _test_needs_features = [compiled_patiencediff_feature]
 
1123
    _test_needs_features = [CompiledPatienceDiffFeature]
1242
1124
 
1243
1125
    def setUp(self):
1244
1126
        super(TestPatienceDiffLibFiles_c, self).setUp()
1245
 
        from bzrlib import _patiencediff_c
 
1127
        import bzrlib._patiencediff_c
1246
1128
        self._PatienceSequenceMatcher = \
1247
 
            _patiencediff_c.PatienceSequenceMatcher_c
1248
 
 
1249
 
 
1250
 
class TestUsingCompiledIfAvailable(tests.TestCase):
 
1129
            bzrlib._patiencediff_c.PatienceSequenceMatcher_c
 
1130
 
 
1131
 
 
1132
class TestUsingCompiledIfAvailable(TestCase):
1251
1133
 
1252
1134
    def test_PatienceSequenceMatcher(self):
1253
 
        if compiled_patiencediff_feature.available():
 
1135
        if CompiledPatienceDiffFeature.available():
1254
1136
            from bzrlib._patiencediff_c import PatienceSequenceMatcher_c
1255
1137
            self.assertIs(PatienceSequenceMatcher_c,
1256
 
                          patiencediff.PatienceSequenceMatcher)
 
1138
                          bzrlib.patiencediff.PatienceSequenceMatcher)
1257
1139
        else:
1258
1140
            from bzrlib._patiencediff_py import PatienceSequenceMatcher_py
1259
1141
            self.assertIs(PatienceSequenceMatcher_py,
1260
 
                          patiencediff.PatienceSequenceMatcher)
 
1142
                          bzrlib.patiencediff.PatienceSequenceMatcher)
1261
1143
 
1262
1144
    def test_unique_lcs(self):
1263
 
        if compiled_patiencediff_feature.available():
 
1145
        if CompiledPatienceDiffFeature.available():
1264
1146
            from bzrlib._patiencediff_c import unique_lcs_c
1265
1147
            self.assertIs(unique_lcs_c,
1266
 
                          patiencediff.unique_lcs)
 
1148
                          bzrlib.patiencediff.unique_lcs)
1267
1149
        else:
1268
1150
            from bzrlib._patiencediff_py import unique_lcs_py
1269
1151
            self.assertIs(unique_lcs_py,
1270
 
                          patiencediff.unique_lcs)
 
1152
                          bzrlib.patiencediff.unique_lcs)
1271
1153
 
1272
1154
    def test_recurse_matches(self):
1273
 
        if compiled_patiencediff_feature.available():
 
1155
        if CompiledPatienceDiffFeature.available():
1274
1156
            from bzrlib._patiencediff_c import recurse_matches_c
1275
1157
            self.assertIs(recurse_matches_c,
1276
 
                          patiencediff.recurse_matches)
 
1158
                          bzrlib.patiencediff.recurse_matches)
1277
1159
        else:
1278
1160
            from bzrlib._patiencediff_py import recurse_matches_py
1279
1161
            self.assertIs(recurse_matches_py,
1280
 
                          patiencediff.recurse_matches)
1281
 
 
1282
 
 
1283
 
class TestDiffFromTool(tests.TestCaseWithTransport):
1284
 
 
1285
 
    def test_from_string(self):
1286
 
        diff_obj = diff.DiffFromTool.from_string('diff', None, None, None)
1287
 
        self.addCleanup(diff_obj.finish)
1288
 
        self.assertEqual(['diff', '@old_path', '@new_path'],
1289
 
            diff_obj.command_template)
1290
 
 
1291
 
    def test_from_string_u5(self):
1292
 
        diff_obj = diff.DiffFromTool.from_string('diff "-u 5"',
1293
 
                                                 None, None, None)
1294
 
        self.addCleanup(diff_obj.finish)
1295
 
        self.assertEqual(['diff', '-u 5', '@old_path', '@new_path'],
1296
 
                         diff_obj.command_template)
1297
 
        self.assertEqual(['diff', '-u 5', 'old-path', 'new-path'],
1298
 
                         diff_obj._get_command('old-path', 'new-path'))
1299
 
 
1300
 
    def test_from_string_path_with_backslashes(self):
1301
 
        self.requireFeature(test_win32utils.BackslashDirSeparatorFeature)
1302
 
        tool = 'C:\\Tools\\Diff.exe'
1303
 
        diff_obj = diff.DiffFromTool.from_string(tool, None, None, None)
1304
 
        self.addCleanup(diff_obj.finish)
1305
 
        self.assertEqual(['C:\\Tools\\Diff.exe', '@old_path', '@new_path'],
1306
 
                         diff_obj.command_template)
1307
 
        self.assertEqual(['C:\\Tools\\Diff.exe', 'old-path', 'new-path'],
1308
 
                         diff_obj._get_command('old-path', 'new-path'))
1309
 
 
1310
 
    def test_execute(self):
1311
 
        output = StringIO()
1312
 
        diff_obj = diff.DiffFromTool(['python', '-c',
1313
 
                                      'print "@old_path @new_path"'],
1314
 
                                     None, None, output)
1315
 
        self.addCleanup(diff_obj.finish)
1316
 
        diff_obj._execute('old', 'new')
1317
 
        self.assertEqual(output.getvalue().rstrip(), 'old new')
1318
 
 
1319
 
    def test_excute_missing(self):
1320
 
        diff_obj = diff.DiffFromTool(['a-tool-which-is-unlikely-to-exist'],
1321
 
                                     None, None, None)
1322
 
        self.addCleanup(diff_obj.finish)
1323
 
        e = self.assertRaises(errors.ExecutableMissing, diff_obj._execute,
1324
 
                              'old', 'new')
1325
 
        self.assertEqual('a-tool-which-is-unlikely-to-exist could not be found'
1326
 
                         ' on this machine', str(e))
1327
 
 
1328
 
    def test_prepare_files_creates_paths_readable_by_windows_tool(self):
1329
 
        self.requireFeature(AttribFeature)
1330
 
        output = StringIO()
1331
 
        tree = self.make_branch_and_tree('tree')
1332
 
        self.build_tree_contents([('tree/file', 'content')])
1333
 
        tree.add('file', 'file-id')
1334
 
        tree.commit('old tree')
1335
 
        tree.lock_read()
1336
 
        self.addCleanup(tree.unlock)
1337
 
        basis_tree = tree.basis_tree()
1338
 
        basis_tree.lock_read()
1339
 
        self.addCleanup(basis_tree.unlock)
1340
 
        diff_obj = diff.DiffFromTool(['python', '-c',
1341
 
                                      'print "@old_path @new_path"'],
1342
 
                                     basis_tree, tree, output)
1343
 
        diff_obj._prepare_files('file-id', 'file', 'file')
1344
 
        # The old content should be readonly
1345
 
        self.assertReadableByAttrib(diff_obj._root, 'old\\file',
1346
 
                                    r'R.*old\\file$')
1347
 
        # The new content should use the tree object, not a 'new' file anymore
1348
 
        self.assertEndsWith(tree.basedir, 'work/tree')
1349
 
        self.assertReadableByAttrib(tree.basedir, 'file', r'work\\tree\\file$')
1350
 
 
1351
 
    def assertReadableByAttrib(self, cwd, relpath, regex):
1352
 
        proc = subprocess.Popen(['attrib', relpath],
1353
 
                                stdout=subprocess.PIPE,
1354
 
                                cwd=cwd)
1355
 
        (result, err) = proc.communicate()
1356
 
        self.assertContainsRe(result.replace('\r\n', '\n'), regex)
1357
 
 
1358
 
    def test_prepare_files(self):
1359
 
        output = StringIO()
1360
 
        tree = self.make_branch_and_tree('tree')
1361
 
        self.build_tree_contents([('tree/oldname', 'oldcontent')])
1362
 
        self.build_tree_contents([('tree/oldname2', 'oldcontent2')])
1363
 
        tree.add('oldname', 'file-id')
1364
 
        tree.add('oldname2', 'file2-id')
1365
 
        # Earliest allowable date on FAT32 filesystems is 1980-01-01
1366
 
        tree.commit('old tree', timestamp=315532800)
1367
 
        tree.rename_one('oldname', 'newname')
1368
 
        tree.rename_one('oldname2', 'newname2')
1369
 
        self.build_tree_contents([('tree/newname', 'newcontent')])
1370
 
        self.build_tree_contents([('tree/newname2', 'newcontent2')])
1371
 
        old_tree = tree.basis_tree()
1372
 
        old_tree.lock_read()
1373
 
        self.addCleanup(old_tree.unlock)
1374
 
        tree.lock_read()
1375
 
        self.addCleanup(tree.unlock)
1376
 
        diff_obj = diff.DiffFromTool(['python', '-c',
1377
 
                                      'print "@old_path @new_path"'],
1378
 
                                     old_tree, tree, output)
1379
 
        self.addCleanup(diff_obj.finish)
1380
 
        self.assertContainsRe(diff_obj._root, 'bzr-diff-[^/]*')
1381
 
        old_path, new_path = diff_obj._prepare_files('file-id', 'oldname',
1382
 
                                                     'newname')
1383
 
        self.assertContainsRe(old_path, 'old/oldname$')
1384
 
        self.assertEqual(315532800, os.stat(old_path).st_mtime)
1385
 
        self.assertContainsRe(new_path, 'tree/newname$')
1386
 
        self.assertFileEqual('oldcontent', old_path)
1387
 
        self.assertFileEqual('newcontent', new_path)
1388
 
        if osutils.host_os_dereferences_symlinks():
1389
 
            self.assertTrue(os.path.samefile('tree/newname', new_path))
1390
 
        # make sure we can create files with the same parent directories
1391
 
        diff_obj._prepare_files('file2-id', 'oldname2', 'newname2')
1392
 
 
1393
 
 
1394
 
class TestGetTreesAndBranchesToDiffLocked(tests.TestCaseWithTransport):
1395
 
 
1396
 
    def call_gtabtd(self, path_list, revision_specs, old_url, new_url):
1397
 
        """Call get_trees_and_branches_to_diff_locked.  Overridden by
1398
 
        TestGetTreesAndBranchesToDiff.
1399
 
        """
1400
 
        return diff.get_trees_and_branches_to_diff_locked(
1401
 
            path_list, revision_specs, old_url, new_url, self.addCleanup)
1402
 
 
1403
 
    def test_basic(self):
1404
 
        tree = self.make_branch_and_tree('tree')
1405
 
        (old_tree, new_tree,
1406
 
         old_branch, new_branch,
1407
 
         specific_files, extra_trees) = self.call_gtabtd(
1408
 
             ['tree'], None, None, None)
1409
 
 
1410
 
        self.assertIsInstance(old_tree, revisiontree.RevisionTree)
1411
 
        self.assertEqual(_mod_revision.NULL_REVISION,
1412
 
                         old_tree.get_revision_id())
1413
 
        self.assertEqual(tree.basedir, new_tree.basedir)
1414
 
        self.assertEqual(tree.branch.base, old_branch.base)
1415
 
        self.assertEqual(tree.branch.base, new_branch.base)
1416
 
        self.assertIs(None, specific_files)
1417
 
        self.assertIs(None, extra_trees)
1418
 
 
1419
 
    def test_with_rev_specs(self):
1420
 
        tree = self.make_branch_and_tree('tree')
1421
 
        self.build_tree_contents([('tree/file', 'oldcontent')])
1422
 
        tree.add('file', 'file-id')
1423
 
        tree.commit('old tree', timestamp=0, rev_id="old-id")
1424
 
        self.build_tree_contents([('tree/file', 'newcontent')])
1425
 
        tree.commit('new tree', timestamp=0, rev_id="new-id")
1426
 
 
1427
 
        revisions = [revisionspec.RevisionSpec.from_string('1'),
1428
 
                     revisionspec.RevisionSpec.from_string('2')]
1429
 
        (old_tree, new_tree,
1430
 
         old_branch, new_branch,
1431
 
         specific_files, extra_trees) = self.call_gtabtd(
1432
 
            ['tree'], revisions, None, None)
1433
 
 
1434
 
        self.assertIsInstance(old_tree, revisiontree.RevisionTree)
1435
 
        self.assertEqual("old-id", old_tree.get_revision_id())
1436
 
        self.assertIsInstance(new_tree, revisiontree.RevisionTree)
1437
 
        self.assertEqual("new-id", new_tree.get_revision_id())
1438
 
        self.assertEqual(tree.branch.base, old_branch.base)
1439
 
        self.assertEqual(tree.branch.base, new_branch.base)
1440
 
        self.assertIs(None, specific_files)
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
 
 
 
1162
                          bzrlib.patiencediff.recurse_matches)