/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: Aaron Bentley
  • Date: 2007-12-29 22:05:47 UTC
  • mto: This revision was merged to the branch mainline in revision 3162.
  • Revision ID: aaron.bentley@utoronto.ca-20071229220547-fi8mxlg9fv9ivq68
do case-insensitive comparision of iexplore filename

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 import tests
 
24
from bzrlib.diff import (
 
25
    DiffFromTool,
 
26
    DiffPath,
 
27
    DiffSymlink,
 
28
    DiffTree,
 
29
    DiffText,
 
30
    external_diff,
 
31
    internal_diff,
 
32
    show_diff_trees,
34
33
    )
35
 
from bzrlib.symbol_versioning import deprecated_in
36
 
from bzrlib.tests import test_win32utils
37
 
 
38
 
 
39
 
class _AttribFeature(tests.Feature):
 
34
from bzrlib.errors import BinaryFile, NoDiff
 
35
import bzrlib.osutils as osutils
 
36
import bzrlib.patiencediff
 
37
import bzrlib._patiencediff_py
 
38
from bzrlib.tests import (Feature, TestCase, TestCaseWithTransport,
 
39
                          TestCaseInTempDir, TestSkipped)
 
40
 
 
41
 
 
42
class _CompiledPatienceDiffFeature(Feature):
40
43
 
41
44
    def _probe(self):
42
 
        if (sys.platform not in ('cygwin', 'win32')):
43
 
            return False
44
45
        try:
45
 
            proc = subprocess.Popen(['attrib', '.'], stdout=subprocess.PIPE)
46
 
        except OSError, e:
 
46
            import bzrlib._patiencediff_c
 
47
        except ImportError:
47
48
            return False
48
 
        return (0 == proc.wait())
 
49
        return True
49
50
 
50
51
    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
 
 
 
52
        return 'bzrlib._patiencediff_c'
 
53
 
 
54
CompiledPatienceDiffFeature = _CompiledPatienceDiffFeature()
 
55
 
 
56
 
 
57
class _UnicodeFilename(Feature):
 
58
    """Does the filesystem support Unicode filenames?"""
 
59
 
 
60
    def _probe(self):
 
61
        try:
 
62
            os.stat(u'\u03b1')
 
63
        except UnicodeEncodeError:
 
64
            return False
 
65
        except (IOError, OSError):
 
66
            # The filesystem allows the Unicode filename but the file doesn't
 
67
            # exist.
 
68
            return True
 
69
        else:
 
70
            # The filesystem allows the Unicode filename and the file exists,
 
71
            # for some reason.
 
72
            return True
 
73
 
 
74
UnicodeFilename = _UnicodeFilename()
 
75
 
 
76
 
 
77
class TestUnicodeFilename(TestCase):
 
78
 
 
79
    def test_probe_passes(self):
 
80
        """UnicodeFilename._probe passes."""
 
81
        # We can't test much more than that because the behaviour depends
 
82
        # on the platform.
 
83
        UnicodeFilename._probe()
 
84
        
59
85
 
60
86
def udiff_lines(old, new, allow_binary=False):
61
87
    output = StringIO()
62
 
    diff.internal_diff('old', old, 'new', new, output, allow_binary)
 
88
    internal_diff('old', old, 'new', new, output, allow_binary)
63
89
    output.seek(0, 0)
64
90
    return output.readlines()
65
91
 
69
95
        # StringIO has no fileno, so it tests a different codepath
70
96
        output = StringIO()
71
97
    else:
72
 
        output = tempfile.TemporaryFile()
 
98
        output = TemporaryFile()
73
99
    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')
 
100
        external_diff('old', old, 'new', new, output, diff_opts=['-u'])
 
101
    except NoDiff:
 
102
        raise TestSkipped('external "diff" not present to test')
77
103
    output.seek(0, 0)
78
104
    lines = output.readlines()
79
105
    output.close()
80
106
    return lines
81
107
 
82
108
 
83
 
class TestDiff(tests.TestCase):
 
109
class TestDiff(TestCase):
84
110
 
85
111
    def test_add_nl(self):
86
112
        """diff generates a valid diff for patches that add a newline"""
122
148
            ## "Unterminated hunk header for patch:\n%s" % "".join(lines)
123
149
 
124
150
    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)
 
151
        self.assertRaises(BinaryFile, udiff_lines, [1023 * 'a' + '\x00'], [])
 
152
        self.assertRaises(BinaryFile, udiff_lines, [], [1023 * 'a' + '\x00'])
 
153
        udiff_lines([1023 * 'a' + '\x00'], [], allow_binary=True)
 
154
        udiff_lines([], [1023 * 'a' + '\x00'], allow_binary=True)
131
155
 
132
156
    def test_external_diff(self):
133
157
        lines = external_udiff_lines(['boo\n'], ['goo\n'])
