← 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: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005-2011 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
18
from cStringIO import StringIO
19
 
import errno
20
19
import subprocess
21
 
from tempfile import TemporaryFile
22
 
 
23
 
from bzrlib.diff import internal_diff, external_diff, show_diff_trees
24
 
from bzrlib.errors import BinaryFile, NoDiff
25
 
import bzrlib.osutils as osutils
26
 
import bzrlib.patiencediff
27
 
import bzrlib._patiencediff_py
28
 
from bzrlib.tests import (Feature, TestCase, TestCaseWithTransport,
29
 
                          TestCaseInTempDir, TestSkipped)
30
 
 
31
 
 
32
 
class _CompiledPatienceDiffFeature(Feature):
 
20
import sys
 
21
import tempfile
 
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,
 
34
    )
 
35
from bzrlib.symbol_versioning import deprecated_in
 
36
from bzrlib.tests import features
 
37
from bzrlib.tests.blackbox.test_diff import subst_dates
 
38
 
 
39
 
 
40
class _AttribFeature(tests.Feature):
33
41
 
34
42
    def _probe(self):
 
43
        if (sys.platform not in ('cygwin', 'win32')):
 
44
            return False
35
45
        try:
36
 
            import bzrlib._patiencediff_c
37
 
        except ImportError:
 
46
            proc = subprocess.Popen(['attrib', '.'], stdout=subprocess.PIPE)
 
47
        except OSError, e:
38
48
            return False
39
 
        return True
 
49
        return (0 == proc.wait())
40
50
 
41
51
    def feature_name(self):
42
 
        return 'bzrlib._patiencediff_c'
43
 
 
44
 
CompiledPatienceDiffFeature = _CompiledPatienceDiffFeature()
45
 
 
46
 
 
47
 
class _UnicodeFilename(Feature):
48
 
    """Does the filesystem support Unicode filenames?"""
49
 
 
50
 
    def _probe(self):
51
 
        try:
52
 
            os.stat(u'\u03b1')
53
 
        except UnicodeEncodeError:
54
 
            return False
55
 
        except (IOError, OSError):
56
 
            # The filesystem allows the Unicode filename but the file doesn't
57
 
            # exist.
58
 
            return True
59
 
        else:
60
 
            # The filesystem allows the Unicode filename and the file exists,
61
 
            # for some reason.
62
 
            return True
63
 
 
64
 
UnicodeFilename = _UnicodeFilename()
65
 
 
66
 
 
67
 
class TestUnicodeFilename(TestCase):
68
 
 
69
 
    def test_probe_passes(self):
70
 
        """UnicodeFilename._probe passes."""
71
 
        # We can't test much more than that because the behaviour depends
72
 
        # on the platform.
73
 
        UnicodeFilename._probe()
74
 
        
 
52
        return 'attrib Windows command-line tool'
 
53
 
 
54
AttribFeature = _AttribFeature()
 
55
 
 
56
 
 
57
compiled_patiencediff_feature = tests.ModuleAvailableFeature(
 
58
                                    'bzrlib._patiencediff_c')
 
59
 
75
60
 
76
61
def udiff_lines(old, new, allow_binary=False):
77
62
    output = StringIO()
78
 
    internal_diff('old', old, 'new', new, output, allow_binary)
 
63
    diff.internal_diff('old', old, 'new', new, output, allow_binary)
79
64
    output.seek(0, 0)
80
65
    return output.readlines()
81
66
 
85
70
        # StringIO has no fileno, so it tests a different codepath
86
71
        output = StringIO()
87
72
    else:
88
 
        output = TemporaryFile()
 
73
        output = tempfile.TemporaryFile()
89
74
    try:
90
 
        external_diff('old', old, 'new', new, output, diff_opts=['-u'])
91
 
    except NoDiff:
92
 
        raise TestSkipped('external "diff" not present to test')
 
75
        diff.external_diff('old', old, 'new', new, output, diff_opts=['-u'])
 
76
    except errors.NoDiff:
 
77
        raise tests.TestSkipped('external "diff" not present to test')
93
78
    output.seek(0, 0)
94
79
    lines = output.readlines()
95
80
    output.close()
96
81
    return lines
97
82
 
98
83
 
99
 
class TestDiff(TestCase):
 
84
class TestDiff(tests.TestCase):
100
85
 
101
86
    def test_add_nl(self):
102
87
        """diff generates a valid diff for patches that add a newline"""
138
123
            ## "Unterminated hunk header for patch:\n%s" % "".join(lines)
139
124
 
140
125
    def test_binary_lines(self):
141
 
        self.assertRaises(BinaryFile, udiff_lines, [1023 * 'a' + '\x00'], [])
142
 
        self.assertRaises(BinaryFile, udiff_lines, [], [1023 * 'a' + '\x00'])
143
 
        udiff_lines([1023 * 'a' + '\x00'], [], allow_binary=True)
144
 
        udiff_lines([], [1023 * 'a' + '\x00'], allow_binary=True)
 
126
        empty = []
 
127
        uni_lines = [1023 * 'a' + '\x00']
 
128
        self.assertRaises(errors.BinaryFile, udiff_lines, uni_lines , empty)
 
129
        self.assertRaises(errors.BinaryFile, udiff_lines, empty, uni_lines)
 
130
        udiff_lines(uni_lines , empty, allow_binary=True)
 
131
        udiff_lines(empty, uni_lines, allow_binary=True)
145
132
 
146
133
    def test_external_diff(self):
147
134
        lines = external_udiff_lines(['boo\n'], ['goo\n'])
157
144
        self.check_patch(lines)
158
145
 
159
146
    def test_external_diff_binary_lang_c(self):
160
 
        old_env = {}
161
147
        for lang in ('LANG', 'LC_ALL', 'LANGUAGE'):
162
 
            old_env[lang] = osutils.set_or_unset_env(lang, 'C')
163
 
        try:
164
 
            lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
165
 
            # Older versions of diffutils say "Binary files", newer
166
 
            # versions just say "Files".
167
 
            self.assertContainsRe(lines[0],
168
 
                                  '(Binary f|F)iles old and new differ\n')
169
 
            self.assertEquals(lines[1:], ['\n'])
170
 
        finally:
171
 
            for lang, old_val in old_env.iteritems():
172
 
                osutils.set_or_unset_env(lang, old_val)
 
148
            self.overrideEnv(lang, 'C')
 
149
        lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
 
150
        # Older versions of diffutils say "Binary files", newer
 
151
        # versions just say "Files".
 
152
        self.assertContainsRe(lines[0], '(Binary f|F)iles old and new differ\n')
 
153
        self.assertEquals(lines[1:], ['\n'])
173
154
 
174
155
    def test_no_external_diff(self):
175
156
        """Check that NoDiff is raised when diff is not available"""
176
 
        # Use os.environ['PATH'] to make sure no 'diff' command is available
177
 
        orig_path = os.environ['PATH']
178
 
        try:
179
 
            os.environ['PATH'] = ''
180
 
            self.assertRaises(NoDiff, external_diff,
181
 
                              'old', ['boo\n'], 'new', ['goo\n'],
182
 
                              StringIO(), diff_opts=['-u'])
183
 
        finally:
184
 
            os.environ['PATH'] = orig_path
185
 
        
 
157
        # Make sure no 'diff' command is available
 
158
        # XXX: Weird, using None instead of '' breaks the test -- vila 20101216
 
159
        self.overrideEnv('PATH', '')
 
160
        self.assertRaises(errors.NoDiff, diff.external_diff,
 
161
                          'old', ['boo\n'], 'new', ['goo\n'],
 
162
                          StringIO(), diff_opts=['-u'])
 
163
 
186
164
    def test_internal_diff_default(self):
187
165
        # Default internal diff encoding is utf8
188
166
        output = StringIO()
189
 
        internal_diff(u'old_\xb5', ['old_text\n'],
190
 
                    u'new_\xe5', ['new_text\n'], output)
 
167
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
 
168
                           u'new_\xe5', ['new_text\n'], output)
191
169
        lines = output.getvalue().splitlines(True)
192
170
        self.check_patch(lines)
193
171
        self.assertEquals(['--- old_\xc2\xb5\n',
201
179
 
202
180
    def test_internal_diff_utf8(self):
203
181
        output = StringIO()
204
 
        internal_diff(u'old_\xb5', ['old_text\n'],
205
 
                    u'new_\xe5', ['new_text\n'], output,
206
 
                    path_encoding='utf8')
 
182
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
 
183
                           u'new_\xe5', ['new_text\n'], output,
 
184
                           path_encoding='utf8')
207
185
        lines = output.getvalue().splitlines(True)
208
186
        self.check_patch(lines)
209
187
        self.assertEquals(['--- old_\xc2\xb5\n',
217
195
 
218
196
    def test_internal_diff_iso_8859_1(self):
219
197
        output = StringIO()
220
 
        internal_diff(u'old_\xb5', ['old_text\n'],
221
 
                    u'new_\xe5', ['new_text\n'], output,
222
 
                    path_encoding='iso-8859-1')
 
198
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
 
199
                           u'new_\xe5', ['new_text\n'], output,
 
200
                           path_encoding='iso-8859-1')
223
201
        lines = output.getvalue().splitlines(True)
224
202
        self.check_patch(lines)
225
203
        self.assertEquals(['--- old_\xb5\n',
231
209
                          ]
232
210
                          , lines)
233
211
 
 
212
    def test_internal_diff_no_content(self):
 
213
        output = StringIO()
 
214
        diff.internal_diff(u'old', [], u'new', [], output)
 
215
        self.assertEqual('', output.getvalue())
 
216
 
 
217
    def test_internal_diff_no_changes(self):
 
218
        output = StringIO()
 
219
        diff.internal_diff(u'old', ['text\n', 'contents\n'],
 
220
                           u'new', ['text\n', 'contents\n'],
 
221
                           output)
 
222
        self.assertEqual('', output.getvalue())
 
223
 
234
224
    def test_internal_diff_returns_bytes(self):
235
225
        import StringIO
236
226
        output = StringIO.StringIO()
237
 
        internal_diff(u'old_\xb5', ['old_text\n'],
238
 
                    u'new_\xe5', ['new_text\n'], output)
239
 
        self.failUnless(isinstance(output.getvalue(), str),
 
227
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
 
228
                            u'new_\xe5', ['new_text\n'], output)
 
229
        self.assertIsInstance(output.getvalue(), str,
240
230
            'internal_diff should return bytestrings')
241
231
 
242
232
 
243
 
class TestDiffFiles(TestCaseInTempDir):
 
233
class TestDiffFiles(tests.TestCaseInTempDir):
244
234
 
245
235
    def test_external_diff_binary(self):
246
236
        """The output when using external diff should use diff's i18n error"""
259
249
        self.assertEqual(out.splitlines(True) + ['\n'], lines)
260
250
 
261
251
 
262
 
class TestShowDiffTreesHelper(TestCaseWithTransport):
263
 
    """Has a helper for running show_diff_trees"""
264
 
 
265
 
    def get_diff(self, tree1, tree2, specific_files=None, working_tree=None):
266
 
        output = StringIO()
267
 
        if working_tree is not None:
268
 
            extra_trees = (working_tree,)
269
 
        else:
270
 
            extra_trees = ()
271
 
        show_diff_trees(tree1, tree2, output, 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):
 
252
def get_diff_as_string(tree1, tree2, specific_files=None, working_tree=None):
 
253
    output = StringIO()
 
254
    if working_tree is not None:
 
255
        extra_trees = (working_tree,)
 
256
    else:
 
257
        extra_trees = ()
 
258
    diff.show_diff_trees(tree1, tree2, output,
 
259
        specific_files=specific_files,
 
260
        extra_trees=extra_trees, old_label='old/',
 
261
        new_label='new/')
 
262
    return output.getvalue()
 
263
 
 
264
 
 
265
class TestDiffDates(tests.TestCaseWithTransport):
278
266
 
279
267
    def setUp(self):
280
268
        super(TestDiffDates, self).setUp()
315
303
        os.utime('file1', (1144195200, 1144195200)) # 2006-04-05 00:00:00 UTC
316
304
 
317
305
    def test_diff_rev_tree_working_tree(self):
318
 
        output = self.get_diff(self.wt.basis_tree(), self.wt)
 
306
        output = get_diff_as_string(self.wt.basis_tree(), self.wt)
319
307
        # note that the date for old/file1 is from rev 2 rather than from
320
308
        # the basis revision (rev 4)
321
309
        self.assertEqualDiff(output, '''\
331
319
    def test_diff_rev_tree_rev_tree(self):
332
320
        tree1 = self.b.repository.revision_tree('rev-2')
333
321
        tree2 = self.b.repository.revision_tree('rev-3')
334
 
        output = self.get_diff(tree1, tree2)
 
322
        output = get_diff_as_string(tree1, tree2)
335
323
        self.assertEqualDiff(output, '''\
336
324
=== modified file 'file2'
337
325
--- old/file2\t2006-04-01 00:00:00 +0000
341
329
+file2 contents at rev 3
342
330
 
343
331
''')
344
 
        
 
332
 
345
333
    def test_diff_add_files(self):
346
 
        tree1 = self.b.repository.revision_tree(None)
 
334
        tree1 = self.b.repository.revision_tree(_mod_revision.NULL_REVISION)
347
335
        tree2 = self.b.repository.revision_tree('rev-1')
348
 
        output = self.get_diff(tree1, tree2)
 
336
        output = get_diff_as_string(tree1, tree2)
349
337
        # the files have the epoch time stamp for the tree in which
350
338
        # they don't exist.
351
339
        self.assertEqualDiff(output, '''\
366
354
    def test_diff_remove_files(self):
367
355
        tree1 = self.b.repository.revision_tree('rev-3')
368
356
        tree2 = self.b.repository.revision_tree('rev-4')
369
 
        output = self.get_diff(tree1, tree2)
 
357
        output = get_diff_as_string(tree1, tree2)
370
358
        # the file has the epoch time stamp for the tree in which
371
359
        # it doesn't exist.
372
360
        self.assertEqualDiff(output, '''\
383
371
        self.wt.rename_one('file1', 'file1b')
384
372
        old_tree = self.b.repository.revision_tree('rev-1')
385
373
        new_tree = self.b.repository.revision_tree('rev-4')
386
 
        out = self.get_diff(old_tree, new_tree, specific_files=['file1b'], 
 
374
        out = get_diff_as_string(old_tree, new_tree, specific_files=['file1b'],
387
375
                            working_tree=self.wt)
388
376
        self.assertContainsRe(out, 'file1\t')
389
377
 
395
383
        self.wt.rename_one('file1', 'dir1/file1')
396
384
        old_tree = self.b.repository.revision_tree('rev-1')
397
385
        new_tree = self.b.repository.revision_tree('rev-4')
398
 
        out = self.get_diff(old_tree, new_tree, specific_files=['dir1'], 
 
386
        out = get_diff_as_string(old_tree, new_tree, specific_files=['dir1'],
399
387
                            working_tree=self.wt)
400
388
        self.assertContainsRe(out, 'file1\t')
401
 
        out = self.get_diff(old_tree, new_tree, specific_files=['dir2'], 
 
389
        out = get_diff_as_string(old_tree, new_tree, specific_files=['dir2'],
402
390
                            working_tree=self.wt)
403
391
        self.assertNotContainsRe(out, 'file1\t')
404
392
 
405
393
 
406
 
 
407
 
class TestShowDiffTrees(TestShowDiffTreesHelper):
 
394
class TestShowDiffTrees(tests.TestCaseWithTransport):
408
395
    """Direct tests for show_diff_trees"""
409
396
 
410
397
    def test_modified_file(self):
415
402
        tree.commit('one', rev_id='rev-1')
416
403
 
417
404
        self.build_tree_contents([('tree/file', 'new contents\n')])
418
 
        diff = self.get_diff(tree.basis_tree(), tree)
419
 
        self.assertContainsRe(diff, "=== modified file 'file'\n")
420
 
        self.assertContainsRe(diff, '--- old/file\t')
421
 
        self.assertContainsRe(diff, '\\+\\+\\+ new/file\t')
422
 
        self.assertContainsRe(diff, '-contents\n'
423
 
                                    '\\+new contents\n')
 
405
        d = get_diff_as_string(tree.basis_tree(), tree)
 
406
        self.assertContainsRe(d, "=== modified file 'file'\n")
 
407
        self.assertContainsRe(d, '--- old/file\t')
 
408
        self.assertContainsRe(d, '\\+\\+\\+ new/file\t')
 
409
        self.assertContainsRe(d, '-contents\n'
 
410
                                 '\\+new contents\n')
424
411
 
425
412
    def test_modified_file_in_renamed_dir(self):
426
413
        """Test when a file is modified in a renamed directory."""
432
419
 
433
420
        tree.rename_one('dir', 'other')
434
421
        self.build_tree_contents([('tree/other/file', 'new contents\n')])
435
 
        diff = self.get_diff(tree.basis_tree(), tree)
436
 
        self.assertContainsRe(diff, "=== renamed directory 'dir' => 'other'\n")
437
 
        self.assertContainsRe(diff, "=== modified file 'other/file'\n")
 
422
        d = get_diff_as_string(tree.basis_tree(), tree)
 
423
        self.assertContainsRe(d, "=== renamed directory 'dir' => 'other'\n")
 
424
        self.assertContainsRe(d, "=== modified file 'other/file'\n")
438
425
        # XXX: This is technically incorrect, because it used to be at another
439
426
        # location. What to do?
440
 
        self.assertContainsRe(diff, '--- old/dir/file\t')
441
 
        self.assertContainsRe(diff, '\\+\\+\\+ new/other/file\t')
442
 
        self.assertContainsRe(diff, '-contents\n'
443
 
                                    '\\+new contents\n')
 
427
        self.assertContainsRe(d, '--- old/dir/file\t')
 
428
        self.assertContainsRe(d, '\\+\\+\\+ new/other/file\t')
 
429
        self.assertContainsRe(d, '-contents\n'
 
430
                                 '\\+new contents\n')
444
431
 
445
432
    def test_renamed_directory(self):
446
433
        """Test when only a directory is only renamed."""
451
438
        tree.commit('one', rev_id='rev-1')
452
439
 
453
440
        tree.rename_one('dir', 'newdir')
454
 
        diff = self.get_diff(tree.basis_tree(), tree)
 
441
        d = get_diff_as_string(tree.basis_tree(), tree)
455
442
        # Renaming a directory should be a single "you renamed this dir" even
456
443
        # when there are files inside.
457
 
        self.assertEqual("=== renamed directory 'dir' => 'newdir'\n", diff)
 
444
        self.assertEqual(d, "=== renamed directory 'dir' => 'newdir'\n")
458
445
 
459
446
    def test_renamed_file(self):
460
447
        """Test when a file is only renamed."""
464
451
        tree.commit('one', rev_id='rev-1')
465
452
 
466
453
        tree.rename_one('file', 'newname')
467
 
        diff = self.get_diff(tree.basis_tree(), tree)
468
 
        self.assertContainsRe(diff, "=== renamed file 'file' => 'newname'\n")
 
454
        d = get_diff_as_string(tree.basis_tree(), tree)
 
455
        self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
469
456
        # We shouldn't have a --- or +++ line, because there is no content
470
457
        # change
471
 
        self.assertNotContainsRe(diff, '---')
 
458
        self.assertNotContainsRe(d, '---')
472
459
 
473
460
    def test_renamed_and_modified_file(self):
474
461
        """Test when a file is only renamed."""
479
466
 
480
467
        tree.rename_one('file', 'newname')
481
468
        self.build_tree_contents([('tree/newname', 'new contents\n')])
482
 
        diff = self.get_diff(tree.basis_tree(), tree)
483
 
        self.assertContainsRe(diff, "=== renamed file 'file' => 'newname'\n")
484
 
        self.assertContainsRe(diff, '--- old/file\t')
485
 
        self.assertContainsRe(diff, '\\+\\+\\+ new/newname\t')
486
 
        self.assertContainsRe(diff, '-contents\n'
487
 
                                    '\\+new contents\n')
 
469
        d = get_diff_as_string(tree.basis_tree(), tree)
 
470
        self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
 
471
        self.assertContainsRe(d, '--- old/file\t')
 
472
        self.assertContainsRe(d, '\\+\\+\\+ new/newname\t')
 
473
        self.assertContainsRe(d, '-contents\n'
 
474
                                 '\\+new contents\n')
 
475
 
 
476
 
 
477
    def test_internal_diff_exec_property(self):
 
478
        tree = self.make_branch_and_tree('tree')
 
479
 
 
480
        tt = transform.TreeTransform(tree)
 
481
        tt.new_file('a', tt.root, 'contents\n', 'a-id', True)
 
482
        tt.new_file('b', tt.root, 'contents\n', 'b-id', False)
 
483
        tt.new_file('c', tt.root, 'contents\n', 'c-id', True)
 
484
        tt.new_file('d', tt.root, 'contents\n', 'd-id', False)
 
485
        tt.new_file('e', tt.root, 'contents\n', 'control-e-id', True)
 
486
        tt.new_file('f', tt.root, 'contents\n', 'control-f-id', False)
 
487
        tt.apply()
 
488
        tree.commit('one', rev_id='rev-1')
 
489
 
 
490
        tt = transform.TreeTransform(tree)
 
491
        tt.set_executability(False, tt.trans_id_file_id('a-id'))
 
492
        tt.set_executability(True, tt.trans_id_file_id('b-id'))
 
493
        tt.set_executability(False, tt.trans_id_file_id('c-id'))
 
494
        tt.set_executability(True, tt.trans_id_file_id('d-id'))
 
495
        tt.apply()
 
496
        tree.rename_one('c', 'new-c')
 
497
        tree.rename_one('d', 'new-d')
 
498
 
 
499
        d = get_diff_as_string(tree.basis_tree(), tree)
 
500
 
 
501
        self.assertContainsRe(d, r"file 'a'.*\(properties changed:"
 
502
                                  ".*\+x to -x.*\)")
 
503
        self.assertContainsRe(d, r"file 'b'.*\(properties changed:"
 
504
                                  ".*-x to \+x.*\)")
 
505
        self.assertContainsRe(d, r"file 'c'.*\(properties changed:"
 
506
                                  ".*\+x to -x.*\)")
 
507
        self.assertContainsRe(d, r"file 'd'.*\(properties changed:"
 
508
                                  ".*-x to \+x.*\)")
 
509
        self.assertNotContainsRe(d, r"file 'e'")
 
510
        self.assertNotContainsRe(d, r"file 'f'")
488
511
 
489
512
    def test_binary_unicode_filenames(self):
490
513
        """Test that contents of files are *not* encoded in UTF-8 when there
491
514
        is a binary file in the diff.
492
515
        """
493
516
        # See https://bugs.launchpad.net/bugs/110092.
494
 
        self.requireFeature(UnicodeFilename)
 
517
        self.requireFeature(tests.UnicodeFilenameFeature)
495
518
 
496
519
        # This bug isn't triggered with cStringIO.
497
520
        from StringIO import StringIO
505
528
        tree.add([alpha], ['file-id'])
506
529
        tree.add([omega], ['file-id-2'])
507
530
        diff_content = StringIO()
508
 
        show_diff_trees(tree.basis_tree(), tree, diff_content)
509
 
        diff = diff_content.getvalue()
510
 
        self.assertContainsRe(diff, r"=== added file '%s'" % alpha_utf8)
511
 
        self.assertContainsRe(
512
 
            diff, "Binary files a/%s.*and b/%s.* differ\n" % (alpha_utf8, alpha_utf8))
513
 
        self.assertContainsRe(diff, r"=== added file '%s'" % omega_utf8)
514
 
        self.assertContainsRe(diff, r"--- a/%s" % (omega_utf8,))
515
 
        self.assertContainsRe(diff, r"\+\+\+ b/%s" % (omega_utf8,))
 
531
        diff.show_diff_trees(tree.basis_tree(), tree, diff_content)
 
532
        d = diff_content.getvalue()
 
533
        self.assertContainsRe(d, r"=== added file '%s'" % alpha_utf8)
 
534
        self.assertContainsRe(d, "Binary files a/%s.*and b/%s.* differ\n"
 
535
                              % (alpha_utf8, alpha_utf8))
 
536
        self.assertContainsRe(d, r"=== added file '%s'" % omega_utf8)
 
537
        self.assertContainsRe(d, r"--- a/%s" % (omega_utf8,))
 
538
        self.assertContainsRe(d, r"\+\+\+ b/%s" % (omega_utf8,))
516
539
 
517
540
    def test_unicode_filename(self):
518
541
        """Test when the filename are unicode."""
519
 
        self.requireFeature(UnicodeFilename)
 
542
        self.requireFeature(tests.UnicodeFilenameFeature)
520
543
 
521
544
        alpha, omega = u'\u03b1', u'\u03c9'
522
545
        autf8, outf8 = alpha.encode('utf8'), omega.encode('utf8')
537
560
        tree.add(['add_'+alpha], ['file-id'])
538
561
        self.build_tree_contents([('tree/mod_'+alpha, 'contents_mod\n')])
539
562
 
540
 
        diff = self.get_diff(tree.basis_tree(), tree)
541
 
        self.assertContainsRe(diff,
 
563
        d = get_diff_as_string(tree.basis_tree(), tree)
 
564
        self.assertContainsRe(d,
542
565
                "=== renamed file 'ren_%s' => 'ren_%s'\n"%(autf8, outf8))
543
 
        self.assertContainsRe(diff, "=== added file 'add_%s'"%autf8)
544
 
        self.assertContainsRe(diff, "=== modified file 'mod_%s'"%autf8)
545
 
        self.assertContainsRe(diff, "=== removed file 'del_%s'"%autf8)
546
 
 
547
 
class TestPatienceDiffLib(TestCase):
 
566
        self.assertContainsRe(d, "=== added file 'add_%s'"%autf8)
 
567
        self.assertContainsRe(d, "=== modified file 'mod_%s'"%autf8)
 
568
        self.assertContainsRe(d, "=== removed file 'del_%s'"%autf8)
 
569
 
 
570
    def test_unicode_filename_path_encoding(self):
 
571
        """Test for bug #382699: unicode filenames on Windows should be shown
 
572
        in user encoding.
 
573
        """
 
574
        self.requireFeature(tests.UnicodeFilenameFeature)
 
575
        # The word 'test' in Russian
 
576
        _russian_test = u'\u0422\u0435\u0441\u0442'
 
577
        directory = _russian_test + u'/'
 
578
        test_txt = _russian_test + u'.txt'
 
579
        u1234 = u'\u1234.txt'
 
580
 
 
581
        tree = self.make_branch_and_tree('.')
 
582
        self.build_tree_contents([
 
583
            (test_txt, 'foo\n'),
 
584
            (u1234, 'foo\n'),
 
585
            (directory, None),
 
586
            ])
 
587
        tree.add([test_txt, u1234, directory])
 
588
 
 
589
        sio = StringIO()
 
590
        diff.show_diff_trees(tree.basis_tree(), tree, sio,
 
591
            path_encoding='cp1251')
 
592
 
 
593
        output = subst_dates(sio.getvalue())
 
594
        shouldbe = ('''\
 
595
=== added directory '%(directory)s'
 
596
=== added file '%(test_txt)s'
 
597
--- a/%(test_txt)s\tYYYY-MM-DD HH:MM:SS +ZZZZ
 
598
+++ b/%(test_txt)s\tYYYY-MM-DD HH:MM:SS +ZZZZ
 
599
@@ -0,0 +1,1 @@
 
600
+foo
 
601
 
 
602
=== added file '?.txt'
 
603
--- a/?.txt\tYYYY-MM-DD HH:MM:SS +ZZZZ
 
604
+++ b/?.txt\tYYYY-MM-DD HH:MM:SS +ZZZZ
 
605
@@ -0,0 +1,1 @@
 
606
+foo
 
607
 
 
608
''' % {'directory': _russian_test.encode('cp1251'),
 
609
       'test_txt': test_txt.encode('cp1251'),
 
610
      })
 
611
        self.assertEqualDiff(output, shouldbe)
 
612
 
 
613
 
 
614
class DiffWasIs(diff.DiffPath):
 
615
 
 
616
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
 
617
        self.to_file.write('was: ')
 
618
        self.to_file.write(self.old_tree.get_file(file_id).read())
 
619
        self.to_file.write('is: ')
 
620
        self.to_file.write(self.new_tree.get_file(file_id).read())
 
621
        pass
 
622
 
 
623
 
 
624
class TestDiffTree(tests.TestCaseWithTransport):
 
625
 
 
626
    def setUp(self):
 
627
        super(TestDiffTree, self).setUp()
 
628
        self.old_tree = self.make_branch_and_tree('old-tree')
 
629
        self.old_tree.lock_write()
 
630
        self.addCleanup(self.old_tree.unlock)
 
631
        self.new_tree = self.make_branch_and_tree('new-tree')
 
632
        self.new_tree.lock_write()
 
633
        self.addCleanup(self.new_tree.unlock)
 
634
        self.differ = diff.DiffTree(self.old_tree, self.new_tree, StringIO())
 
635
 
 
636
    def test_diff_text(self):
 
637
        self.build_tree_contents([('old-tree/olddir/',),
 
638
                                  ('old-tree/olddir/oldfile', 'old\n')])
 
639
        self.old_tree.add('olddir')
 
640
        self.old_tree.add('olddir/oldfile', 'file-id')
 
641
        self.build_tree_contents([('new-tree/newdir/',),
 
642
                                  ('new-tree/newdir/newfile', 'new\n')])
 
643
        self.new_tree.add('newdir')
 
644
        self.new_tree.add('newdir/newfile', 'file-id')
 
645
        differ = diff.DiffText(self.old_tree, self.new_tree, StringIO())
 
646
        differ.diff_text('file-id', None, 'old label', 'new label')
 
647
        self.assertEqual(
 
648
            '--- old label\n+++ new label\n@@ -1,1 +0,0 @@\n-old\n\n',
 
649
            differ.to_file.getvalue())
 
650
        differ.to_file.seek(0)
 
651
        differ.diff_text(None, 'file-id', 'old label', 'new label')
 
652
        self.assertEqual(
 
653
            '--- old label\n+++ new label\n@@ -0,0 +1,1 @@\n+new\n\n',
 
654
            differ.to_file.getvalue())
 
655
        differ.to_file.seek(0)
 
656
        differ.diff_text('file-id', 'file-id', 'old label', 'new label')
 
657
        self.assertEqual(
 
658
            '--- old label\n+++ new label\n@@ -1,1 +1,1 @@\n-old\n+new\n\n',
 
659
            differ.to_file.getvalue())
 
660
 
 
661
    def test_diff_deletion(self):
 
662
        self.build_tree_contents([('old-tree/file', 'contents'),
 
663
                                  ('new-tree/file', 'contents')])
 
664
        self.old_tree.add('file', 'file-id')
 
665
        self.new_tree.add('file', 'file-id')
 
666
        os.unlink('new-tree/file')
 
667
        self.differ.show_diff(None)
 
668
        self.assertContainsRe(self.differ.to_file.getvalue(), '-contents')
 
669
 
 
670
    def test_diff_creation(self):
 
671
        self.build_tree_contents([('old-tree/file', 'contents'),
 
672
                                  ('new-tree/file', 'contents')])
 
673
        self.old_tree.add('file', 'file-id')
 
674
        self.new_tree.add('file', 'file-id')
 
675
        os.unlink('old-tree/file')
 
676
        self.differ.show_diff(None)
 
677
        self.assertContainsRe(self.differ.to_file.getvalue(), '\+contents')
 
678
 
 
679
    def test_diff_symlink(self):
 
680
        differ = diff.DiffSymlink(self.old_tree, self.new_tree, StringIO())
 
681
        differ.diff_symlink('old target', None)
 
682
        self.assertEqual("=== target was 'old target'\n",
 
683
                         differ.to_file.getvalue())
 
684
 
 
685
        differ = diff.DiffSymlink(self.old_tree, self.new_tree, StringIO())
 
686
        differ.diff_symlink(None, 'new target')
 
687
        self.assertEqual("=== target is 'new target'\n",
 
688
                         differ.to_file.getvalue())
 
689
 
 
690
        differ = diff.DiffSymlink(self.old_tree, self.new_tree, StringIO())
 
691
        differ.diff_symlink('old target', 'new target')
 
692
        self.assertEqual("=== target changed 'old target' => 'new target'\n",
 
693
                         differ.to_file.getvalue())
 
694
 
 
695
    def test_diff(self):
 
696
        self.build_tree_contents([('old-tree/olddir/',),
 
697
                                  ('old-tree/olddir/oldfile', 'old\n')])
 
698
        self.old_tree.add('olddir')
 
699
        self.old_tree.add('olddir/oldfile', 'file-id')
 
700
        self.build_tree_contents([('new-tree/newdir/',),
 
701
                                  ('new-tree/newdir/newfile', 'new\n')])
 
702
        self.new_tree.add('newdir')
 
703
        self.new_tree.add('newdir/newfile', 'file-id')
 
704
        self.differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile')
 
705
        self.assertContainsRe(
 
706
            self.differ.to_file.getvalue(),
 
707
            r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+1,1'
 
708
             ' \@\@\n-old\n\+new\n\n')
 
709
 
 
710
    def test_diff_kind_change(self):
 
711
        self.requireFeature(tests.SymlinkFeature)
 
712
        self.build_tree_contents([('old-tree/olddir/',),
 
713
                                  ('old-tree/olddir/oldfile', 'old\n')])
 
714
        self.old_tree.add('olddir')
 
715
        self.old_tree.add('olddir/oldfile', 'file-id')
 
716
        self.build_tree(['new-tree/newdir/'])
 
717
        os.symlink('new', 'new-tree/newdir/newfile')
 
718
        self.new_tree.add('newdir')
 
719
        self.new_tree.add('newdir/newfile', 'file-id')
 
720
        self.differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile')
 
721
        self.assertContainsRe(
 
722
            self.differ.to_file.getvalue(),
 
723
            r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+0,0'
 
724
             ' \@\@\n-old\n\n')
 
725
        self.assertContainsRe(self.differ.to_file.getvalue(),
 
726
                              "=== target is u'new'\n")
 
727
 
 
728
    def test_diff_directory(self):
 
729
        self.build_tree(['new-tree/new-dir/'])
 
730
        self.new_tree.add('new-dir', 'new-dir-id')
 
731
        self.differ.diff('new-dir-id', None, 'new-dir')
 
732
        self.assertEqual(self.differ.to_file.getvalue(), '')
 
733
 
 
734
    def create_old_new(self):
 
735
        self.build_tree_contents([('old-tree/olddir/',),
 
736
                                  ('old-tree/olddir/oldfile', 'old\n')])
 
737
        self.old_tree.add('olddir')
 
738
        self.old_tree.add('olddir/oldfile', 'file-id')
 
739
        self.build_tree_contents([('new-tree/newdir/',),
 
740
                                  ('new-tree/newdir/newfile', 'new\n')])
 
741
        self.new_tree.add('newdir')
 
742
        self.new_tree.add('newdir/newfile', 'file-id')
 
743
 
 
744
    def test_register_diff(self):
 
745
        self.create_old_new()
 
746
        old_diff_factories = diff.DiffTree.diff_factories
 
747
        diff.DiffTree.diff_factories=old_diff_factories[:]
 
748
        diff.DiffTree.diff_factories.insert(0, DiffWasIs.from_diff_tree)
 
749
        try:
 
750
            differ = diff.DiffTree(self.old_tree, self.new_tree, StringIO())
 
751
        finally:
 
752
            diff.DiffTree.diff_factories = old_diff_factories
 
753
        differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile')
 
754
        self.assertNotContainsRe(
 
755
            differ.to_file.getvalue(),
 
756
            r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+1,1'
 
757
             ' \@\@\n-old\n\+new\n\n')
 
758
        self.assertContainsRe(differ.to_file.getvalue(),
 
759
                              'was: old\nis: new\n')
 
760
 
 
761
    def test_extra_factories(self):
 
762
        self.create_old_new()
 
763
        differ = diff.DiffTree(self.old_tree, self.new_tree, StringIO(),
 
764
                               extra_factories=[DiffWasIs.from_diff_tree])
 
765
        differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile')
 
766
        self.assertNotContainsRe(
 
767
            differ.to_file.getvalue(),
 
768
            r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+1,1'
 
769
             ' \@\@\n-old\n\+new\n\n')
 
770
        self.assertContainsRe(differ.to_file.getvalue(),
 
771
                              'was: old\nis: new\n')
 
772
 
 
773
    def test_alphabetical_order(self):
 
774
        self.build_tree(['new-tree/a-file'])
 
775
        self.new_tree.add('a-file')
 
776
        self.build_tree(['old-tree/b-file'])
 
777
        self.old_tree.add('b-file')
 
778
        self.differ.show_diff(None)
 
779
        self.assertContainsRe(self.differ.to_file.getvalue(),
 
780
            '.*a-file(.|\n)*b-file')
 
781
 
 
782
 
 
783
class TestPatienceDiffLib(tests.TestCase):
548
784
 
549
785
    def setUp(self):
550
786
        super(TestPatienceDiffLib, self).setUp()
551
 
        self._unique_lcs = bzrlib._patiencediff_py.unique_lcs_py
552
 
        self._recurse_matches = bzrlib._patiencediff_py.recurse_matches_py
 
787
        self._unique_lcs = _patiencediff_py.unique_lcs_py
 
788
        self._recurse_matches = _patiencediff_py.recurse_matches_py
553
789
        self._PatienceSequenceMatcher = \
554
 
            bzrlib._patiencediff_py.PatienceSequenceMatcher_py
 
790
            _patiencediff_py.PatienceSequenceMatcher_py
 
791
 
 
792
    def test_diff_unicode_string(self):
 
793
        a = ''.join([unichr(i) for i in range(4000, 4500, 3)])
 
794
        b = ''.join([unichr(i) for i in range(4300, 4800, 2)])
 
795
        sm = self._PatienceSequenceMatcher(None, a, b)
 
796
        mb = sm.get_matching_blocks()
 
797
        self.assertEquals(35, len(mb))
555
798
 
556
799
    def test_unique_lcs(self):
557
800
        unique_lcs = self._unique_lcs
563
806
        self.assertEquals(unique_lcs('ab', 'ab'), [(0,0), (1,1)])
564
807
        self.assertEquals(unique_lcs('abcde', 'cdeab'), [(2,0), (3,1), (4,2)])
565
808
        self.assertEquals(unique_lcs('cdeab', 'abcde'), [(0,2), (1,3), (2,4)])
566
 
        self.assertEquals(unique_lcs('abXde', 'abYde'), [(0,0), (1,1), 
 
809
        self.assertEquals(unique_lcs('abXde', 'abYde'), [(0,0), (1,1),
567
810
                                                         (3,3), (4,4)])
568
811
        self.assertEquals(unique_lcs('acbac', 'abc'), [(2,1)])
569
812
 
584
827
        test_one('abcdbce', 'afbcgdbce', [(0,0), (1, 2), (2, 3), (3, 5),
585
828
                                          (4, 6), (5, 7), (6, 8)])
586
829
 
587
 
        # recurse_matches doesn't match non-unique 
 
830
        # recurse_matches doesn't match non-unique
588
831
        # lines surrounded by bogus text.
589
832
        # The update has been done in patiencediff.SequenceMatcher instead
590
833
 
594
837
        # This is what it currently gives:
595
838
        test_one('aBccDe', 'abccde', [(0,0), (5,5)])
596
839
 
 
840
    def assertDiffBlocks(self, a, b, expected_blocks):
 
841
        """Check that the sequence matcher returns the correct blocks.
 
842
 
 
843
        :param a: A sequence to match
 
844
        :param b: Another sequence to match
 
845
        :param expected_blocks: The expected output, not including the final
 
846
            matching block (len(a), len(b), 0)
 
847
        """
 
848
        matcher = self._PatienceSequenceMatcher(None, a, b)
 
849
        blocks = matcher.get_matching_blocks()
 
850
        last = blocks.pop()
 
851
        self.assertEqual((len(a), len(b), 0), last)
 
852
        self.assertEqual(expected_blocks, blocks)
 
853
 
597
854
    def test_matching_blocks(self):
598
 
        def chk_blocks(a, b, expected_blocks):
599
 
            # difflib always adds a signature of the total
600
 
            # length, with no matching entries at the end
601
 
            s = self._PatienceSequenceMatcher(None, a, b)
602
 
            blocks = s.get_matching_blocks()
603
 
            self.assertEquals((len(a), len(b), 0), blocks[-1])
604
 
            self.assertEquals(expected_blocks, blocks[:-1])
605
 
 
606
855
        # Some basic matching tests
607
 
        chk_blocks('', '', [])
608
 
        chk_blocks([], [], [])
609
 
        chk_blocks('abc', '', [])
610
 
        chk_blocks('', 'abc', [])
611
 
        chk_blocks('abcd', 'abcd', [(0, 0, 4)])
612
 
        chk_blocks('abcd', 'abce', [(0, 0, 3)])
613
 
        chk_blocks('eabc', 'abce', [(1, 0, 3)])
614
 
        chk_blocks('eabce', 'abce', [(1, 0, 4)])
615
 
        chk_blocks('abcde', 'abXde', [(0, 0, 2), (3, 3, 2)])
616
 
        chk_blocks('abcde', 'abXYZde', [(0, 0, 2), (3, 5, 2)])
617
 
        chk_blocks('abde', 'abXYZde', [(0, 0, 2), (2, 5, 2)])
618
 
        # This may check too much, but it checks to see that 
 
856
        self.assertDiffBlocks('', '', [])
 
857
        self.assertDiffBlocks([], [], [])
 
858
        self.assertDiffBlocks('abc', '', [])
 
859
        self.assertDiffBlocks('', 'abc', [])
 
860
        self.assertDiffBlocks('abcd', 'abcd', [(0, 0, 4)])
 
861
        self.assertDiffBlocks('abcd', 'abce', [(0, 0, 3)])
 
862
        self.assertDiffBlocks('eabc', 'abce', [(1, 0, 3)])
 
863
        self.assertDiffBlocks('eabce', 'abce', [(1, 0, 4)])
 
864
        self.assertDiffBlocks('abcde', 'abXde', [(0, 0, 2), (3, 3, 2)])
 
865
        self.assertDiffBlocks('abcde', 'abXYZde', [(0, 0, 2), (3, 5, 2)])
 
866
        self.assertDiffBlocks('abde', 'abXYZde', [(0, 0, 2), (2, 5, 2)])
 
867
        # This may check too much, but it checks to see that
619
868
        # a copied block stays attached to the previous section,
620
869
        # not the later one.
621
870
        # difflib would tend to grab the trailing longest match
622
871
        # which would make the diff not look right
623
 
        chk_blocks('abcdefghijklmnop', 'abcdefxydefghijklmnop',
624
 
                   [(0, 0, 6), (6, 11, 10)])
 
872
        self.assertDiffBlocks('abcdefghijklmnop', 'abcdefxydefghijklmnop',
 
873
                              [(0, 0, 6), (6, 11, 10)])
625
874
 
626
875
        # make sure it supports passing in lists
627
 
        chk_blocks(
 
876
        self.assertDiffBlocks(
628
877
                   ['hello there\n',
629
878
                    'world\n',
630
879
                    'how are you today?\n'],
634
883
 
635
884
        # non unique lines surrounded by non-matching lines
636
885
        # won't be found
637
 
        chk_blocks('aBccDe', 'abccde', [(0,0,1), (5,5,1)])
 
886
        self.assertDiffBlocks('aBccDe', 'abccde', [(0,0,1), (5,5,1)])
638
887
 
639
888
        # But they only need to be locally unique
640
 
        chk_blocks('aBcDec', 'abcdec', [(0,0,1), (2,2,1), (4,4,2)])
 
889
        self.assertDiffBlocks('aBcDec', 'abcdec', [(0,0,1), (2,2,1), (4,4,2)])
641
890
 
642
891
        # non unique blocks won't be matched
643
 
        chk_blocks('aBcdEcdFg', 'abcdecdfg', [(0,0,1), (8,8,1)])
 
892
        self.assertDiffBlocks('aBcdEcdFg', 'abcdecdfg', [(0,0,1), (8,8,1)])
644
893
 
645
894
        # but locally unique ones will
646
 
        chk_blocks('aBcdEeXcdFg', 'abcdecdfg', [(0,0,1), (2,2,2),
 
895
        self.assertDiffBlocks('aBcdEeXcdFg', 'abcdecdfg', [(0,0,1), (2,2,2),
647
896
                                              (5,4,1), (7,5,2), (10,8,1)])
648
897
 
649
 
        chk_blocks('abbabbXd', 'cabbabxd', [(7,7,1)])
650
 
        chk_blocks('abbabbbb', 'cabbabbc', [])
651
 
        chk_blocks('bbbbbbbb', 'cbbbbbbc', [])
 
898
        self.assertDiffBlocks('abbabbXd', 'cabbabxd', [(7,7,1)])
 
899
        self.assertDiffBlocks('abbabbbb', 'cabbabbc', [])
 
900
        self.assertDiffBlocks('bbbbbbbb', 'cbbbbbbc', [])
 
901
 
 
902
    def test_matching_blocks_tuples(self):
 
903
        # Some basic matching tests
 
904
        self.assertDiffBlocks([], [], [])
 
905
        self.assertDiffBlocks([('a',), ('b',), ('c,')], [], [])
 
906
        self.assertDiffBlocks([], [('a',), ('b',), ('c,')], [])
 
907
        self.assertDiffBlocks([('a',), ('b',), ('c,')],
 
908
                              [('a',), ('b',), ('c,')],
 
909
                              [(0, 0, 3)])
 
910
        self.assertDiffBlocks([('a',), ('b',), ('c,')],
 
911
                              [('a',), ('b',), ('d,')],
 
912
                              [(0, 0, 2)])
 
913
        self.assertDiffBlocks([('d',), ('b',), ('c,')],
 
914
                              [('a',), ('b',), ('c,')],
 
915
                              [(1, 1, 2)])
 
916
        self.assertDiffBlocks([('d',), ('a',), ('b',), ('c,')],
 
917
                              [('a',), ('b',), ('c,')],
 
918
                              [(1, 0, 3)])
 
919
        self.assertDiffBlocks([('a', 'b'), ('c', 'd'), ('e', 'f')],
 
920
                              [('a', 'b'), ('c', 'X'), ('e', 'f')],
 
921
                              [(0, 0, 1), (2, 2, 1)])
 
922
        self.assertDiffBlocks([('a', 'b'), ('c', 'd'), ('e', 'f')],
 
923
                              [('a', 'b'), ('c', 'dX'), ('e', 'f')],
 
924
                              [(0, 0, 1), (2, 2, 1)])
652
925
 
653
926
    def test_opcodes(self):
654
927
        def chk_ops(a, b, expected_codes):
697
970
                 ('delete', 1,2, 1,1),
698
971
                 ('equal',  2,3, 1,2),
699
972
                ])
700
 
        chk_ops('aBccDe', 'abccde', 
 
973
        chk_ops('aBccDe', 'abccde',
701
974
                [('equal',   0,1, 0,1),
702
975
                 ('replace', 1,5, 1,5),
703
976
                 ('equal',   5,6, 5,6),
704
977
                ])
705
 
        chk_ops('aBcDec', 'abcdec', 
 
978
        chk_ops('aBcDec', 'abcdec',
706
979
                [('equal',   0,1, 0,1),
707
980
                 ('replace', 1,2, 1,2),
708
981
                 ('equal',   2,3, 2,3),
709
982
                 ('replace', 3,4, 3,4),
710
983
                 ('equal',   4,6, 4,6),
711
984
                ])
712
 
        chk_ops('aBcdEcdFg', 'abcdecdfg', 
 
985
        chk_ops('aBcdEcdFg', 'abcdecdfg',
713
986
                [('equal',   0,1, 0,1),
714
987
                 ('replace', 1,8, 1,8),
715
988
                 ('equal',   8,9, 8,9)
716
989
                ])
717
 
        chk_ops('aBcdEeXcdFg', 'abcdecdfg', 
 
990
        chk_ops('aBcdEeXcdFg', 'abcdecdfg',
718
991
                [('equal',   0,1, 0,1),
719
992
                 ('replace', 1,2, 1,2),
720
993
                 ('equal',   2,4, 2,4),
766
1039
    def test_multiple_ranges(self):
767
1040
        # There was an earlier bug where we used a bad set of ranges,
768
1041
        # this triggers that specific bug, to make sure it doesn't regress
769
 
        def chk_blocks(a, b, expected_blocks):
770
 
            # difflib always adds a signature of the total
771
 
            # length, with no matching entries at the end
772
 
            s = self._PatienceSequenceMatcher(None, a, b)
773
 
            blocks = s.get_matching_blocks()
774
 
            x = blocks.pop()
775
 
            self.assertEquals(x, (len(a), len(b), 0))
776
 
            self.assertEquals(expected_blocks, blocks)
777
 
 
778
 
        chk_blocks('abcdefghijklmnop'
779
 
                 , 'abcXghiYZQRSTUVWXYZijklmnop'
780
 
                 , [(0, 0, 3), (6, 4, 3), (9, 20, 7)])
781
 
 
782
 
        chk_blocks('ABCd efghIjk  L'
783
 
                 , 'AxyzBCn mo pqrstuvwI1 2  L'
784
 
                 , [(0,0,1), (1, 4, 2), (9, 19, 1), (12, 23, 3)])
 
1042
        self.assertDiffBlocks('abcdefghijklmnop',
 
1043
                              'abcXghiYZQRSTUVWXYZijklmnop',
 
1044
                              [(0, 0, 3), (6, 4, 3), (9, 20, 7)])
 
1045
 
 
1046
        self.assertDiffBlocks('ABCd efghIjk  L',
 
1047
                              'AxyzBCn mo pqrstuvwI1 2  L',
 
1048
                              [(0,0,1), (1, 4, 2), (9, 19, 1), (12, 23, 3)])
785
1049
 
786
1050
        # These are rot13 code snippets.
787
 
        chk_blocks('''\
 
1051
        self.assertDiffBlocks('''\
788
1052
    trg nqqrq jura lbh nqq n svyr va gur qverpgbel.
789
1053
    """
790
1054
    gnxrf_netf = ['svyr*']
791
1055
    gnxrf_bcgvbaf = ['ab-erphefr']
792
 
  
 
1056
 
793
1057
    qrs eha(frys, svyr_yvfg, ab_erphefr=Snyfr):
794
1058
        sebz omeyvo.nqq vzcbeg fzneg_nqq, nqq_ercbegre_cevag, nqq_ercbegre_ahyy
795
1059
        vs vf_dhvrg():
803
1067
'''.splitlines(True), '''\
804
1068
    trg nqqrq jura lbh nqq n svyr va gur qverpgbel.
805
1069
 
806
 
    --qel-eha jvyy fubj juvpu svyrf jbhyq or nqqrq, ohg abg npghnyyl 
 
1070
    --qel-eha jvyy fubj juvpu svyrf jbhyq or nqqrq, ohg abg npghnyyl
807
1071
    nqq gurz.
808
1072
    """
809
1073
    gnxrf_netf = ['svyr*']
836
1100
                 'how are you today?\n']
837
1101
        txt_b = ['hello there\n',
838
1102
                 'how are you today?\n']
839
 
        unified_diff = bzrlib.patiencediff.unified_diff
 
1103
        unified_diff = patiencediff.unified_diff
840
1104
        psm = self._PatienceSequenceMatcher
841
 
        self.assertEquals([ '---  \n',
842
 
                           '+++  \n',
 
1105
        self.assertEquals(['--- \n',
 
1106
                           '+++ \n',
843
1107
                           '@@ -1,3 +1,2 @@\n',
844
1108
                           ' hello there\n',
845
1109
                           '-world\n',
850
1114
        txt_a = map(lambda x: x+'\n', 'abcdefghijklmnop')
851
1115
        txt_b = map(lambda x: x+'\n', 'abcdefxydefghijklmnop')
852
1116
        # This is the result with LongestCommonSubstring matching
853
 
        self.assertEquals(['---  \n',
854
 
                           '+++  \n',
 
1117
        self.assertEquals(['--- \n',
 
1118
                           '+++ \n',
855
1119
                           '@@ -1,6 +1,11 @@\n',
856
1120
                           ' a\n',
857
1121
                           ' b\n',
866
1130
                           ' f\n']
867
1131
                          , list(unified_diff(txt_a, txt_b)))
868
1132
        # And the patience diff
869
 
        self.assertEquals(['---  \n',
870
 
                           '+++  \n',
 
1133
        self.assertEquals(['--- \n',
 
1134
                           '+++ \n',
871
1135
                           '@@ -4,6 +4,11 @@\n',
872
1136
                           ' d\n',
873
1137
                           ' e\n',
884
1148
                          , list(unified_diff(txt_a, txt_b,
885
1149
                                 sequencematcher=psm)))
886
1150
 
 
1151
    def test_patience_unified_diff_with_dates(self):
 
1152
        txt_a = ['hello there\n',
 
1153
                 'world\n',
 
1154
                 'how are you today?\n']
 
1155
        txt_b = ['hello there\n',
 
1156
                 'how are you today?\n']
 
1157
        unified_diff = patiencediff.unified_diff
 
1158
        psm = self._PatienceSequenceMatcher
 
1159
        self.assertEquals(['--- a\t2008-08-08\n',
 
1160
                           '+++ b\t2008-09-09\n',
 
1161
                           '@@ -1,3 +1,2 @@\n',
 
1162
                           ' hello there\n',
 
1163
                           '-world\n',
 
1164
                           ' how are you today?\n'
 
1165
                          ]
 
1166
                          , list(unified_diff(txt_a, txt_b,
 
1167
                                 fromfile='a', tofile='b',
 
1168
                                 fromfiledate='2008-08-08',
 
1169
                                 tofiledate='2008-09-09',
 
1170
                                 sequencematcher=psm)))
 
1171
 
887
1172
 
888
1173
class TestPatienceDiffLib_c(TestPatienceDiffLib):
889
1174
 
890
 
    _test_needs_features = [CompiledPatienceDiffFeature]
 
1175
    _test_needs_features = [compiled_patiencediff_feature]
891
1176
 
892
1177
    def setUp(self):
893
1178
        super(TestPatienceDiffLib_c, self).setUp()
894
 
        import bzrlib._patiencediff_c
895
 
        self._unique_lcs = bzrlib._patiencediff_c.unique_lcs_c
896
 
        self._recurse_matches = bzrlib._patiencediff_c.recurse_matches_c
 
1179
        from bzrlib import _patiencediff_c
 
1180
        self._unique_lcs = _patiencediff_c.unique_lcs_c
 
1181
        self._recurse_matches = _patiencediff_c.recurse_matches_c
897
1182
        self._PatienceSequenceMatcher = \
898
 
            bzrlib._patiencediff_c.PatienceSequenceMatcher_c
899
 
 
900
 
 
901
 
class TestPatienceDiffLibFiles(TestCaseInTempDir):
 
1183
            _patiencediff_c.PatienceSequenceMatcher_c
 
1184
 
 
1185
    def test_unhashable(self):
 
1186
        """We should get a proper exception here."""
 
1187
        # We need to be able to hash items in the sequence, lists are
 
1188
        # unhashable, and thus cannot be diffed
 
1189
        e = self.assertRaises(TypeError, self._PatienceSequenceMatcher,
 
1190
                                         None, [[]], [])
 
1191
        e = self.assertRaises(TypeError, self._PatienceSequenceMatcher,
 
1192
                                         None, ['valid', []], [])
 
1193
        e = self.assertRaises(TypeError, self._PatienceSequenceMatcher,
 
1194
                                         None, ['valid'], [[]])
 
1195
        e = self.assertRaises(TypeError, self._PatienceSequenceMatcher,
 
1196
                                         None, ['valid'], ['valid', []])
 
1197
 
 
1198
 
 
1199
class TestPatienceDiffLibFiles(tests.TestCaseInTempDir):
902
1200
 
903
1201
    def setUp(self):
904
1202
        super(TestPatienceDiffLibFiles, self).setUp()
905
1203
        self._PatienceSequenceMatcher = \
906
 
            bzrlib._patiencediff_py.PatienceSequenceMatcher_py
 
1204
            _patiencediff_py.PatienceSequenceMatcher_py
907
1205
 
908
1206
    def test_patience_unified_diff_files(self):
909
1207
        txt_a = ['hello there\n',
914
1212
        open('a1', 'wb').writelines(txt_a)
915
1213
        open('b1', 'wb').writelines(txt_b)
916
1214
 
917
 
        unified_diff_files = bzrlib.patiencediff.unified_diff_files
 
1215
        unified_diff_files = patiencediff.unified_diff_files
918
1216
        psm = self._PatienceSequenceMatcher
919
 
        self.assertEquals(['--- a1 \n',
920
 
                           '+++ b1 \n',
 
1217
        self.assertEquals(['--- a1\n',
 
1218
                           '+++ b1\n',
921
1219
                           '@@ -1,3 +1,2 @@\n',
922
1220
                           ' hello there\n',
923
1221
                           '-world\n',
932
1230
        open('b2', 'wb').writelines(txt_b)
933
1231
 
934
1232
        # This is the result with LongestCommonSubstring matching
935
 
        self.assertEquals(['--- a2 \n',
936
 
                           '+++ b2 \n',
 
1233
        self.assertEquals(['--- a2\n',
 
1234
                           '+++ b2\n',
937
1235
                           '@@ -1,6 +1,11 @@\n',
938
1236
                           ' a\n',
939
1237
                           ' b\n',
949
1247
                          , list(unified_diff_files('a2', 'b2')))
950
1248
 
951
1249
        # And the patience diff
952
 
        self.assertEquals(['--- a2 \n',
953
 
                           '+++ b2 \n',
 
1250
        self.assertEquals(['--- a2\n',
 
1251
                           '+++ b2\n',
954
1252
                           '@@ -4,6 +4,11 @@\n',
955
1253
                           ' d\n',
956
1254
                           ' e\n',
970
1268
 
971
1269
class TestPatienceDiffLibFiles_c(TestPatienceDiffLibFiles):
972
1270
 
973
 
    _test_needs_features = [CompiledPatienceDiffFeature]
 
1271
    _test_needs_features = [compiled_patiencediff_feature]
974
1272
 
975
1273
    def setUp(self):
976
1274
        super(TestPatienceDiffLibFiles_c, self).setUp()
977
 
        import bzrlib._patiencediff_c
 
1275
        from bzrlib import _patiencediff_c
978
1276
        self._PatienceSequenceMatcher = \
979
 
            bzrlib._patiencediff_c.PatienceSequenceMatcher_c
980
 
 
981
 
 
982
 
class TestUsingCompiledIfAvailable(TestCase):
 
1277
            _patiencediff_c.PatienceSequenceMatcher_c
 
1278
 
 
1279
 
 
1280
class TestUsingCompiledIfAvailable(tests.TestCase):
983
1281
 
984
1282
    def test_PatienceSequenceMatcher(self):
985
 
        if CompiledPatienceDiffFeature.available():
 
1283
        if compiled_patiencediff_feature.available():
986
1284
            from bzrlib._patiencediff_c import PatienceSequenceMatcher_c
987
1285
            self.assertIs(PatienceSequenceMatcher_c,
988
 
                          bzrlib.patiencediff.PatienceSequenceMatcher)
 
1286
                          patiencediff.PatienceSequenceMatcher)
989
1287
        else:
990
1288
            from bzrlib._patiencediff_py import PatienceSequenceMatcher_py
991
1289
            self.assertIs(PatienceSequenceMatcher_py,
992
 
                          bzrlib.patiencediff.PatienceSequenceMatcher)
 
1290
                          patiencediff.PatienceSequenceMatcher)
993
1291
 
994
1292
    def test_unique_lcs(self):
995
 
        if CompiledPatienceDiffFeature.available():
 
1293
        if compiled_patiencediff_feature.available():
996
1294
            from bzrlib._patiencediff_c import unique_lcs_c
997
1295
            self.assertIs(unique_lcs_c,
998
 
                          bzrlib.patiencediff.unique_lcs)
 
1296
                          patiencediff.unique_lcs)
999
1297
        else:
1000
1298
            from bzrlib._patiencediff_py import unique_lcs_py
1001
1299
            self.assertIs(unique_lcs_py,
1002
 
                          bzrlib.patiencediff.unique_lcs)
 
1300
                          patiencediff.unique_lcs)
1003
1301
 
1004
1302
    def test_recurse_matches(self):
1005
 
        if CompiledPatienceDiffFeature.available():
 
1303
        if compiled_patiencediff_feature.available():
1006
1304
            from bzrlib._patiencediff_c import recurse_matches_c
1007
1305
            self.assertIs(recurse_matches_c,
1008
 
                          bzrlib.patiencediff.recurse_matches)
 
1306
                          patiencediff.recurse_matches)
1009
1307
        else:
1010
1308
            from bzrlib._patiencediff_py import recurse_matches_py
1011
1309
            self.assertIs(recurse_matches_py,
1012
 
                          bzrlib.patiencediff.recurse_matches)
 
1310
                          patiencediff.recurse_matches)
 
1311
 
 
1312
 
 
1313
class TestDiffFromTool(tests.TestCaseWithTransport):
 
1314
 
 
1315
    def test_from_string(self):
 
1316
        diff_obj = diff.DiffFromTool.from_string('diff', None, None, None)
 
1317
        self.addCleanup(diff_obj.finish)
 
1318
        self.assertEqual(['diff', '@old_path', '@new_path'],
 
1319
            diff_obj.command_template)
 
1320
 
 
1321
    def test_from_string_u5(self):
 
1322
        diff_obj = diff.DiffFromTool.from_string('diff "-u 5"',
 
1323
                                                 None, None, None)
 
1324
        self.addCleanup(diff_obj.finish)
 
1325
        self.assertEqual(['diff', '-u 5', '@old_path', '@new_path'],
 
1326
                         diff_obj.command_template)
 
1327
        self.assertEqual(['diff', '-u 5', 'old-path', 'new-path'],
 
1328
                         diff_obj._get_command('old-path', 'new-path'))
 
1329
 
 
1330
    def test_from_string_path_with_backslashes(self):
 
1331
        self.requireFeature(features.backslashdir_feature)
 
1332
        tool = 'C:\\Tools\\Diff.exe'
 
1333
        diff_obj = diff.DiffFromTool.from_string(tool, None, None, None)
 
1334
        self.addCleanup(diff_obj.finish)
 
1335
        self.assertEqual(['C:\\Tools\\Diff.exe', '@old_path', '@new_path'],
 
1336
                         diff_obj.command_template)
 
1337
        self.assertEqual(['C:\\Tools\\Diff.exe', 'old-path', 'new-path'],
 
1338
                         diff_obj._get_command('old-path', 'new-path'))
 
1339
 
 
1340
    def test_execute(self):
 
1341
        output = StringIO()
 
1342
        diff_obj = diff.DiffFromTool(['python', '-c',
 
1343
                                      'print "@old_path @new_path"'],
 
1344
                                     None, None, output)
 
1345
        self.addCleanup(diff_obj.finish)
 
1346
        diff_obj._execute('old', 'new')
 
1347
        self.assertEqual(output.getvalue().rstrip(), 'old new')
 
1348
 
 
1349
    def test_excute_missing(self):
 
1350
        diff_obj = diff.DiffFromTool(['a-tool-which-is-unlikely-to-exist'],
 
1351
                                     None, None, None)
 
1352
        self.addCleanup(diff_obj.finish)
 
1353
        e = self.assertRaises(errors.ExecutableMissing, diff_obj._execute,
 
1354
                              'old', 'new')
 
1355
        self.assertEqual('a-tool-which-is-unlikely-to-exist could not be found'
 
1356
                         ' on this machine', str(e))
 
1357
 
 
1358
    def test_prepare_files_creates_paths_readable_by_windows_tool(self):
 
1359
        self.requireFeature(AttribFeature)
 
1360
        output = StringIO()
 
1361
        tree = self.make_branch_and_tree('tree')
 
1362
        self.build_tree_contents([('tree/file', 'content')])
 
1363
        tree.add('file', 'file-id')
 
1364
        tree.commit('old tree')
 
1365
        tree.lock_read()
 
1366
        self.addCleanup(tree.unlock)
 
1367
        basis_tree = tree.basis_tree()
 
1368
        basis_tree.lock_read()
 
1369
        self.addCleanup(basis_tree.unlock)
 
1370
        diff_obj = diff.DiffFromTool(['python', '-c',
 
1371
                                      'print "@old_path @new_path"'],
 
1372
                                     basis_tree, tree, output)
 
1373
        diff_obj._prepare_files('file-id', 'file', 'file')
 
1374
        # The old content should be readonly
 
1375
        self.assertReadableByAttrib(diff_obj._root, 'old\\file',
 
1376
                                    r'R.*old\\file$')
 
1377
        # The new content should use the tree object, not a 'new' file anymore
 
1378
        self.assertEndsWith(tree.basedir, 'work/tree')
 
1379
        self.assertReadableByAttrib(tree.basedir, 'file', r'work\\tree\\file$')
 
1380
 
 
1381
    def assertReadableByAttrib(self, cwd, relpath, regex):
 
1382
        proc = subprocess.Popen(['attrib', relpath],
 
1383
                                stdout=subprocess.PIPE,
 
1384
                                cwd=cwd)
 
1385
        (result, err) = proc.communicate()
 
1386
        self.assertContainsRe(result.replace('\r\n', '\n'), regex)
 
1387
 
 
1388
    def test_prepare_files(self):
 
1389
        output = StringIO()
 
1390
        tree = self.make_branch_and_tree('tree')
 
1391
        self.build_tree_contents([('tree/oldname', 'oldcontent')])
 
1392
        self.build_tree_contents([('tree/oldname2', 'oldcontent2')])
 
1393
        tree.add('oldname', 'file-id')
 
1394
        tree.add('oldname2', 'file2-id')
 
1395
        # Earliest allowable date on FAT32 filesystems is 1980-01-01
 
1396
        tree.commit('old tree', timestamp=315532800)
 
1397
        tree.rename_one('oldname', 'newname')
 
1398
        tree.rename_one('oldname2', 'newname2')
 
1399
        self.build_tree_contents([('tree/newname', 'newcontent')])
 
1400
        self.build_tree_contents([('tree/newname2', 'newcontent2')])
 
1401
        old_tree = tree.basis_tree()
 
1402
        old_tree.lock_read()
 
1403
        self.addCleanup(old_tree.unlock)
 
1404
        tree.lock_read()
 
1405
        self.addCleanup(tree.unlock)
 
1406
        diff_obj = diff.DiffFromTool(['python', '-c',
 
1407
                                      'print "@old_path @new_path"'],
 
1408
                                     old_tree, tree, output)
 
1409
        self.addCleanup(diff_obj.finish)
 
1410
        self.assertContainsRe(diff_obj._root, 'bzr-diff-[^/]*')
 
1411
        old_path, new_path = diff_obj._prepare_files('file-id', 'oldname',
 
1412
                                                     'newname')
 
1413
        self.assertContainsRe(old_path, 'old/oldname$')
 
1414
        self.assertEqual(315532800, os.stat(old_path).st_mtime)
 
1415
        self.assertContainsRe(new_path, 'tree/newname$')
 
1416
        self.assertFileEqual('oldcontent', old_path)
 
1417
        self.assertFileEqual('newcontent', new_path)
 
1418
        if osutils.host_os_dereferences_symlinks():
 
1419
            self.assertTrue(os.path.samefile('tree/newname', new_path))
 
1420
        # make sure we can create files with the same parent directories
 
1421
        diff_obj._prepare_files('file2-id', 'oldname2', 'newname2')
 
1422
 
 
1423
 
 
1424
class TestGetTreesAndBranchesToDiffLocked(tests.TestCaseWithTransport):
 
1425
 
 
1426
    def call_gtabtd(self, path_list, revision_specs, old_url, new_url):
 
1427
        """Call get_trees_and_branches_to_diff_locked.  Overridden by
 
1428
        TestGetTreesAndBranchesToDiff.
 
1429
        """
 
1430
        return diff.get_trees_and_branches_to_diff_locked(
 
1431
            path_list, revision_specs, old_url, new_url, self.addCleanup)
 
1432
 
 
1433
    def test_basic(self):
 
1434
        tree = self.make_branch_and_tree('tree')
 
1435
        (old_tree, new_tree,
 
1436
         old_branch, new_branch,
 
1437
         specific_files, extra_trees) = self.call_gtabtd(
 
1438
             ['tree'], None, None, None)
 
1439
 
 
1440
        self.assertIsInstance(old_tree, revisiontree.RevisionTree)
 
1441
        self.assertEqual(_mod_revision.NULL_REVISION,
 
1442
                         old_tree.get_revision_id())
 
1443
        self.assertEqual(tree.basedir, new_tree.basedir)
 
1444
        self.assertEqual(tree.branch.base, old_branch.base)
 
1445
        self.assertEqual(tree.branch.base, new_branch.base)
 
1446
        self.assertIs(None, specific_files)
 
1447
        self.assertIs(None, extra_trees)
 
1448
 
 
1449
    def test_with_rev_specs(self):
 
1450
        tree = self.make_branch_and_tree('tree')
 
1451
        self.build_tree_contents([('tree/file', 'oldcontent')])
 
1452
        tree.add('file', 'file-id')
 
1453
        tree.commit('old tree', timestamp=0, rev_id="old-id")
 
1454
        self.build_tree_contents([('tree/file', 'newcontent')])
 
1455
        tree.commit('new tree', timestamp=0, rev_id="new-id")
 
1456
 
 
1457
        revisions = [revisionspec.RevisionSpec.from_string('1'),
 
1458
                     revisionspec.RevisionSpec.from_string('2')]
 
1459
        (old_tree, new_tree,
 
1460
         old_branch, new_branch,
 
1461
         specific_files, extra_trees) = self.call_gtabtd(
 
1462
            ['tree'], revisions, None, None)
 
1463
 
 
1464
        self.assertIsInstance(old_tree, revisiontree.RevisionTree)
 
1465
        self.assertEqual("old-id", old_tree.get_revision_id())
 
1466
        self.assertIsInstance(new_tree, revisiontree.RevisionTree)
 
1467
        self.assertEqual("new-id", new_tree.get_revision_id())
 
1468
        self.assertEqual(tree.branch.base, old_branch.base)
 
1469
        self.assertEqual(tree.branch.base, new_branch.base)
 
1470
        self.assertIs(None, specific_files)
 
1471
        self.assertEqual(tree.basedir, extra_trees[0].basedir)
 
1472
 
 
1473
 
 
1474
class TestGetTreesAndBranchesToDiff(TestGetTreesAndBranchesToDiffLocked):
 
1475
    """Apply the tests for get_trees_and_branches_to_diff_locked to the
 
1476
    deprecated get_trees_and_branches_to_diff function.
 
1477
    """
 
1478
 
 
1479
    def call_gtabtd(self, path_list, revision_specs, old_url, new_url):
 
1480
        return self.applyDeprecated(
 
1481
            deprecated_in((2, 2, 0)), diff.get_trees_and_branches_to_diff,
 
1482
            path_list, revision_specs, old_url, new_url)