163
187
        orig_path = os.environ['PATH']
164
188
        try:
165
189
            os.environ['PATH'] = ''
166
 
            self.assertRaises(errors.NoDiff, diff.external_diff,
 
190
            self.assertRaises(NoDiff, external_diff,
167
191
                              'old', ['boo\n'], 'new', ['goo\n'],
168
192
                              StringIO(), diff_opts=['-u'])
169
193
        finally:
170
194
            os.environ['PATH'] = orig_path
171
 
 
 
195
        
172
196
    def test_internal_diff_default(self):
173
197
        # Default internal diff encoding is utf8
174
198
        output = StringIO()
175
 
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
176
 
                           u'new_\xe5', ['new_text\n'], output)
 
199
        internal_diff(u'old_\xb5', ['old_text\n'],
 
200
                    u'new_\xe5', ['new_text\n'], output)
177
201
        lines = output.getvalue().splitlines(True)
178
202
        self.check_patch(lines)
179
203
        self.assertEquals(['--- old_\xc2\xb5\n',
187
211
 
188
212
    def test_internal_diff_utf8(self):
189
213
        output = StringIO()
190
 
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
191
 
                           u'new_\xe5', ['new_text\n'], output,
192
 
                           path_encoding='utf8')
 
214
        internal_diff(u'old_\xb5', ['old_text\n'],
 
215
                    u'new_\xe5', ['new_text\n'], output,
 
216
                    path_encoding='utf8')
193
217
        lines = output.getvalue().splitlines(True)
194
218
        self.check_patch(lines)
195
219
        self.assertEquals(['--- old_\xc2\xb5\n',
203
227
 
204
228
    def test_internal_diff_iso_8859_1(self):
205
229
        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')
 
230
        internal_diff(u'old_\xb5', ['old_text\n'],
 
231
                    u'new_\xe5', ['new_text\n'], output,
 
232
                    path_encoding='iso-8859-1')
209
233
        lines = output.getvalue().splitlines(True)
210
234
        self.check_patch(lines)
211
235
        self.assertEquals(['--- old_\xb5\n',
219
243
 
220
244
    def test_internal_diff_no_content(self):
221
245
        output = StringIO()
222
 
        diff.internal_diff(u'old', [], u'new', [], output)
 
246
        internal_diff(u'old', [], u'new', [], output)
223
247
        self.assertEqual('', output.getvalue())
224
248
 
225
249
    def test_internal_diff_no_changes(self):
226
250
        output = StringIO()
227
 
        diff.internal_diff(u'old', ['text\n', 'contents\n'],
228
 
                           u'new', ['text\n', 'contents\n'],
229
 
                           output)
 
251
        internal_diff(u'old', ['text\n', 'contents\n'],
 
252
                      u'new', ['text\n', 'contents\n'],
 
253
                      output)
230
254
        self.assertEqual('', output.getvalue())
231
255
 
232
256
    def test_internal_diff_returns_bytes(self):
233
257
        import StringIO
234
258
        output = StringIO.StringIO()
235
 
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
236
 
                            u'new_\xe5', ['new_text\n'], output)
 
259
        internal_diff(u'old_\xb5', ['old_text\n'],
 
260
                    u'new_\xe5', ['new_text\n'], output)
237
261
        self.failUnless(isinstance(output.getvalue(), str),
238
262
            'internal_diff should return bytestrings')
239
263
 
240
264
 
241
 
class TestDiffFiles(tests.TestCaseInTempDir):
 
265
class TestDiffFiles(TestCaseInTempDir):
242
266
 
243
267
    def test_external_diff_binary(self):
244
268
        """The output when using external diff should use diff's i18n error"""
257
281
        self.assertEqual(out.splitlines(True) + ['\n'], lines)
258
282
 
259
283
 
260
 
class TestShowDiffTreesHelper(tests.TestCaseWithTransport):
 
284
class TestShowDiffTreesHelper(TestCaseWithTransport):
261
285
    """Has a helper for running show_diff_trees"""
262
286
 
263
287
    def get_diff(self, tree1, tree2, specific_files=None, working_tree=None):
266
290
            extra_trees = (working_tree,)
267
291
        else:
268
292
            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/')
 
293
        show_diff_trees(tree1, tree2, output, specific_files=specific_files,
 
294
                        extra_trees=extra_trees, old_label='old/',
 
295
                        new_label='new/')
273
296
        return output.getvalue()
274
297
 
275
298
 
340
363
+file2 contents at rev 3
341
364
 
342
365
''')
343
 
 
 
366
        
344
367
    def test_diff_add_files(self):
345
 
        tree1 = self.b.repository.revision_tree(_mod_revision.NULL_REVISION)
 
368
        tree1 = self.b.repository.revision_tree(None)
346
369
        tree2 = self.b.repository.revision_tree('rev-1')
347
370
        output = self.get_diff(tree1, tree2)
348
371
        # the files have the epoch time stamp for the tree in which
382
405
        self.wt.rename_one('file1', 'file1b')
383
406
        old_tree = self.b.repository.revision_tree('rev-1')
384
407
        new_tree = self.b.repository.revision_tree('rev-4')
385
 
        out = self.get_diff(old_tree, new_tree, specific_files=['file1b'],
 
408
        out = self.get_diff(old_tree, new_tree, specific_files=['file1b'], 
386
409
                            working_tree=self.wt)
387
410
        self.assertContainsRe(out, 'file1\t')
388
411
 
394
417
        self.wt.rename_one('file1', 'dir1/file1')
395
418
        old_tree = self.b.repository.revision_tree('rev-1')
396
419
        new_tree = self.b.repository.revision_tree('rev-4')
397
 
        out = self.get_diff(old_tree, new_tree, specific_files=['dir1'],
 
420
        out = self.get_diff(old_tree, new_tree, specific_files=['dir1'], 
398
421
                            working_tree=self.wt)
399
422
        self.assertContainsRe(out, 'file1\t')
400
 
        out = self.get_diff(old_tree, new_tree, specific_files=['dir2'],
 
423
        out = self.get_diff(old_tree, new_tree, specific_files=['dir2'], 
401
424
                            working_tree=self.wt)
402
425
        self.assertNotContainsRe(out, 'file1\t')
403
426
 
414
437
        tree.commit('one', rev_id='rev-1')
415
438
 
416
439
        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')
 
440
        diff = self.get_diff(tree.basis_tree(), tree)
 
441
        self.assertContainsRe(diff, "=== modified file 'file'\n")
 
442
        self.assertContainsRe(diff, '--- old/file\t')
 
443
        self.assertContainsRe(diff, '\\+\\+\\+ new/file\t')
 
444
        self.assertContainsRe(diff, '-contents\n'
 
445
                                    '\\+new contents\n')
423
446
 
424
447
    def test_modified_file_in_renamed_dir(self):
425
448
        """Test when a file is modified in a renamed directory."""
431
454
 
432
455
        tree.rename_one('dir', 'other')
433
456
        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")
 
457
        diff = self.get_diff(tree.basis_tree(), tree)
 
458
        self.assertContainsRe(diff, "=== renamed directory 'dir' => 'other'\n")
 
459
        self.assertContainsRe(diff, "=== modified file 'other/file'\n")
437
460
        # XXX: This is technically incorrect, because it used to be at another
438
461
        # 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')
 
462
        self.assertContainsRe(diff, '--- old/dir/file\t')
 
463
        self.assertContainsRe(diff, '\\+\\+\\+ new/other/file\t')
 
464
        self.assertContainsRe(diff, '-contents\n'
 
465
                                    '\\+new contents\n')
443
466
 
444
467
    def test_renamed_directory(self):
445
468
        """Test when only a directory is only renamed."""
450
473
        tree.commit('one', rev_id='rev-1')
451
474
 
452
475
        tree.rename_one('dir', 'newdir')
453
 
        d = self.get_diff(tree.basis_tree(), tree)
 
476
        diff = self.get_diff(tree.basis_tree(), tree)
454
477
        # Renaming a directory should be a single "you renamed this dir" even
455
478
        # when there are files inside.
456
 
        self.assertEqual(d, "=== renamed directory 'dir' => 'newdir'\n")
 
479
        self.assertEqual("=== renamed directory 'dir' => 'newdir'\n", diff)
457
480
 
458
481
    def test_renamed_file(self):
459
482
        """Test when a file is only renamed."""
463
486
        tree.commit('one', rev_id='rev-1')
464
487
 
465
488
        tree.rename_one('file', 'newname')
466
 
        d = self.get_diff(tree.basis_tree(), tree)
467
 
        self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
 
489
        diff = self.get_diff(tree.basis_tree(), tree)
 
490
        self.assertContainsRe(diff, "=== renamed file 'file' => 'newname'\n")
468
491
        # We shouldn't have a --- or +++ line, because there is no content
469
492
        # change
470
 
        self.assertNotContainsRe(d, '---')
 
493
        self.assertNotContainsRe(diff, '---')
471
494
 
472
495
    def test_renamed_and_modified_file(self):
473
496
        """Test when a file is only renamed."""
478
501
 
479
502
        tree.rename_one('file', 'newname')
480
503
        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
 
 
 
504
        diff = self.get_diff(tree.basis_tree(), tree)
 
505
        self.assertContainsRe(diff, "=== renamed file 'file' => 'newname'\n")
 
506
        self.assertContainsRe(diff, '--- old/file\t')
 
507
        self.assertContainsRe(diff, '\\+\\+\\+ new/newname\t')
 
508
        self.assertContainsRe(diff, '-contents\n'
 
509
                                    '\\+new contents\n')
524
510
 
525
511
    def test_binary_unicode_filenames(self):
526
512
        """Test that contents of files are *not* encoded in UTF-8 when there
527
513
        is a binary file in the diff.
528
514
        """
529
515
        # See https://bugs.launchpad.net/bugs/110092.
530
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
516
        self.requireFeature(UnicodeFilename)
531
517
 
532
518
        # This bug isn't triggered with cStringIO.
533
519
        from StringIO import StringIO
541
527
        tree.add([alpha], ['file-id'])
542
528
        tree.add([omega], ['file-id-2'])
543
529
        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,))
 
530
        show_diff_trees(tree.basis_tree(), tree, diff_content)
 
531
        diff = diff_content.getvalue()
 
532
        self.assertContainsRe(diff, r"=== added file '%s'" % alpha_utf8)
 
533
        self.assertContainsRe(
 
534
            diff, "Binary files a/%s.*and b/%s.* differ\n" % (alpha_utf8, alpha_utf8))
 
535
        self.assertContainsRe(diff, r"=== added file '%s'" % omega_utf8)
 
536
        self.assertContainsRe(diff, r"--- a/%s" % (omega_utf8,))
 
537
        self.assertContainsRe(diff, r"\+\+\+ b/%s" % (omega_utf8,))
552
538
 
553
539
    def test_unicode_filename(self):
554
540
        """Test when the filename are unicode."""
555
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
541
        self.requireFeature(UnicodeFilename)
556
542
 
557
543
        alpha, omega = u'\u03b1', u'\u03c9'
558
544
        autf8, outf8 = alpha.encode('utf8'), omega.encode('utf8')
573
559
        tree.add(['add_'+alpha], ['file-id'])
574
560
        self.build_tree_contents([('tree/mod_'+alpha, 'contents_mod\n')])
575
561
 
576
 
        d = self.get_diff(tree.basis_tree(), tree)
577
 
        self.assertContainsRe(d,
 
562
        diff = self.get_diff(tree.basis_tree(), tree)
 
563
        self.assertContainsRe(diff,
578
564
                "=== 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):
 
565
        self.assertContainsRe(diff, "=== added file 'add_%s'"%autf8)
 
566
        self.assertContainsRe(diff, "=== modified file 'mod_%s'"%autf8)
 
567
        self.assertContainsRe(diff, "=== removed file 'del_%s'"%autf8)
 
568
 
 
569
 
 
570
class DiffWasIs(DiffPath):
585
571
 
586
572
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
587
573
        self.to_file.write('was: ')
591
577
        pass
592
578
 
593
579
 
594
 
class TestDiffTree(tests.TestCaseWithTransport):
 
580
class TestDiffTree(TestCaseWithTransport):
595
581
 
596
582
    def setUp(self):
597
 
        super(TestDiffTree, self).setUp()
 
583
        TestCaseWithTransport.setUp(self)
598
584
        self.old_tree = self.make_branch_and_tree('old-tree')
599
585
        self.old_tree.lock_write()
600
586
        self.addCleanup(self.old_tree.unlock)
601
587
        self.new_tree = self.make_branch_and_tree('new-tree')
602
588
        self.new_tree.lock_write()
603
589
        self.addCleanup(self.new_tree.unlock)
604
 
        self.differ = diff.DiffTree(self.old_tree, self.new_tree, StringIO())
 
590
        self.differ = DiffTree(self.old_tree, self.new_tree, StringIO())
605
591
 
606
592
    def test_diff_text(self):
607
593
        self.build_tree_contents([('old-tree/olddir/',),
612
598
                                  ('new-tree/newdir/newfile', 'new\n')])
613
599
        self.new_tree.add('newdir')
614
600
        self.new_tree.add('newdir/newfile', 'file-id')
615
 
        differ = diff.DiffText(self.old_tree, self.new_tree, StringIO())
 
601
        differ = DiffText(self.old_tree, self.new_tree, StringIO())
616
602
        differ.diff_text('file-id', None, 'old label', 'new label')
617
603
        self.assertEqual(
618
604
            '--- old label\n+++ new label\n@@ -1,1 +0,0 @@\n-old\n\n',
647
633
        self.assertContainsRe(self.differ.to_file.getvalue(), '\+contents')
648
634
 
649
635
    def test_diff_symlink(self):
650
 
        differ = diff.DiffSymlink(self.old_tree, self.new_tree, StringIO())
 
636
        differ = DiffSymlink(self.old_tree, self.new_tree, StringIO())
651
637
        differ.diff_symlink('old target', None)
652
638
        self.assertEqual("=== target was 'old target'\n",
653
639
                         differ.to_file.getvalue())
654
640
 
655
 
        differ = diff.DiffSymlink(self.old_tree, self.new_tree, StringIO())
 
641
        differ = DiffSymlink(self.old_tree, self.new_tree, StringIO())
656
642
        differ.diff_symlink(None, 'new target')
657
643
        self.assertEqual("=== target is 'new target'\n",
658
644
                         differ.to_file.getvalue())
659
645
 
660
 
        differ = diff.DiffSymlink(self.old_tree, self.new_tree, StringIO())
 
646
        differ = DiffSymlink(self.old_tree, self.new_tree, StringIO())
661
647
        differ.diff_symlink('old target', 'new target')
662
648
        self.assertEqual("=== target changed 'old target' => 'new target'\n",
663
649
                         differ.to_file.getvalue())
693
679
            r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+0,0'
694
680
             ' \@\@\n-old\n\n')
695
681
        self.assertContainsRe(self.differ.to_file.getvalue(),
696
 
                              "=== target is u'new'\n")
 
682
                              "=== target is 'new'\n")
697
683
 
698
684
    def test_diff_directory(self):
699
685
        self.build_tree(['new-tree/new-dir/'])
713
699
 
714
700
    def test_register_diff(self):
715
701
        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)
 
702
        old_diff_factories = DiffTree.diff_factories
 
703
        DiffTree.diff_factories=old_diff_factories[:]
 
704
        DiffTree.diff_factories.insert(0, DiffWasIs.from_diff_tree)
719
705
        try:
720
 
            differ = diff.DiffTree(self.old_tree, self.new_tree, StringIO())
 
706
            differ = DiffTree(self.old_tree, self.new_tree, StringIO())
721
707
        finally:
722
 
            diff.DiffTree.diff_factories = old_diff_factories
 
708
            DiffTree.diff_factories = old_diff_factories
723
709
        differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile')
724
710
        self.assertNotContainsRe(
725
711
            differ.to_file.getvalue(),
730
716
 
731
717
    def test_extra_factories(self):
732
718
        self.create_old_new()
733
 
        differ = diff.DiffTree(self.old_tree, self.new_tree, StringIO(),
734
 
                               extra_factories=[DiffWasIs.from_diff_tree])
 
719
        differ = DiffTree(self.old_tree, self.new_tree, StringIO(),
 
720
                            extra_factories=[DiffWasIs.from_diff_tree])
735
721
        differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile')
736
722
        self.assertNotContainsRe(
737
723
            differ.to_file.getvalue(),
750
736
            '.*a-file(.|\n)*b-file')
751
737
 
752
738
 
753
 
class TestPatienceDiffLib(tests.TestCase):
 
739
class TestPatienceDiffLib(TestCase):
754
740
 
755
741
    def setUp(self):
756
742
        super(TestPatienceDiffLib, self).setUp()
757
 
        self._unique_lcs = _patiencediff_py.unique_lcs_py
758
 
        self._recurse_matches = _patiencediff_py.recurse_matches_py
 
743
        self._unique_lcs = bzrlib._patiencediff_py.unique_lcs_py
 
744
        self._recurse_matches = bzrlib._patiencediff_py.recurse_matches_py
759
745
        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))
 
746
            bzrlib._patiencediff_py.PatienceSequenceMatcher_py
768
747
 
769
748
    def test_unique_lcs(self):
770
749
        unique_lcs = self._unique_lcs
776
755
        self.assertEquals(unique_lcs('ab', 'ab'), [(0,0), (1,1)])
777
756
        self.assertEquals(unique_lcs('abcde', 'cdeab'), [(2,0), (3,1), (4,2)])
778
757
        self.assertEquals(unique_lcs('cdeab', 'abcde'), [(0,2), (1,3), (2,4)])
779
 
        self.assertEquals(unique_lcs('abXde', 'abYde'), [(0,0), (1,1),
 
758
        self.assertEquals(unique_lcs('abXde', 'abYde'), [(0,0), (1,1), 
780
759
                                                         (3,3), (4,4)])
781
760
        self.assertEquals(unique_lcs('acbac', 'abc'), [(2,1)])
782
761
 
797
776
        test_one('abcdbce', 'afbcgdbce', [(0,0), (1, 2), (2, 3), (3, 5),
798
777
                                          (4, 6), (5, 7), (6, 8)])
799
778
 
800
 
        # recurse_matches doesn't match non-unique
 
779
        # recurse_matches doesn't match non-unique 
801
780
        # lines surrounded by bogus text.
802
781
        # The update has been done in patiencediff.SequenceMatcher instead
803
782
 
940
919
                 ('delete', 1,2, 1,1),
941
920
                 ('equal',  2,3, 1,2),
942
921
                ])
943
 
        chk_ops('aBccDe', 'abccde',
 
922
        chk_ops('aBccDe', 'abccde', 
944
923
                [('equal',   0,1, 0,1),
945
924
                 ('replace', 1,5, 1,5),
946
925
                 ('equal',   5,6, 5,6),
947
926
                ])
948
 
        chk_ops('aBcDec', 'abcdec',
 
927
        chk_ops('aBcDec', 'abcdec', 
949
928
                [('equal',   0,1, 0,1),
950
929
                 ('replace', 1,2, 1,2),
951
930
                 ('equal',   2,3, 2,3),
952
931
                 ('replace', 3,4, 3,4),
953
932
                 ('equal',   4,6, 4,6),
954
933
                ])
955
 
        chk_ops('aBcdEcdFg', 'abcdecdfg',
 
934
        chk_ops('aBcdEcdFg', 'abcdecdfg', 
956
935
                [('equal',   0,1, 0,1),
957
936
                 ('replace', 1,8, 1,8),
958
937
                 ('equal',   8,9, 8,9)
959
938
                ])
960
 
        chk_ops('aBcdEeXcdFg', 'abcdecdfg',
 
939
        chk_ops('aBcdEeXcdFg', 'abcdecdfg', 
961
940
                [('equal',   0,1, 0,1),
962
941
                 ('replace', 1,2, 1,2),
963
942
                 ('equal',   2,4, 2,4),
1023
1002
    """
1024
1003
    gnxrf_netf = ['svyr*']
1025
1004
    gnxrf_bcgvbaf = ['ab-erphefr']
1026
 
 
 
1005
  
1027
1006
    qrs eha(frys, svyr_yvfg, ab_erphefr=Snyfr):
1028
1007
        sebz omeyvo.nqq vzcbeg fzneg_nqq, nqq_ercbegre_cevag, nqq_ercbegre_ahyy
1029
1008
        vs vf_dhvrg():
1037
1016
'''.splitlines(True), '''\
1038
1017
    trg nqqrq jura lbh nqq n svyr va gur qverpgbel.
1039
1018
 
1040
 
    --qel-eha jvyy fubj juvpu svyrf jbhyq or nqqrq, ohg abg npghnyyl
 
1019
    --qel-eha jvyy fubj juvpu svyrf jbhyq or nqqrq, ohg abg npghnyyl 
1041
1020
    nqq gurz.
1042
1021
    """
1043
1022
    gnxrf_netf = ['svyr*']
1070
1049
                 'how are you today?\n']
1071
1050
        txt_b = ['hello there\n',
1072
1051
                 'how are you today?\n']
1073
 
        unified_diff = patiencediff.unified_diff
 
1052
        unified_diff = bzrlib.patiencediff.unified_diff
1074
1053
        psm = self._PatienceSequenceMatcher
1075
 
        self.assertEquals(['--- \n',
1076
 
                           '+++ \n',
 
1054
        self.assertEquals([ '---  \n',
 
1055
                           '+++  \n',
1077
1056
                           '@@ -1,3 +1,2 @@\n',
1078
1057
                           ' hello there\n',
1079
1058
                           '-world\n',
1084
1063
        txt_a = map(lambda x: x+'\n', 'abcdefghijklmnop')
1085
1064
        txt_b = map(lambda x: x+'\n', 'abcdefxydefghijklmnop')
1086
1065
        # This is the result with LongestCommonSubstring matching
1087
 
        self.assertEquals(['--- \n',
1088
 
                           '+++ \n',
 
1066
        self.assertEquals(['---  \n',
 
1067
                           '+++  \n',
1089
1068
                           '@@ -1,6 +1,11 @@\n',
1090
1069
                           ' a\n',
1091
1070
                           ' b\n',
1100
1079
                           ' f\n']
1101
1080
                          , list(unified_diff(txt_a, txt_b)))
1102
1081
        # And the patience diff
1103
 
        self.assertEquals(['--- \n',
1104
 
                           '+++ \n',
 
1082
        self.assertEquals(['---  \n',
 
1083
                           '+++  \n',
1105
1084
                           '@@ -4,6 +4,11 @@\n',
1106
1085
                           ' d\n',
1107
1086
                           ' e\n',
1118
1097
                          , list(unified_diff(txt_a, txt_b,
1119
1098
                                 sequencematcher=psm)))
1120
1099
 
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
1100
 
1143
1101
class TestPatienceDiffLib_c(TestPatienceDiffLib):
1144
1102
 
1145
 
    _test_needs_features = [compiled_patiencediff_feature]
 
1103
    _test_needs_features = [CompiledPatienceDiffFeature]
1146
1104
 
1147
1105
    def setUp(self):
1148
1106
        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
 
1107
        import bzrlib._patiencediff_c
 
1108
        self._unique_lcs = bzrlib._patiencediff_c.unique_lcs_c
 
1109
        self._recurse_matches = bzrlib._patiencediff_c.recurse_matches_c
1152
1110
        self._PatienceSequenceMatcher = \
1153
 
            _patiencediff_c.PatienceSequenceMatcher_c
 
1111
            bzrlib._patiencediff_c.PatienceSequenceMatcher_c
1154
1112
 
1155
1113
    def test_unhashable(self):
1156
1114
        """We should get a proper exception here."""
1166
1124
                                         None, ['valid'], ['valid', []])
1167
1125
 
1168
1126
 
1169
 
class TestPatienceDiffLibFiles(tests.TestCaseInTempDir):
 
1127
class TestPatienceDiffLibFiles(TestCaseInTempDir):
1170
1128
 
1171
1129
    def setUp(self):
1172
1130
        super(TestPatienceDiffLibFiles, self).setUp()
1173
1131
        self._PatienceSequenceMatcher = \
1174
 
            _patiencediff_py.PatienceSequenceMatcher_py
 
1132
            bzrlib._patiencediff_py.PatienceSequenceMatcher_py
1175
1133
 
1176
1134
    def test_patience_unified_diff_files(self):
1177
1135
        txt_a = ['hello there\n',
1182
1140
        open('a1', 'wb').writelines(txt_a)
1183
1141
        open('b1', 'wb').writelines(txt_b)
1184
1142
 
1185
 
        unified_diff_files = patiencediff.unified_diff_files
 
1143
        unified_diff_files = bzrlib.patiencediff.unified_diff_files
1186
1144
        psm = self._PatienceSequenceMatcher
1187
 
        self.assertEquals(['--- a1\n',
1188
 
                           '+++ b1\n',
 
1145
        self.assertEquals(['--- a1 \n',
 
1146
                           '+++ b1 \n',
1189
1147
                           '@@ -1,3 +1,2 @@\n',
1190
1148
                           ' hello there\n',
1191
1149
                           '-world\n',
1200
1158
        open('b2', 'wb').writelines(txt_b)
1201
1159
 
1202
1160
        # This is the result with LongestCommonSubstring matching
1203
 
        self.assertEquals(['--- a2\n',
1204
 
                           '+++ b2\n',
 
1161
        self.assertEquals(['--- a2 \n',
 
1162
                           '+++ b2 \n',
1205
1163
                           '@@ -1,6 +1,11 @@\n',
1206
1164
                           ' a\n',
1207
1165
                           ' b\n',
1217
1175
                          , list(unified_diff_files('a2', 'b2')))
1218
1176
 
1219
1177
        # And the patience diff
1220
 
        self.assertEquals(['--- a2\n',
1221
 
                           '+++ b2\n',
 
1178
        self.assertEquals(['--- a2 \n',
 
1179
                           '+++ b2 \n',
1222
1180
                           '@@ -4,6 +4,11 @@\n',
1223
1181
                           ' d\n',
1224
1182
                           ' e\n',
1238
1196
 
1239
1197
class TestPatienceDiffLibFiles_c(TestPatienceDiffLibFiles):
1240
1198
 
1241
 
    _test_needs_features = [compiled_patiencediff_feature]
 
1199
    _test_needs_features = [CompiledPatienceDiffFeature]
1242
1200
 
1243
1201
    def setUp(self):
1244
1202
        super(TestPatienceDiffLibFiles_c, self).setUp()
1245
 
        from bzrlib import _patiencediff_c
 
1203
        import bzrlib._patiencediff_c
1246
1204
        self._PatienceSequenceMatcher = \
1247
 
            _patiencediff_c.PatienceSequenceMatcher_c
1248
 
 
1249
 
 
1250
 
class TestUsingCompiledIfAvailable(tests.TestCase):
 
1205
            bzrlib._patiencediff_c.PatienceSequenceMatcher_c
 
1206
 
 
1207
 
 
1208
class TestUsingCompiledIfAvailable(TestCase):
1251
1209
 
1252
1210
    def test_PatienceSequenceMatcher(self):
1253
 
        if compiled_patiencediff_feature.available():
 
1211
        if CompiledPatienceDiffFeature.available():
1254
1212
            from bzrlib._patiencediff_c import PatienceSequenceMatcher_c
1255
1213
            self.assertIs(PatienceSequenceMatcher_c,
1256
 
                          patiencediff.PatienceSequenceMatcher)
 
1214
                          bzrlib.patiencediff.PatienceSequenceMatcher)
1257
1215
        else:
1258
1216
            from bzrlib._patiencediff_py import PatienceSequenceMatcher_py
1259
1217
            self.assertIs(PatienceSequenceMatcher_py,
1260
 
                          patiencediff.PatienceSequenceMatcher)
 
1218
                          bzrlib.patiencediff.PatienceSequenceMatcher)
1261
1219
 
1262
1220
    def test_unique_lcs(self):
1263
 
        if compiled_patiencediff_feature.available():
 
1221
        if CompiledPatienceDiffFeature.available():
1264
1222
            from bzrlib._patiencediff_c import unique_lcs_c
1265
1223
            self.assertIs(unique_lcs_c,
1266
 
                          patiencediff.unique_lcs)
 
1224
                          bzrlib.patiencediff.unique_lcs)
1267
1225
        else:
1268
1226
            from bzrlib._patiencediff_py import unique_lcs_py
1269
1227
            self.assertIs(unique_lcs_py,
1270
 
                          patiencediff.unique_lcs)
 
1228
                          bzrlib.patiencediff.unique_lcs)
1271
1229
 
1272
1230
    def test_recurse_matches(self):
1273
 
        if compiled_patiencediff_feature.available():
 
1231
        if CompiledPatienceDiffFeature.available():
1274
1232
            from bzrlib._patiencediff_c import recurse_matches_c
1275
1233
            self.assertIs(recurse_matches_c,
1276
 
                          patiencediff.recurse_matches)
 
1234
                          bzrlib.patiencediff.recurse_matches)
1277
1235
        else:
1278
1236
            from bzrlib._patiencediff_py import recurse_matches_py
1279
1237
            self.assertIs(recurse_matches_py,
1280
 
                          patiencediff.recurse_matches)
1281
 
 
1282
 
 
1283
 
class TestDiffFromTool(tests.TestCaseWithTransport):
 
1238
                          bzrlib.patiencediff.recurse_matches)
 
1239
 
 
1240
 
 
1241
class TestDiffFromTool(TestCaseWithTransport):
1284
1242
 
1285
1243
    def test_from_string(self):
1286
 
        diff_obj = diff.DiffFromTool.from_string('diff', None, None, None)
 
1244
        diff_obj = DiffFromTool.from_string('diff', None, None, None)
1287
1245
        self.addCleanup(diff_obj.finish)
1288
 
        self.assertEqual(['diff', '@old_path', '@new_path'],
 
1246
        self.assertEqual(['diff', '%(old_path)s', '%(new_path)s'],
1289
1247
            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'],
 
1248
        diff_obj = DiffFromTool.from_string('diff -u\\ 5', None, None, None)
 
1249
        self.assertEqual(['diff', '-u 5', '%(old_path)s', '%(new_path)s'],
1296
1250
                         diff_obj.command_template)
1297
1251
        self.assertEqual(['diff', '-u 5', 'old-path', 'new-path'],
1298
1252
                         diff_obj._get_command('old-path', 'new-path'))
1299
1253
 
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
1254
    def test_execute(self):
1311
1255
        output = StringIO()
1312
 
        diff_obj = diff.DiffFromTool(['python', '-c',
1313
 
                                      'print "@old_path @new_path"'],
1314
 
                                     None, None, output)
 
1256
        diff_obj = DiffFromTool(['python', '-c',
 
1257
                                 'print "%(old_path)s %(new_path)s"'],
 
1258
                                None, None, output)
1315
1259
        self.addCleanup(diff_obj.finish)
1316
1260
        diff_obj._execute('old', 'new')
1317
1261
        self.assertEqual(output.getvalue().rstrip(), 'old new')
1318
1262
 
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)
 
1263
    def test_prepare_files(self):
1330
1264
        output = StringIO()
1331
1265
        tree = self.make_branch_and_tree('tree')
1332
 
        self.build_tree_contents([('tree/file', 'content')])
 
1266
        self.build_tree_contents([('tree/file', 'oldcontent')])
1333
1267
        tree.add('file', 'file-id')
1334
1268
        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')])
 
1269
        self.build_tree_contents([('tree/file', 'newcontent')])
1371
1270
        old_tree = tree.basis_tree()
1372
1271
        old_tree.lock_read()
1373
1272
        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)
 
1273
        diff_obj = DiffFromTool(['python', '-c',
 
1274
                                 'print "%(old_path)s %(new_path)s"'],
 
1275
                                old_tree, tree, output)
1379
1276
        self.addCleanup(diff_obj.finish)
1380
1277
        self.assertContainsRe(diff_obj._root, 'bzr-diff-[^/]*')
1381
1278
        old_path, new_path = diff_obj._prepare_files('file-id', 'oldname',
1382
1279
                                                     'newname')
1383
1280
        self.assertContainsRe(old_path, 'old/oldname$')
1384
 
        self.assertEqual(315532800, os.stat(old_path).st_mtime)
1385
 
        self.assertContainsRe(new_path, 'tree/newname$')
 
1281
        self.assertContainsRe(new_path, 'new/newname$')
1386
1282
        self.assertFileEqual('oldcontent', old_path)
1387
1283
        self.assertFileEqual('newcontent', new_path)
1388
 
        if osutils.host_os_dereferences_symlinks():
1389
 
            self.assertTrue(os.path.samefile('tree/newname', new_path))
1390
1284
        # 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
 
 
 
1285
        diff_obj._prepare_files('file-id', 'oldname2', 'newname2')