← 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: Alexander Belchenko
  • Date: 2008-02-07 07:53:19 UTC
  • mto: This revision was merged to the branch mainline in revision 3231.
  • Revision ID: bialix@ukr.net-20080207075319-d9jj7as8i5ztiff7
some cleanup in package_mf.py; mention about load_from_zip() deprecation in NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
1
 
# Copyright (C) 2005-2012, 2014, 2016 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
import os.path
18
19
from cStringIO import StringIO
 
20
import errno
19
21
import subprocess
20
 
import tempfile
 
22
from tempfile import TemporaryFile
21
23
 
22
 
from bzrlib import (
23
 
    diff,
24
 
    errors,
25
 
    osutils,
26
 
    patiencediff,
27
 
    _patiencediff_py,
28
 
    revision as _mod_revision,
29
 
    revisionspec,
30
 
    revisiontree,
31
 
    tests,
32
 
    transform,
 
24
from bzrlib import tests
 
25
from bzrlib.diff import (
 
26
    DiffFromTool,
 
27
    DiffPath,
 
28
    DiffSymlink,
 
29
    DiffTree,
 
30
    DiffText,
 
31
    external_diff,
 
32
    internal_diff,
 
33
    show_diff_trees,
33
34
    )
34
 
from bzrlib.tests import (
35
 
    features,
36
 
    EncodingAdapter,
37
 
)
38
 
from bzrlib.tests.blackbox.test_diff import subst_dates
39
 
from bzrlib.tests.scenarios import load_tests_apply_scenarios
40
 
 
41
 
 
42
 
load_tests = load_tests_apply_scenarios
43
 
 
 
35
from bzrlib.errors import BinaryFile, NoDiff, ExecutableMissing
 
36
import bzrlib.osutils as osutils
 
37
import bzrlib.patiencediff
 
38
import bzrlib._patiencediff_py
 
39
from bzrlib.tests import (Feature, TestCase, TestCaseWithTransport,
 
40
                          TestCaseInTempDir, TestSkipped)
 
41
 
 
42
 
 
43
class _CompiledPatienceDiffFeature(Feature):
 
44
 
 
45
    def _probe(self):
 
46
        try:
 
47
            import bzrlib._patiencediff_c
 
48
        except ImportError:
 
49
            return False
 
50
        return True
 
51
 
 
52
    def feature_name(self):
 
53
        return 'bzrlib._patiencediff_c'
 
54
 
 
55
CompiledPatienceDiffFeature = _CompiledPatienceDiffFeature()
 
56
 
 
57
 
 
58
class _UnicodeFilename(Feature):
 
59
    """Does the filesystem support Unicode filenames?"""
 
60
 
 
61
    def _probe(self):
 
62
        try:
 
63
            os.stat(u'\u03b1')
 
64
        except UnicodeEncodeError:
 
65
            return False
 
66
        except (IOError, OSError):
 
67
            # The filesystem allows the Unicode filename but the file doesn't
 
68
            # exist.
 
69
            return True
 
70
        else:
 
71
            # The filesystem allows the Unicode filename and the file exists,
 
72
            # for some reason.
 
73
            return True
 
74
 
 
75
UnicodeFilename = _UnicodeFilename()
 
76
 
 
77
 
 
78
class TestUnicodeFilename(TestCase):
 
79
 
 
80
    def test_probe_passes(self):
 
81
        """UnicodeFilename._probe passes."""
 
82
        # We can't test much more than that because the behaviour depends
 
83
        # on the platform.
 
84
        UnicodeFilename._probe()
 
85
        
44
86
 
45
87
def udiff_lines(old, new, allow_binary=False):
46
88
    output = StringIO()
47
 
    diff.internal_diff('old', old, 'new', new, output, allow_binary)
 
89
    internal_diff('old', old, 'new', new, output, allow_binary)
48
90
    output.seek(0, 0)
49
91
    return output.readlines()
50
92
 
54
96
        # StringIO has no fileno, so it tests a different codepath
55
97
        output = StringIO()
56
98
    else:
57
 
        output = tempfile.TemporaryFile()
 
99
        output = TemporaryFile()
58
100
    try:
59
 
        diff.external_diff('old', old, 'new', new, output, diff_opts=['-u'])
60
 
    except errors.NoDiff:
61
 
        raise tests.TestSkipped('external "diff" not present to test')
 
101
        external_diff('old', old, 'new', new, output, diff_opts=['-u'])
 
102
    except NoDiff:
 
103
        raise TestSkipped('external "diff" not present to test')
62
104
    output.seek(0, 0)
63
105
    lines = output.readlines()
64
106
    output.close()
65
107
    return lines
66
108
 
67
109
 
68
 
class TestDiffOptions(tests.TestCase):
69
 
 
70
 
    def test_unified_added(self):
71
 
        """Check for default style '-u' only if no other style specified
72
 
        in 'diff-options'.
73
 
        """
74
 
        # Verify that style defaults to unified, id est '-u' appended
75
 
        # to option list, in the absence of an alternative style.
76
 
        self.assertEqual(['-a', '-u'], diff.default_style_unified(['-a']))
77
 
 
78
 
 
79
 
class TestDiffOptionsScenarios(tests.TestCase):
80
 
 
81
 
    scenarios = [(s, dict(style=s)) for s in diff.style_option_list]
82
 
    style = None # Set by load_tests_apply_scenarios from scenarios
83
 
 
84
 
    def test_unified_not_added(self):
85
 
        # Verify that for all valid style options, '-u' is not
86
 
        # appended to option list.
87
 
        ret_opts = diff.default_style_unified(diff_opts=["%s" % (self.style,)])
88
 
        self.assertEqual(["%s" % (self.style,)], ret_opts)
89
 
 
90
 
 
91
 
class TestDiff(tests.TestCase):
 
110
class TestDiff(TestCase):
92
111
 
93
112
    def test_add_nl(self):
94
113
        """diff generates a valid diff for patches that add a newline"""
95
114
        lines = udiff_lines(['boo'], ['boo\n'])
96
115
        self.check_patch(lines)
97
 
        self.assertEqual(lines[4], '\\ No newline at end of file\n')
 
116
        self.assertEquals(lines[4], '\\ No newline at end of file\n')
98
117
            ## "expected no-nl, got %r" % lines[4]
99
118
 
100
119
    def test_add_nl_2(self):
103
122
        """
104
123
        lines = udiff_lines(['boo'], ['goo\n'])
105
124
        self.check_patch(lines)
106
 
        self.assertEqual(lines[4], '\\ No newline at end of file\n')
 
125
        self.assertEquals(lines[4], '\\ No newline at end of file\n')
107
126
            ## "expected no-nl, got %r" % lines[4]
108
127
 
109
128
    def test_remove_nl(self):
112
131
        """
113
132
        lines = udiff_lines(['boo\n'], ['boo'])
114
133
        self.check_patch(lines)
115
 
        self.assertEqual(lines[5], '\\ No newline at end of file\n')
 
134
        self.assertEquals(lines[5], '\\ No newline at end of file\n')
116
135
            ## "expected no-nl, got %r" % lines[5]
117
136
 
118
137
    def check_patch(self, lines):
119
 
        self.assertTrue(len(lines) > 1)
 
138
        self.assert_(len(lines) > 1)
120
139
            ## "Not enough lines for a file header for patch:\n%s" % "".join(lines)
121
 
        self.assertTrue(lines[0].startswith ('---'))
 
140
        self.assert_(lines[0].startswith ('---'))
122
141
            ## 'No orig line for patch:\n%s' % "".join(lines)
123
 
        self.assertTrue(lines[1].startswith ('+++'))
 
142
        self.assert_(lines[1].startswith ('+++'))
124
143
            ## 'No mod line for patch:\n%s' % "".join(lines)
125
 
        self.assertTrue(len(lines) > 2)
 
144
        self.assert_(len(lines) > 2)
126
145
            ## "No hunks for patch:\n%s" % "".join(lines)
127
 
        self.assertTrue(lines[2].startswith('@@'))
 
146
        self.assert_(lines[2].startswith('@@'))
128
147
            ## "No hunk header for patch:\n%s" % "".join(lines)
129
 
        self.assertTrue('@@' in lines[2][2:])
 
148
        self.assert_('@@' in lines[2][2:])
130
149
            ## "Unterminated hunk header for patch:\n%s" % "".join(lines)
131
150
 
132
151
    def test_binary_lines(self):
133
 
        empty = []
134
 
        uni_lines = [1023 * 'a' + '\x00']
135
 
        self.assertRaises(errors.BinaryFile, udiff_lines, uni_lines , empty)
136
 
        self.assertRaises(errors.BinaryFile, udiff_lines, empty, uni_lines)
137
 
        udiff_lines(uni_lines , empty, allow_binary=True)
138
 
        udiff_lines(empty, uni_lines, allow_binary=True)
 
152
        self.assertRaises(BinaryFile, udiff_lines, [1023 * 'a' + '\x00'], [])
 
153
        self.assertRaises(BinaryFile, udiff_lines, [], [1023 * 'a' + '\x00'])
 
154
        udiff_lines([1023 * 'a' + '\x00'], [], allow_binary=True)
 
155
        udiff_lines([], [1023 * 'a' + '\x00'], allow_binary=True)
139
156
 
140
157
    def test_external_diff(self):
141
158
        lines = external_udiff_lines(['boo\n'], ['goo\n'])
151
168
        self.check_patch(lines)
152
169
 
153
170
    def test_external_diff_binary_lang_c(self):
 
171
        old_env = {}
154
172
        for lang in ('LANG', 'LC_ALL', 'LANGUAGE'):
155
 
            self.overrideEnv(lang, 'C')
156
 
        lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
157
 
        # Older versions of diffutils say "Binary files", newer
158
 
        # versions just say "Files".
159
 
        self.assertContainsRe(lines[0], '(Binary f|F)iles old and new differ\n')
160
 
        self.assertEqual(lines[1:], ['\n'])
 
173
            old_env[lang] = osutils.set_or_unset_env(lang, 'C')
 
174
        try:
 
175
            lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
 
176
            # Older versions of diffutils say "Binary files", newer
 
177
            # versions just say "Files".
 
178
            self.assertContainsRe(lines[0],
 
179
                                  '(Binary f|F)iles old and new differ\n')
 
180
            self.assertEquals(lines[1:], ['\n'])
 
181
        finally:
 
182
            for lang, old_val in old_env.iteritems():
 
183
                osutils.set_or_unset_env(lang, old_val)
161
184
 
162
185
    def test_no_external_diff(self):
163
186
        """Check that NoDiff is raised when diff is not available"""
164
 
        # Make sure no 'diff' command is available
165
 
        # XXX: Weird, using None instead of '' breaks the test -- vila 20101216
166
 
        self.overrideEnv('PATH', '')
167
 
        self.assertRaises(errors.NoDiff, diff.external_diff,
168
 
                          'old', ['boo\n'], 'new', ['goo\n'],
169
 
                          StringIO(), diff_opts=['-u'])
170
 
 
 
187
        # Use os.environ['PATH'] to make sure no 'diff' command is available
 
188
        orig_path = os.environ['PATH']
 
189
        try:
 
190
            os.environ['PATH'] = ''
 
191
            self.assertRaises(NoDiff, external_diff,
 
192
                              'old', ['boo\n'], 'new', ['goo\n'],
 
193
                              StringIO(), diff_opts=['-u'])
 
194
        finally:
 
195
            os.environ['PATH'] = orig_path
 
196
        
171
197
    def test_internal_diff_default(self):
172
198
        # Default internal diff encoding is utf8
173
199
        output = StringIO()
174
 
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
175
 
                           u'new_\xe5', ['new_text\n'], output)
 
200
        internal_diff(u'old_\xb5', ['old_text\n'],
 
201
                    u'new_\xe5', ['new_text\n'], output)
176
202
        lines = output.getvalue().splitlines(True)
177
203
        self.check_patch(lines)
178
 
        self.assertEqual(['--- old_\xc2\xb5\n',
 
204
        self.assertEquals(['--- old_\xc2\xb5\n',
179
205
                           '+++ new_\xc3\xa5\n',
180
206
                           '@@ -1,1 +1,1 @@\n',
181
207
                           '-old_text\n',
186
212
 
187
213
    def test_internal_diff_utf8(self):
188
214
        output = StringIO()
189
 
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
190
 
                           u'new_\xe5', ['new_text\n'], output,
191
 
                           path_encoding='utf8')
 
215
        internal_diff(u'old_\xb5', ['old_text\n'],
 
216
                    u'new_\xe5', ['new_text\n'], output,
 
217
                    path_encoding='utf8')
192
218
        lines = output.getvalue().splitlines(True)
193
219
        self.check_patch(lines)
194
 
        self.assertEqual(['--- old_\xc2\xb5\n',
 
220
        self.assertEquals(['--- old_\xc2\xb5\n',
195
221
                           '+++ new_\xc3\xa5\n',
196
222
                           '@@ -1,1 +1,1 @@\n',
197
223
                           '-old_text\n',
202
228
 
203
229
    def test_internal_diff_iso_8859_1(self):
204
230
        output = StringIO()
205
 
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
206
 
                           u'new_\xe5', ['new_text\n'], output,
207
 
                           path_encoding='iso-8859-1')
 
231
        internal_diff(u'old_\xb5', ['old_text\n'],
 
232
                    u'new_\xe5', ['new_text\n'], output,
 
233
                    path_encoding='iso-8859-1')
208
234
        lines = output.getvalue().splitlines(True)
209
235
        self.check_patch(lines)
210
 
        self.assertEqual(['--- old_\xb5\n',
 
236
        self.assertEquals(['--- old_\xb5\n',
211
237
                           '+++ new_\xe5\n',
212
238
                           '@@ -1,1 +1,1 @@\n',
213
239
                           '-old_text\n',
218
244
 
219
245
    def test_internal_diff_no_content(self):
220
246
        output = StringIO()
221
 
        diff.internal_diff(u'old', [], u'new', [], output)
 
247
        internal_diff(u'old', [], u'new', [], output)
222
248
        self.assertEqual('', output.getvalue())
223
249
 
224
250
    def test_internal_diff_no_changes(self):
225
251
        output = StringIO()
226
 
        diff.internal_diff(u'old', ['text\n', 'contents\n'],
227
 
                           u'new', ['text\n', 'contents\n'],
228
 
                           output)
 
252
        internal_diff(u'old', ['text\n', 'contents\n'],
 
253
                      u'new', ['text\n', 'contents\n'],
 
254
                      output)
229
255
        self.assertEqual('', output.getvalue())
230
256
 
231
257
    def test_internal_diff_returns_bytes(self):
232
258
        import StringIO
233
259
        output = StringIO.StringIO()
234
 
        diff.internal_diff(u'old_\xb5', ['old_text\n'],
235
 
                            u'new_\xe5', ['new_text\n'], output)
236
 
        self.assertIsInstance(output.getvalue(), str,
 
260
        internal_diff(u'old_\xb5', ['old_text\n'],
 
261
                    u'new_\xe5', ['new_text\n'], output)
 
262
        self.failUnless(isinstance(output.getvalue(), str),
237
263
            'internal_diff should return bytestrings')
238
264
 
239
 
    def test_internal_diff_default_context(self):
240
 
        output = StringIO()
241
 
        diff.internal_diff('old', ['same_text\n','same_text\n','same_text\n',
242
 
                           'same_text\n','same_text\n','old_text\n'],
243
 
                           'new', ['same_text\n','same_text\n','same_text\n',
244
 
                           'same_text\n','same_text\n','new_text\n'], output)
245
 
        lines = output.getvalue().splitlines(True)
246
 
        self.check_patch(lines)
247
 
        self.assertEqual(['--- old\n',
248
 
                           '+++ new\n',
249
 
                           '@@ -3,4 +3,4 @@\n',
250
 
                           ' same_text\n',
251
 
                           ' same_text\n',
252
 
                           ' same_text\n',
253
 
                           '-old_text\n',
254
 
                           '+new_text\n',
255
 
                           '\n',
256
 
                          ]
257
 
                          , lines)
258
 
 
259
 
    def test_internal_diff_no_context(self):
260
 
        output = StringIO()
261
 
        diff.internal_diff('old', ['same_text\n','same_text\n','same_text\n',
262
 
                           'same_text\n','same_text\n','old_text\n'],
263
 
                           'new', ['same_text\n','same_text\n','same_text\n',
264
 
                           'same_text\n','same_text\n','new_text\n'], output,
265
 
                           context_lines=0)
266
 
        lines = output.getvalue().splitlines(True)
267
 
        self.check_patch(lines)
268
 
        self.assertEqual(['--- old\n',
269
 
                           '+++ new\n',
270
 
                           '@@ -6,1 +6,1 @@\n',
271
 
                           '-old_text\n',
272
 
                           '+new_text\n',
273
 
                           '\n',
274
 
                          ]
275
 
                          , lines)
276
 
 
277
 
    def test_internal_diff_more_context(self):
278
 
        output = StringIO()
279
 
        diff.internal_diff('old', ['same_text\n','same_text\n','same_text\n',
280
 
                           'same_text\n','same_text\n','old_text\n'],
281
 
                           'new', ['same_text\n','same_text\n','same_text\n',
282
 
                           'same_text\n','same_text\n','new_text\n'], output,
283
 
                           context_lines=4)
284
 
        lines = output.getvalue().splitlines(True)
285
 
        self.check_patch(lines)
286
 
        self.assertEqual(['--- old\n',
287
 
                           '+++ new\n',
288
 
                           '@@ -2,5 +2,5 @@\n',
289
 
                           ' same_text\n',
290
 
                           ' same_text\n',
291
 
                           ' same_text\n',
292
 
                           ' same_text\n',
293
 
                           '-old_text\n',
294
 
                           '+new_text\n',
295
 
                           '\n',
296
 
                          ]
297
 
                          , lines)
298
 
 
299
 
 
300
 
 
301
 
 
302
 
 
303
 
class TestDiffFiles(tests.TestCaseInTempDir):
 
265
 
 
266
class TestDiffFiles(TestCaseInTempDir):
304
267
 
305
268
    def test_external_diff_binary(self):
306
269
        """The output when using external diff should use diff's i18n error"""
308
271
        lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
309
272
 
310
273
        cmd = ['diff', '-u', '--binary', 'old', 'new']
311
 
        with open('old', 'wb') as f: f.write('\x00foobar\n')
312
 
        with open('new', 'wb') as f: f.write('foo\x00bar\n')
 
274
        open('old', 'wb').write('\x00foobar\n')
 
275
        open('new', 'wb').write('foo\x00bar\n')
313
276
        pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
314
277
                                     stdin=subprocess.PIPE)
315
278
        out, err = pipe.communicate()
319
282
        self.assertEqual(out.splitlines(True) + ['\n'], lines)
320
283
 
321
284
 
322
 
def get_diff_as_string(tree1, tree2, specific_files=None, working_tree=None):
323
 
    output = StringIO()
324
 
    if working_tree is not None:
325
 
        extra_trees = (working_tree,)
326
 
    else:
327
 
        extra_trees = ()
328
 
    diff.show_diff_trees(tree1, tree2, output,
329
 
        specific_files=specific_files,
330
 
        extra_trees=extra_trees, old_label='old/',
331
 
        new_label='new/')
332
 
    return output.getvalue()
333
 
 
334
 
 
335
 
class TestDiffDates(tests.TestCaseWithTransport):
 
285
class TestShowDiffTreesHelper(TestCaseWithTransport):
 
286
    """Has a helper for running show_diff_trees"""
 
287
 
 
288
    def get_diff(self, tree1, tree2, specific_files=None, working_tree=None):
 
289
        output = StringIO()
 
290
        if working_tree is not None:
 
291
            extra_trees = (working_tree,)
 
292
        else:
 
293
            extra_trees = ()
 
294
        show_diff_trees(tree1, tree2, output, specific_files=specific_files,
 
295
                        extra_trees=extra_trees, old_label='old/',
 
296
                        new_label='new/')
 
297
        return output.getvalue()
 
298
 
 
299
 
 
300
class TestDiffDates(TestShowDiffTreesHelper):
336
301
 
337
302
    def setUp(self):
338
303
        super(TestDiffDates, self).setUp()
373
338
        os.utime('file1', (1144195200, 1144195200)) # 2006-04-05 00:00:00 UTC
374
339
 
375
340
    def test_diff_rev_tree_working_tree(self):
376
 
        output = get_diff_as_string(self.wt.basis_tree(), self.wt)
 
341
        output = self.get_diff(self.wt.basis_tree(), self.wt)
377
342
        # note that the date for old/file1 is from rev 2 rather than from
378
343
        # the basis revision (rev 4)
379
344
        self.assertEqualDiff(output, '''\
389
354
    def test_diff_rev_tree_rev_tree(self):
390
355
        tree1 = self.b.repository.revision_tree('rev-2')
391
356
        tree2 = self.b.repository.revision_tree('rev-3')
392
 
        output = get_diff_as_string(tree1, tree2)
 
357
        output = self.get_diff(tree1, tree2)
393
358
        self.assertEqualDiff(output, '''\
394
359
=== modified file 'file2'
395
360
--- old/file2\t2006-04-01 00:00:00 +0000
399
364
+file2 contents at rev 3
400
365
 
401
366
''')
402
 
 
 
367
        
403
368
    def test_diff_add_files(self):
404
 
        tree1 = self.b.repository.revision_tree(_mod_revision.NULL_REVISION)
 
369
        tree1 = self.b.repository.revision_tree(None)
405
370
        tree2 = self.b.repository.revision_tree('rev-1')
406
 
        output = get_diff_as_string(tree1, tree2)
 
371
        output = self.get_diff(tree1, tree2)
407
372
        # the files have the epoch time stamp for the tree in which
408
373
        # they don't exist.
409
374
        self.assertEqualDiff(output, '''\
424
389
    def test_diff_remove_files(self):
425
390
        tree1 = self.b.repository.revision_tree('rev-3')
426
391
        tree2 = self.b.repository.revision_tree('rev-4')
427
 
        output = get_diff_as_string(tree1, tree2)
 
392
        output = self.get_diff(tree1, tree2)
428
393
        # the file has the epoch time stamp for the tree in which
429
394
        # it doesn't exist.
430
395
        self.assertEqualDiff(output, '''\
441
406
        self.wt.rename_one('file1', 'file1b')
442
407
        old_tree = self.b.repository.revision_tree('rev-1')
443
408
        new_tree = self.b.repository.revision_tree('rev-4')
444
 
        out = get_diff_as_string(old_tree, new_tree, specific_files=['file1b'],
 
409
        out = self.get_diff(old_tree, new_tree, specific_files=['file1b'], 
445
410
                            working_tree=self.wt)
446
411
        self.assertContainsRe(out, 'file1\t')
447
412
 
453
418
        self.wt.rename_one('file1', 'dir1/file1')
454
419
        old_tree = self.b.repository.revision_tree('rev-1')
455
420
        new_tree = self.b.repository.revision_tree('rev-4')
456
 
        out = get_diff_as_string(old_tree, new_tree, specific_files=['dir1'],
 
421
        out = self.get_diff(old_tree, new_tree, specific_files=['dir1'], 
457
422
                            working_tree=self.wt)
458
423
        self.assertContainsRe(out, 'file1\t')
459
 
        out = get_diff_as_string(old_tree, new_tree, specific_files=['dir2'],
 
424
        out = self.get_diff(old_tree, new_tree, specific_files=['dir2'], 
460
425
                            working_tree=self.wt)
461
426
        self.assertNotContainsRe(out, 'file1\t')
462
427
 
463
428
 
464
 
class TestShowDiffTrees(tests.TestCaseWithTransport):
 
429
 
 
430
class TestShowDiffTrees(TestShowDiffTreesHelper):
465
431
    """Direct tests for show_diff_trees"""
466
432
 
467
433
    def test_modified_file(self):
472
438
        tree.commit('one', rev_id='rev-1')
473
439
 
474
440
        self.build_tree_contents([('tree/file', 'new contents\n')])
475
 
        d = get_diff_as_string(tree.basis_tree(), tree)
476
 
        self.assertContainsRe(d, "=== modified file 'file'\n")
477
 
        self.assertContainsRe(d, '--- old/file\t')
478
 
        self.assertContainsRe(d, '\\+\\+\\+ new/file\t')
479
 
        self.assertContainsRe(d, '-contents\n'
480
 
                                 '\\+new contents\n')
 
441
        diff = self.get_diff(tree.basis_tree(), tree)
 
442
        self.assertContainsRe(diff, "=== modified file 'file'\n")
 
443
        self.assertContainsRe(diff, '--- old/file\t')
 
444
        self.assertContainsRe(diff, '\\+\\+\\+ new/file\t')
 
445
        self.assertContainsRe(diff, '-contents\n'
 
446
                                    '\\+new contents\n')
481
447
 
482
448
    def test_modified_file_in_renamed_dir(self):
483
449
        """Test when a file is modified in a renamed directory."""
489
455
 
490
456
        tree.rename_one('dir', 'other')
491
457
        self.build_tree_contents([('tree/other/file', 'new contents\n')])
492
 
        d = get_diff_as_string(tree.basis_tree(), tree)
493
 
        self.assertContainsRe(d, "=== renamed directory 'dir' => 'other'\n")
494
 
        self.assertContainsRe(d, "=== modified file 'other/file'\n")
 
458
        diff = self.get_diff(tree.basis_tree(), tree)
 
459
        self.assertContainsRe(diff, "=== renamed directory 'dir' => 'other'\n")
 
460
        self.assertContainsRe(diff, "=== modified file 'other/file'\n")
495
461
        # XXX: This is technically incorrect, because it used to be at another
496
462
        # location. What to do?
497
 
        self.assertContainsRe(d, '--- old/dir/file\t')
498
 
        self.assertContainsRe(d, '\\+\\+\\+ new/other/file\t')
499
 
        self.assertContainsRe(d, '-contents\n'
500
 
                                 '\\+new contents\n')
 
463
        self.assertContainsRe(diff, '--- old/dir/file\t')
 
464
        self.assertContainsRe(diff, '\\+\\+\\+ new/other/file\t')
 
465
        self.assertContainsRe(diff, '-contents\n'
 
466
                                    '\\+new contents\n')
501
467
 
502
468
    def test_renamed_directory(self):
503
469
        """Test when only a directory is only renamed."""
508
474
        tree.commit('one', rev_id='rev-1')
509
475
 
510
476
        tree.rename_one('dir', 'newdir')
511
 
        d = get_diff_as_string(tree.basis_tree(), tree)
 
477
        diff = self.get_diff(tree.basis_tree(), tree)
512
478
        # Renaming a directory should be a single "you renamed this dir" even
513
479
        # when there are files inside.
514
 
        self.assertEqual(d, "=== renamed directory 'dir' => 'newdir'\n")
 
480
        self.assertEqual("=== renamed directory 'dir' => 'newdir'\n", diff)
515
481
 
516
482
    def test_renamed_file(self):
517
483
        """Test when a file is only renamed."""
521
487
        tree.commit('one', rev_id='rev-1')
522
488
 
523
489
        tree.rename_one('file', 'newname')
524
 
        d = get_diff_as_string(tree.basis_tree(), tree)
525
 
        self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
 
490
        diff = self.get_diff(tree.basis_tree(), tree)
 
491
        self.assertContainsRe(diff, "=== renamed file 'file' => 'newname'\n")
526
492
        # We shouldn't have a --- or +++ line, because there is no content
527
493
        # change
528
 
        self.assertNotContainsRe(d, '---')
 
494
        self.assertNotContainsRe(diff, '---')
529
495
 
530
496
    def test_renamed_and_modified_file(self):
531
497
        """Test when a file is only renamed."""
536
502
 
537
503
        tree.rename_one('file', 'newname')
538
504
        self.build_tree_contents([('tree/newname', 'new contents\n')])
539
 
        d = get_diff_as_string(tree.basis_tree(), tree)
540
 
        self.assertContainsRe(d, "=== renamed file 'file' => 'newname'\n")
541
 
        self.assertContainsRe(d, '--- old/file\t')
542
 
        self.assertContainsRe(d, '\\+\\+\\+ new/newname\t')
543
 
        self.assertContainsRe(d, '-contents\n'
544
 
                                 '\\+new contents\n')
545
 
 
546
 
 
547
 
    def test_internal_diff_exec_property(self):
548
 
        tree = self.make_branch_and_tree('tree')
549
 
 
550
 
        tt = transform.TreeTransform(tree)
551
 
        tt.new_file('a', tt.root, 'contents\n', 'a-id', True)
552
 
        tt.new_file('b', tt.root, 'contents\n', 'b-id', False)
553
 
        tt.new_file('c', tt.root, 'contents\n', 'c-id', True)
554
 
        tt.new_file('d', tt.root, 'contents\n', 'd-id', False)
555
 
        tt.new_file('e', tt.root, 'contents\n', 'control-e-id', True)
556
 
        tt.new_file('f', tt.root, 'contents\n', 'control-f-id', False)
557
 
        tt.apply()
558
 
        tree.commit('one', rev_id='rev-1')
559
 
 
560
 
        tt = transform.TreeTransform(tree)
561
 
        tt.set_executability(False, tt.trans_id_file_id('a-id'))
562
 
        tt.set_executability(True, tt.trans_id_file_id('b-id'))
563
 
        tt.set_executability(False, tt.trans_id_file_id('c-id'))
564
 
        tt.set_executability(True, tt.trans_id_file_id('d-id'))
565
 
        tt.apply()
566
 
        tree.rename_one('c', 'new-c')
567
 
        tree.rename_one('d', 'new-d')
568
 
 
569
 
        d = get_diff_as_string(tree.basis_tree(), tree)
570
 
 
571
 
        self.assertContainsRe(d, r"file 'a'.*\(properties changed:"
572
 
                                  ".*\+x to -x.*\)")
573
 
        self.assertContainsRe(d, r"file 'b'.*\(properties changed:"
574
 
                                  ".*-x to \+x.*\)")
575
 
        self.assertContainsRe(d, r"file 'c'.*\(properties changed:"
576
 
                                  ".*\+x to -x.*\)")
577
 
        self.assertContainsRe(d, r"file 'd'.*\(properties changed:"
578
 
                                  ".*-x to \+x.*\)")
579
 
        self.assertNotContainsRe(d, r"file 'e'")
580
 
        self.assertNotContainsRe(d, r"file 'f'")
 
505
        diff = self.get_diff(tree.basis_tree(), tree)
 
506
        self.assertContainsRe(diff, "=== renamed file 'file' => 'newname'\n")
 
507
        self.assertContainsRe(diff, '--- old/file\t')
 
508
        self.assertContainsRe(diff, '\\+\\+\\+ new/newname\t')
 
509
        self.assertContainsRe(diff, '-contents\n'
 
510
                                    '\\+new contents\n')
581
511
 
582
512
    def test_binary_unicode_filenames(self):
583
513
        """Test that contents of files are *not* encoded in UTF-8 when there
584
514
        is a binary file in the diff.
585
515
        """
586
516
        # See https://bugs.launchpad.net/bugs/110092.
587
 
        self.requireFeature(features.UnicodeFilenameFeature)
 
517
        self.requireFeature(UnicodeFilename)
588
518
 
589
519
        # This bug isn't triggered with cStringIO.
590
520
        from StringIO import StringIO
598
528
        tree.add([alpha], ['file-id'])
599
529
        tree.add([omega], ['file-id-2'])
600
530
        diff_content = StringIO()
601
 
        diff.show_diff_trees(tree.basis_tree(), tree, diff_content)
602
 
        d = diff_content.getvalue()
603
 
        self.assertContainsRe(d, r"=== added file '%s'" % alpha_utf8)
604
 
        self.assertContainsRe(d, "Binary files a/%s.*and b/%s.* differ\n"
605
 
                              % (alpha_utf8, alpha_utf8))
606
 
        self.assertContainsRe(d, r"=== added file '%s'" % omega_utf8)
607
 
        self.assertContainsRe(d, r"--- a/%s" % (omega_utf8,))
608
 
        self.assertContainsRe(d, r"\+\+\+ b/%s" % (omega_utf8,))
 
531
        show_diff_trees(tree.basis_tree(), tree, diff_content)
 
532
        diff = diff_content.getvalue()
 
533
        self.assertContainsRe(diff, r"=== added file '%s'" % alpha_utf8)
 
534
        self.assertContainsRe(
 
535
            diff, "Binary files a/%s.*and b/%s.* differ\n" % (alpha_utf8, alpha_utf8))
 
536
        self.assertContainsRe(diff, r"=== added file '%s'" % omega_utf8)
 
537
        self.assertContainsRe(diff, r"--- a/%s" % (omega_utf8,))
 
538
        self.assertContainsRe(diff, r"\+\+\+ b/%s" % (omega_utf8,))
609
539
 
610
540
    def test_unicode_filename(self):
611
541
        """Test when the filename are unicode."""
612
 
        self.requireFeature(features.UnicodeFilenameFeature)
 
542
        self.requireFeature(UnicodeFilename)
613
543
 
614
544
        alpha, omega = u'\u03b1', u'\u03c9'
615
545
        autf8, outf8 = alpha.encode('utf8'), omega.encode('utf8')
630
560
        tree.add(['add_'+alpha], ['file-id'])
631
561
        self.build_tree_contents([('tree/mod_'+alpha, 'contents_mod\n')])
632
562
 
633
 
        d = get_diff_as_string(tree.basis_tree(), tree)
634
 
        self.assertContainsRe(d,
 
563
        diff = self.get_diff(tree.basis_tree(), tree)
 
564
        self.assertContainsRe(diff,
635
565
                "=== renamed file 'ren_%s' => 'ren_%s'\n"%(autf8, outf8))
636
 
        self.assertContainsRe(d, "=== added file 'add_%s'"%autf8)
637
 
        self.assertContainsRe(d, "=== modified file 'mod_%s'"%autf8)
638
 
        self.assertContainsRe(d, "=== removed file 'del_%s'"%autf8)
639
 
 
640
 
    def test_unicode_filename_path_encoding(self):
641
 
        """Test for bug #382699: unicode filenames on Windows should be shown
642
 
        in user encoding.
643
 
        """
644
 
        self.requireFeature(features.UnicodeFilenameFeature)
645
 
        # The word 'test' in Russian
646
 
        _russian_test = u'\u0422\u0435\u0441\u0442'
647
 
        directory = _russian_test + u'/'
648
 
        test_txt = _russian_test + u'.txt'
649
 
        u1234 = u'\u1234.txt'
650
 
 
651
 
        tree = self.make_branch_and_tree('.')
652
 
        self.build_tree_contents([
653
 
            (test_txt, 'foo\n'),
654
 
            (u1234, 'foo\n'),
655
 
            (directory, None),
656
 
            ])
657
 
        tree.add([test_txt, u1234, directory])
658
 
 
659
 
        sio = StringIO()
660
 
        diff.show_diff_trees(tree.basis_tree(), tree, sio,
661
 
            path_encoding='cp1251')
662
 
 
663
 
        output = subst_dates(sio.getvalue())
664
 
        shouldbe = ('''\
665
 
=== added directory '%(directory)s'
666
 
=== added file '%(test_txt)s'
667
 
--- a/%(test_txt)s\tYYYY-MM-DD HH:MM:SS +ZZZZ
668
 
+++ b/%(test_txt)s\tYYYY-MM-DD HH:MM:SS +ZZZZ
669
 
@@ -0,0 +1,1 @@
670
 
+foo
671
 
 
672
 
=== added file '?.txt'
673
 
--- a/?.txt\tYYYY-MM-DD HH:MM:SS +ZZZZ
674
 
+++ b/?.txt\tYYYY-MM-DD HH:MM:SS +ZZZZ
675
 
@@ -0,0 +1,1 @@
676
 
+foo
677
 
 
678
 
''' % {'directory': _russian_test.encode('cp1251'),
679
 
       'test_txt': test_txt.encode('cp1251'),
680
 
      })
681
 
        self.assertEqualDiff(output, shouldbe)
682
 
 
683
 
 
684
 
class DiffWasIs(diff.DiffPath):
 
566
        self.assertContainsRe(diff, "=== added file 'add_%s'"%autf8)
 
567
        self.assertContainsRe(diff, "=== modified file 'mod_%s'"%autf8)
 
568
        self.assertContainsRe(diff, "=== removed file 'del_%s'"%autf8)
 
569
 
 
570
 
 
571
class DiffWasIs(DiffPath):
685
572
 
686
573
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
687
574
        self.to_file.write('was: ')
691
578
        pass
692
579
 
693
580
 
694
 
class TestDiffTree(tests.TestCaseWithTransport):
 
581
class TestDiffTree(TestCaseWithTransport):
695
582
 
696
583
    def setUp(self):
697
 
        super(TestDiffTree, self).setUp()
 
584
        TestCaseWithTransport.setUp(self)
698
585
        self.old_tree = self.make_branch_and_tree('old-tree')
699
586
        self.old_tree.lock_write()
700
587
        self.addCleanup(self.old_tree.unlock)
701
588
        self.new_tree = self.make_branch_and_tree('new-tree')
702
589
        self.new_tree.lock_write()
703
590
        self.addCleanup(self.new_tree.unlock)
704
 
        self.differ = diff.DiffTree(self.old_tree, self.new_tree, StringIO())
 
591
        self.differ = DiffTree(self.old_tree, self.new_tree, StringIO())
705
592
 
706
593
    def test_diff_text(self):
707
594
        self.build_tree_contents([('old-tree/olddir/',),
712
599
                                  ('new-tree/newdir/newfile', 'new\n')])
713
600
        self.new_tree.add('newdir')
714
601
        self.new_tree.add('newdir/newfile', 'file-id')
715
 
        differ = diff.DiffText(self.old_tree, self.new_tree, StringIO())
 
602
        differ = DiffText(self.old_tree, self.new_tree, StringIO())
716
603
        differ.diff_text('file-id', None, 'old label', 'new label')
717
604
        self.assertEqual(
718
605
            '--- old label\n+++ new label\n@@ -1,1 +0,0 @@\n-old\n\n',
747
634
        self.assertContainsRe(self.differ.to_file.getvalue(), '\+contents')
748
635
 
749
636
    def test_diff_symlink(self):
750
 
        differ = diff.DiffSymlink(self.old_tree, self.new_tree, StringIO())
 
637
        differ = DiffSymlink(self.old_tree, self.new_tree, StringIO())
751
638
        differ.diff_symlink('old target', None)
752
639
        self.assertEqual("=== target was 'old target'\n",
753
640
                         differ.to_file.getvalue())
754
641
 
755
 
        differ = diff.DiffSymlink(self.old_tree, self.new_tree, StringIO())
 
642
        differ = DiffSymlink(self.old_tree, self.new_tree, StringIO())
756
643
        differ.diff_symlink(None, 'new target')
757
644
        self.assertEqual("=== target is 'new target'\n",
758
645
                         differ.to_file.getvalue())
759
646
 
760
 
        differ = diff.DiffSymlink(self.old_tree, self.new_tree, StringIO())
 
647
        differ = DiffSymlink(self.old_tree, self.new_tree, StringIO())
761
648
        differ.diff_symlink('old target', 'new target')
762
649
        self.assertEqual("=== target changed 'old target' => 'new target'\n",
763
650
                         differ.to_file.getvalue())
778
665
             ' \@\@\n-old\n\+new\n\n')
779
666
 
780
667
    def test_diff_kind_change(self):
781
 
        self.requireFeature(features.SymlinkFeature)
 
668
        self.requireFeature(tests.SymlinkFeature)
782
669
        self.build_tree_contents([('old-tree/olddir/',),
783
670
                                  ('old-tree/olddir/oldfile', 'old\n')])
784
671
        self.old_tree.add('olddir')
793
680
            r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+0,0'
794
681
             ' \@\@\n-old\n\n')
795
682
        self.assertContainsRe(self.differ.to_file.getvalue(),
796
 
                              "=== target is u'new'\n")
 
683
                              "=== target is 'new'\n")
797
684
 
798
685
    def test_diff_directory(self):
799
686
        self.build_tree(['new-tree/new-dir/'])
813
700
 
814
701
    def test_register_diff(self):
815
702
        self.create_old_new()
816
 
        old_diff_factories = diff.DiffTree.diff_factories
817
 
        diff.DiffTree.diff_factories=old_diff_factories[:]
818
 
        diff.DiffTree.diff_factories.insert(0, DiffWasIs.from_diff_tree)
 
703
        old_diff_factories = DiffTree.diff_factories
 
704
        DiffTree.diff_factories=old_diff_factories[:]
 
705
        DiffTree.diff_factories.insert(0, DiffWasIs.from_diff_tree)
819
706
        try:
820
 
            differ = diff.DiffTree(self.old_tree, self.new_tree, StringIO())
 
707
            differ = DiffTree(self.old_tree, self.new_tree, StringIO())
821
708
        finally:
822
 
            diff.DiffTree.diff_factories = old_diff_factories
 
709
            DiffTree.diff_factories = old_diff_factories
823
710
        differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile')
824
711
        self.assertNotContainsRe(
825
712
            differ.to_file.getvalue(),
830
717
 
831
718
    def test_extra_factories(self):
832
719
        self.create_old_new()
833
 
        differ = diff.DiffTree(self.old_tree, self.new_tree, StringIO(),
834
 
                               extra_factories=[DiffWasIs.from_diff_tree])
 
720
        differ = DiffTree(self.old_tree, self.new_tree, StringIO(),
 
721
                            extra_factories=[DiffWasIs.from_diff_tree])
835
722
        differ.diff('file-id', 'olddir/oldfile', 'newdir/newfile')
836
723
        self.assertNotContainsRe(
837
724
            differ.to_file.getvalue(),
850
737
            '.*a-file(.|\n)*b-file')
851
738
 
852
739
 
853
 
class TestPatienceDiffLib(tests.TestCase):
 
740
class TestPatienceDiffLib(TestCase):
854
741
 
855
742
    def setUp(self):
856
743
        super(TestPatienceDiffLib, self).setUp()
857
 
        self._unique_lcs = _patiencediff_py.unique_lcs_py
858
 
        self._recurse_matches = _patiencediff_py.recurse_matches_py
 
744
        self._unique_lcs = bzrlib._patiencediff_py.unique_lcs_py
 
745
        self._recurse_matches = bzrlib._patiencediff_py.recurse_matches_py
859
746
        self._PatienceSequenceMatcher = \
860
 
            _patiencediff_py.PatienceSequenceMatcher_py
861
 
 
862
 
    def test_diff_unicode_string(self):
863
 
        a = ''.join([unichr(i) for i in range(4000, 4500, 3)])
864
 
        b = ''.join([unichr(i) for i in range(4300, 4800, 2)])
865
 
        sm = self._PatienceSequenceMatcher(None, a, b)
866
 
        mb = sm.get_matching_blocks()
867
 
        self.assertEqual(35, len(mb))
 
747
            bzrlib._patiencediff_py.PatienceSequenceMatcher_py
868
748
 
869
749
    def test_unique_lcs(self):
870
750
        unique_lcs = self._unique_lcs
871
 
        self.assertEqual(unique_lcs('', ''), [])
872
 
        self.assertEqual(unique_lcs('', 'a'), [])
873
 
        self.assertEqual(unique_lcs('a', ''), [])
874
 
        self.assertEqual(unique_lcs('a', 'a'), [(0,0)])
875
 
        self.assertEqual(unique_lcs('a', 'b'), [])
876
 
        self.assertEqual(unique_lcs('ab', 'ab'), [(0,0), (1,1)])
877
 
        self.assertEqual(unique_lcs('abcde', 'cdeab'), [(2,0), (3,1), (4,2)])
878
 
        self.assertEqual(unique_lcs('cdeab', 'abcde'), [(0,2), (1,3), (2,4)])
879
 
        self.assertEqual(unique_lcs('abXde', 'abYde'), [(0,0), (1,1),
 
751
        self.assertEquals(unique_lcs('', ''), [])
 
752
        self.assertEquals(unique_lcs('', 'a'), [])
 
753
        self.assertEquals(unique_lcs('a', ''), [])
 
754
        self.assertEquals(unique_lcs('a', 'a'), [(0,0)])
 
755
        self.assertEquals(unique_lcs('a', 'b'), [])
 
756
        self.assertEquals(unique_lcs('ab', 'ab'), [(0,0), (1,1)])
 
757
        self.assertEquals(unique_lcs('abcde', 'cdeab'), [(2,0), (3,1), (4,2)])
 
758
        self.assertEquals(unique_lcs('cdeab', 'abcde'), [(0,2), (1,3), (2,4)])
 
759
        self.assertEquals(unique_lcs('abXde', 'abYde'), [(0,0), (1,1), 
880
760
                                                         (3,3), (4,4)])
881
 
        self.assertEqual(unique_lcs('acbac', 'abc'), [(2,1)])
 
761
        self.assertEquals(unique_lcs('acbac', 'abc'), [(2,1)])
882
762
 
883
763
    def test_recurse_matches(self):
884
764
        def test_one(a, b, matches):
885
765
            test_matches = []
886
766
            self._recurse_matches(
887
767
                a, b, 0, 0, len(a), len(b), test_matches, 10)
888
 
            self.assertEqual(test_matches, matches)
 
768
            self.assertEquals(test_matches, matches)
889
769
 
890
770
        test_one(['a', '', 'b', '', 'c'], ['a', 'a', 'b', 'c', 'c'],
891
771
                 [(0, 0), (2, 2), (4, 4)])
897
777
        test_one('abcdbce', 'afbcgdbce', [(0,0), (1, 2), (2, 3), (3, 5),
898
778
                                          (4, 6), (5, 7), (6, 8)])
899
779
 
900
 
        # recurse_matches doesn't match non-unique
 
780
        # recurse_matches doesn't match non-unique 
901
781
        # lines surrounded by bogus text.
902
782
        # The update has been done in patiencediff.SequenceMatcher instead
903
783
 
996
876
    def test_opcodes(self):
997
877
        def chk_ops(a, b, expected_codes):
998
878
            s = self._PatienceSequenceMatcher(None, a, b)
999
 
            self.assertEqual(expected_codes, s.get_opcodes())
 
879
            self.assertEquals(expected_codes, s.get_opcodes())
1000
880
 
1001
881
        chk_ops('', '', [])
1002
882
        chk_ops([], [], [])
1040
920
                 ('delete', 1,2, 1,1),
1041
921
                 ('equal',  2,3, 1,2),
1042
922
                ])
1043
 
        chk_ops('aBccDe', 'abccde',
 
923
        chk_ops('aBccDe', 'abccde', 
1044
924
                [('equal',   0,1, 0,1),
1045
925
                 ('replace', 1,5, 1,5),
1046
926
                 ('equal',   5,6, 5,6),
1047
927
                ])
1048
 
        chk_ops('aBcDec', 'abcdec',
 
928
        chk_ops('aBcDec', 'abcdec', 
1049
929
                [('equal',   0,1, 0,1),
1050
930
                 ('replace', 1,2, 1,2),
1051
931
                 ('equal',   2,3, 2,3),
1052
932
                 ('replace', 3,4, 3,4),
1053
933
                 ('equal',   4,6, 4,6),
1054
934
                ])
1055
 
        chk_ops('aBcdEcdFg', 'abcdecdfg',
 
935
        chk_ops('aBcdEcdFg', 'abcdecdfg', 
1056
936
                [('equal',   0,1, 0,1),
1057
937
                 ('replace', 1,8, 1,8),
1058
938
                 ('equal',   8,9, 8,9)
1059
939
                ])
1060
 
        chk_ops('aBcdEeXcdFg', 'abcdecdfg',
 
940
        chk_ops('aBcdEeXcdFg', 'abcdecdfg', 
1061
941
                [('equal',   0,1, 0,1),
1062
942
                 ('replace', 1,2, 1,2),
1063
943
                 ('equal',   2,4, 2,4),
1072
952
    def test_grouped_opcodes(self):
1073
953
        def chk_ops(a, b, expected_codes, n=3):
1074
954
            s = self._PatienceSequenceMatcher(None, a, b)
1075
 
            self.assertEqual(expected_codes, list(s.get_grouped_opcodes(n)))
 
955
            self.assertEquals(expected_codes, list(s.get_grouped_opcodes(n)))
1076
956
 
1077
957
        chk_ops('', '', [])
1078
958
        chk_ops([], [], [])
1123
1003
    """
1124
1004
    gnxrf_netf = ['svyr*']
1125
1005
    gnxrf_bcgvbaf = ['ab-erphefr']
1126
 
 
 
1006
  
1127
1007
    qrs eha(frys, svyr_yvfg, ab_erphefr=Snyfr):
1128
1008
        sebz omeyvo.nqq vzcbeg fzneg_nqq, nqq_ercbegre_cevag, nqq_ercbegre_ahyy
1129
1009
        vs vf_dhvrg():
1137
1017
'''.splitlines(True), '''\
1138
1018
    trg nqqrq jura lbh nqq n svyr va gur qverpgbel.
1139
1019
 
1140
 
    --qel-eha jvyy fubj juvpu svyrf jbhyq or nqqrq, ohg abg npghnyyl
 
1020
    --qel-eha jvyy fubj juvpu svyrf jbhyq or nqqrq, ohg abg npghnyyl 
1141
1021
    nqq gurz.
1142
1022
    """
1143
1023
    gnxrf_netf = ['svyr*']
1170
1050
                 'how are you today?\n']
1171
1051
        txt_b = ['hello there\n',
1172
1052
                 'how are you today?\n']
1173
 
        unified_diff = patiencediff.unified_diff
 
1053
        unified_diff = bzrlib.patiencediff.unified_diff
1174
1054
        psm = self._PatienceSequenceMatcher
1175
 
        self.assertEqual(['--- \n',
1176
 
                           '+++ \n',
 
1055
        self.assertEquals([ '---  \n',
 
1056
                           '+++  \n',
1177
1057
                           '@@ -1,3 +1,2 @@\n',
1178
1058
                           ' hello there\n',
1179
1059
                           '-world\n',
1184
1064
        txt_a = map(lambda x: x+'\n', 'abcdefghijklmnop')
1185
1065
        txt_b = map(lambda x: x+'\n', 'abcdefxydefghijklmnop')
1186
1066
        # This is the result with LongestCommonSubstring matching
1187
 
        self.assertEqual(['--- \n',
1188
 
                           '+++ \n',
 
1067
        self.assertEquals(['---  \n',
 
1068
                           '+++  \n',
1189
1069
                           '@@ -1,6 +1,11 @@\n',
1190
1070
                           ' a\n',
1191
1071
                           ' b\n',
1200
1080
                           ' f\n']
1201
1081
                          , list(unified_diff(txt_a, txt_b)))
1202
1082
        # And the patience diff
1203
 
        self.assertEqual(['--- \n',
1204
 
                           '+++ \n',
 
1083
        self.assertEquals(['---  \n',
 
1084
                           '+++  \n',
1205
1085
                           '@@ -4,6 +4,11 @@\n',
1206
1086
                           ' d\n',
1207
1087
                           ' e\n',
1218
1098
                          , list(unified_diff(txt_a, txt_b,
1219
1099
                                 sequencematcher=psm)))
1220
1100
 
1221
 
    def test_patience_unified_diff_with_dates(self):
1222
 
        txt_a = ['hello there\n',
1223
 
                 'world\n',
1224
 
                 'how are you today?\n']
1225
 
        txt_b = ['hello there\n',
1226
 
                 'how are you today?\n']
1227
 
        unified_diff = patiencediff.unified_diff
1228
 
        psm = self._PatienceSequenceMatcher
1229
 
        self.assertEqual(['--- a\t2008-08-08\n',
1230
 
                           '+++ b\t2008-09-09\n',
1231
 
                           '@@ -1,3 +1,2 @@\n',
1232
 
                           ' hello there\n',
1233
 
                           '-world\n',
1234
 
                           ' how are you today?\n'
1235
 
                          ]
1236
 
                          , list(unified_diff(txt_a, txt_b,
1237
 
                                 fromfile='a', tofile='b',
1238
 
                                 fromfiledate='2008-08-08',
1239
 
                                 tofiledate='2008-09-09',
1240
 
                                 sequencematcher=psm)))
1241
 
 
1242
1101
 
1243
1102
class TestPatienceDiffLib_c(TestPatienceDiffLib):
1244
1103
 
1245
 
    _test_needs_features = [features.compiled_patiencediff_feature]
 
1104
    _test_needs_features = [CompiledPatienceDiffFeature]
1246
1105
 
1247
1106
    def setUp(self):
1248
1107
        super(TestPatienceDiffLib_c, self).setUp()
1249
 
        from bzrlib import _patiencediff_c
1250
 
        self._unique_lcs = _patiencediff_c.unique_lcs_c
1251
 
        self._recurse_matches = _patiencediff_c.recurse_matches_c
 
1108
        import bzrlib._patiencediff_c
 
1109
        self._unique_lcs = bzrlib._patiencediff_c.unique_lcs_c
 
1110
        self._recurse_matches = bzrlib._patiencediff_c.recurse_matches_c
1252
1111
        self._PatienceSequenceMatcher = \
1253
 
            _patiencediff_c.PatienceSequenceMatcher_c
 
1112
            bzrlib._patiencediff_c.PatienceSequenceMatcher_c
1254
1113
 
1255
1114
    def test_unhashable(self):
1256
1115
        """We should get a proper exception here."""
1266
1125
                                         None, ['valid'], ['valid', []])
1267
1126
 
1268
1127
 
1269
 
class TestPatienceDiffLibFiles(tests.TestCaseInTempDir):
 
1128
class TestPatienceDiffLibFiles(TestCaseInTempDir):
1270
1129
 
1271
1130
    def setUp(self):
1272
1131
        super(TestPatienceDiffLibFiles, self).setUp()
1273
1132
        self._PatienceSequenceMatcher = \
1274
 
            _patiencediff_py.PatienceSequenceMatcher_py
 
1133
            bzrlib._patiencediff_py.PatienceSequenceMatcher_py
1275
1134
 
1276
1135
    def test_patience_unified_diff_files(self):
1277
1136
        txt_a = ['hello there\n',
1279
1138
                 'how are you today?\n']
1280
1139
        txt_b = ['hello there\n',
1281
1140
                 'how are you today?\n']
1282
 
        with open('a1', 'wb') as f: f.writelines(txt_a)
1283
 
        with open('b1', 'wb') as f: f.writelines(txt_b)
 
1141
        open('a1', 'wb').writelines(txt_a)
 
1142
        open('b1', 'wb').writelines(txt_b)
1284
1143
 
1285
 
        unified_diff_files = patiencediff.unified_diff_files
 
1144
        unified_diff_files = bzrlib.patiencediff.unified_diff_files
1286
1145
        psm = self._PatienceSequenceMatcher
1287
 
        self.assertEqual(['--- a1\n',
1288
 
                           '+++ b1\n',
 
1146
        self.assertEquals(['--- a1 \n',
 
1147
                           '+++ b1 \n',
1289
1148
                           '@@ -1,3 +1,2 @@\n',
1290
1149
                           ' hello there\n',
1291
1150
                           '-world\n',
1296
1155
 
1297
1156
        txt_a = map(lambda x: x+'\n', 'abcdefghijklmnop')
1298
1157
        txt_b = map(lambda x: x+'\n', 'abcdefxydefghijklmnop')
1299
 
        with open('a2', 'wb') as f: f.writelines(txt_a)
1300
 
        with open('b2', 'wb') as f: f.writelines(txt_b)
 
1158
        open('a2', 'wb').writelines(txt_a)
 
1159
        open('b2', 'wb').writelines(txt_b)
1301
1160
 
1302
1161
        # This is the result with LongestCommonSubstring matching
1303
 
        self.assertEqual(['--- a2\n',
1304
 
                           '+++ b2\n',
 
1162
        self.assertEquals(['--- a2 \n',
 
1163
                           '+++ b2 \n',
1305
1164
                           '@@ -1,6 +1,11 @@\n',
1306
1165
                           ' a\n',
1307
1166
                           ' b\n',
1317
1176
                          , list(unified_diff_files('a2', 'b2')))
1318
1177
 
1319
1178
        # And the patience diff
1320
 
        self.assertEqual(['--- a2\n',
1321
 
                          '+++ b2\n',
1322
 
                          '@@ -4,6 +4,11 @@\n',
1323
 
                          ' d\n',
1324
 
                          ' e\n',
1325
 
                          ' f\n',
1326
 
                          '+x\n',
1327
 
                          '+y\n',
1328
 
                          '+d\n',
1329
 
                          '+e\n',
1330
 
                          '+f\n',
1331
 
                          ' g\n',
1332
 
                          ' h\n',
1333
 
                          ' i\n'],
1334
 
                         list(unified_diff_files('a2', 'b2',
1335
 
                                                 sequencematcher=psm)))
 
1179
        self.assertEquals(['--- a2 \n',
 
1180
                           '+++ b2 \n',
 
1181
                           '@@ -4,6 +4,11 @@\n',
 
1182
                           ' d\n',
 
1183
                           ' e\n',
 
1184
                           ' f\n',
 
1185
                           '+x\n',
 
1186
                           '+y\n',
 
1187
                           '+d\n',
 
1188
                           '+e\n',
 
1189
                           '+f\n',
 
1190
                           ' g\n',
 
1191
                           ' h\n',
 
1192
                           ' i\n',
 
1193
                          ]
 
1194
                          , list(unified_diff_files('a2', 'b2',
 
1195
                                 sequencematcher=psm)))
1336
1196
 
1337
1197
 
1338
1198
class TestPatienceDiffLibFiles_c(TestPatienceDiffLibFiles):
1339
1199
 
1340
 
    _test_needs_features = [features.compiled_patiencediff_feature]
 
1200
    _test_needs_features = [CompiledPatienceDiffFeature]
1341
1201
 
1342
1202
    def setUp(self):
1343
1203
        super(TestPatienceDiffLibFiles_c, self).setUp()
1344
 
        from bzrlib import _patiencediff_c
 
1204
        import bzrlib._patiencediff_c
1345
1205
        self._PatienceSequenceMatcher = \
1346
 
            _patiencediff_c.PatienceSequenceMatcher_c
1347
 
 
1348
 
 
1349
 
class TestUsingCompiledIfAvailable(tests.TestCase):
 
1206
            bzrlib._patiencediff_c.PatienceSequenceMatcher_c
 
1207
 
 
1208
 
 
1209
class TestUsingCompiledIfAvailable(TestCase):
1350
1210
 
1351
1211
    def test_PatienceSequenceMatcher(self):
1352
 
        if features.compiled_patiencediff_feature.available():
 
1212
        if CompiledPatienceDiffFeature.available():
1353
1213
            from bzrlib._patiencediff_c import PatienceSequenceMatcher_c
1354
1214
            self.assertIs(PatienceSequenceMatcher_c,
1355
 
                          patiencediff.PatienceSequenceMatcher)
 
1215
                          bzrlib.patiencediff.PatienceSequenceMatcher)
1356
1216
        else:
1357
1217
            from bzrlib._patiencediff_py import PatienceSequenceMatcher_py
1358
1218
            self.assertIs(PatienceSequenceMatcher_py,
1359
 
                          patiencediff.PatienceSequenceMatcher)
 
1219
                          bzrlib.patiencediff.PatienceSequenceMatcher)
1360
1220
 
1361
1221
    def test_unique_lcs(self):
1362
 
        if features.compiled_patiencediff_feature.available():
 
1222
        if CompiledPatienceDiffFeature.available():
1363
1223
            from bzrlib._patiencediff_c import unique_lcs_c
1364
1224
            self.assertIs(unique_lcs_c,
1365
 
                          patiencediff.unique_lcs)
 
1225
                          bzrlib.patiencediff.unique_lcs)
1366
1226
        else:
1367
1227
            from bzrlib._patiencediff_py import unique_lcs_py
1368
1228
            self.assertIs(unique_lcs_py,
1369
 
                          patiencediff.unique_lcs)
 
1229
                          bzrlib.patiencediff.unique_lcs)
1370
1230
 
1371
1231
    def test_recurse_matches(self):
1372
 
        if features.compiled_patiencediff_feature.available():
 
1232
        if CompiledPatienceDiffFeature.available():
1373
1233
            from bzrlib._patiencediff_c import recurse_matches_c
1374
1234
            self.assertIs(recurse_matches_c,
1375
 
                          patiencediff.recurse_matches)
 
1235
                          bzrlib.patiencediff.recurse_matches)
1376
1236
        else:
1377
1237
            from bzrlib._patiencediff_py import recurse_matches_py
1378
1238
            self.assertIs(recurse_matches_py,
1379
 
                          patiencediff.recurse_matches)
1380
 
 
1381
 
 
1382
 
class TestDiffFromTool(tests.TestCaseWithTransport):
 
1239
                          bzrlib.patiencediff.recurse_matches)
 
1240
 
 
1241
 
 
1242
class TestDiffFromTool(TestCaseWithTransport):
1383
1243
 
1384
1244
    def test_from_string(self):
1385
 
        diff_obj = diff.DiffFromTool.from_string('diff', None, None, None)
 
1245
        diff_obj = DiffFromTool.from_string('diff', None, None, None)
1386
1246
        self.addCleanup(diff_obj.finish)
1387
 
        self.assertEqual(['diff', '@old_path', '@new_path'],
 
1247
        self.assertEqual(['diff', '%(old_path)s', '%(new_path)s'],
1388
1248
            diff_obj.command_template)
1389
1249
 
1390
1250
    def test_from_string_u5(self):
1391
 
        diff_obj = diff.DiffFromTool.from_string('diff "-u 5"',
1392
 
                                                 None, None, None)
 
1251
        diff_obj = DiffFromTool.from_string('diff -u\\ 5', None, None, None)
1393
1252
        self.addCleanup(diff_obj.finish)
1394
 
        self.assertEqual(['diff', '-u 5', '@old_path', '@new_path'],
 
1253
        self.assertEqual(['diff', '-u 5', '%(old_path)s', '%(new_path)s'],
1395
1254
                         diff_obj.command_template)
1396
1255
        self.assertEqual(['diff', '-u 5', 'old-path', 'new-path'],
1397
1256
                         diff_obj._get_command('old-path', 'new-path'))
1398
1257
 
1399
 
    def test_from_string_path_with_backslashes(self):
1400
 
        self.requireFeature(features.backslashdir_feature)
1401
 
        tool = 'C:\\Tools\\Diff.exe'
1402
 
        diff_obj = diff.DiffFromTool.from_string(tool, None, None, None)
1403
 
        self.addCleanup(diff_obj.finish)
1404
 
        self.assertEqual(['C:\\Tools\\Diff.exe', '@old_path', '@new_path'],
1405
 
                         diff_obj.command_template)
1406
 
        self.assertEqual(['C:\\Tools\\Diff.exe', 'old-path', 'new-path'],
1407
 
                         diff_obj._get_command('old-path', 'new-path'))
1408
 
 
1409
1258
    def test_execute(self):
1410
1259
        output = StringIO()
1411
 
        diff_obj = diff.DiffFromTool(['python', '-c',
1412
 
                                      'print "@old_path @new_path"'],
1413
 
                                     None, None, output)
 
1260
        diff_obj = DiffFromTool(['python', '-c',
 
1261
                                 'print "%(old_path)s %(new_path)s"'],
 
1262
                                None, None, output)
1414
1263
        self.addCleanup(diff_obj.finish)
1415
1264
        diff_obj._execute('old', 'new')
1416
1265
        self.assertEqual(output.getvalue().rstrip(), 'old new')
1417
1266
 
1418
 
    def test_execute_missing(self):
1419
 
        diff_obj = diff.DiffFromTool(['a-tool-which-is-unlikely-to-exist'],
1420
 
                                     None, None, None)
 
1267
    def test_excute_missing(self):
 
1268
        diff_obj = DiffFromTool(['a-tool-which-is-unlikely-to-exist'],
 
1269
                                None, None, None)
1421
1270
        self.addCleanup(diff_obj.finish)
1422
 
        e = self.assertRaises(errors.ExecutableMissing, diff_obj._execute,
1423
 
                              'old', 'new')
 
1271
        e = self.assertRaises(ExecutableMissing, diff_obj._execute, 'old',
 
1272
                              'new')
1424
1273
        self.assertEqual('a-tool-which-is-unlikely-to-exist could not be found'
1425
1274
                         ' on this machine', str(e))
1426
1275
 
1427
 
    def test_prepare_files_creates_paths_readable_by_windows_tool(self):
1428
 
        self.requireFeature(features.AttribFeature)
1429
 
        output = StringIO()
1430
 
        tree = self.make_branch_and_tree('tree')
1431
 
        self.build_tree_contents([('tree/file', 'content')])
1432
 
        tree.add('file', 'file-id')
1433
 
        tree.commit('old tree')
1434
 
        tree.lock_read()
1435
 
        self.addCleanup(tree.unlock)
1436
 
        basis_tree = tree.basis_tree()
1437
 
        basis_tree.lock_read()
1438
 
        self.addCleanup(basis_tree.unlock)
1439
 
        diff_obj = diff.DiffFromTool(['python', '-c',
1440
 
                                      'print "@old_path @new_path"'],
1441
 
                                     basis_tree, tree, output)
1442
 
        diff_obj._prepare_files('file-id', 'file', 'file')
1443
 
        # The old content should be readonly
1444
 
        self.assertReadableByAttrib(diff_obj._root, 'old\\file',
1445
 
                                    r'R.*old\\file$')
1446
 
        # The new content should use the tree object, not a 'new' file anymore
1447
 
        self.assertEndsWith(tree.basedir, 'work/tree')
1448
 
        self.assertReadableByAttrib(tree.basedir, 'file', r'work\\tree\\file$')
1449
 
 
1450
 
    def assertReadableByAttrib(self, cwd, relpath, regex):
1451
 
        proc = subprocess.Popen(['attrib', relpath],
1452
 
                                stdout=subprocess.PIPE,
1453
 
                                cwd=cwd)
1454
 
        (result, err) = proc.communicate()
1455
 
        self.assertContainsRe(result.replace('\r\n', '\n'), regex)
1456
 
 
1457
1276
    def test_prepare_files(self):
1458
1277
        output = StringIO()
1459
1278
        tree = self.make_branch_and_tree('tree')
1460
1279
        self.build_tree_contents([('tree/oldname', 'oldcontent')])
1461
 
        self.build_tree_contents([('tree/oldname2', 'oldcontent2')])
1462
1280
        tree.add('oldname', 'file-id')
1463
 
        tree.add('oldname2', 'file2-id')
1464
 
        # Earliest allowable date on FAT32 filesystems is 1980-01-01
1465
 
        tree.commit('old tree', timestamp=315532800)
 
1281
        tree.commit('old tree', timestamp=0)
1466
1282
        tree.rename_one('oldname', 'newname')
1467
 
        tree.rename_one('oldname2', 'newname2')
1468
1283
        self.build_tree_contents([('tree/newname', 'newcontent')])
1469
 
        self.build_tree_contents([('tree/newname2', 'newcontent2')])
1470
1284
        old_tree = tree.basis_tree()
1471
1285
        old_tree.lock_read()
1472
1286
        self.addCleanup(old_tree.unlock)
1473
1287
        tree.lock_read()
1474
1288
        self.addCleanup(tree.unlock)
1475
 
        diff_obj = diff.DiffFromTool(['python', '-c',
1476
 
                                      'print "@old_path @new_path"'],
1477
 
                                     old_tree, tree, output)
 
1289
        diff_obj = DiffFromTool(['python', '-c',
 
1290
                                 'print "%(old_path)s %(new_path)s"'],
 
1291
                                old_tree, tree, output)
1478
1292
        self.addCleanup(diff_obj.finish)
1479
1293
        self.assertContainsRe(diff_obj._root, 'bzr-diff-[^/]*')
1480
1294
        old_path, new_path = diff_obj._prepare_files('file-id', 'oldname',
1481
1295
                                                     'newname')
1482
1296
        self.assertContainsRe(old_path, 'old/oldname$')
1483
 
        self.assertEqual(315532800, os.stat(old_path).st_mtime)
1484
 
        self.assertContainsRe(new_path, 'tree/newname$')
 
1297
        self.assertEqual(0, os.stat(old_path).st_mtime)
 
1298
        self.assertContainsRe(new_path, 'new/newname$')
1485
1299
        self.assertFileEqual('oldcontent', old_path)
1486
1300
        self.assertFileEqual('newcontent', new_path)
1487
 
        if osutils.host_os_dereferences_symlinks():
 
1301
        if osutils.has_symlinks():
1488
1302
            self.assertTrue(os.path.samefile('tree/newname', new_path))
1489
1303
        # make sure we can create files with the same parent directories
1490
 
        diff_obj._prepare_files('file2-id', 'oldname2', 'newname2')
1491
 
 
1492
 
 
1493
 
class TestDiffFromToolEncodedFilename(tests.TestCaseWithTransport):
1494
 
 
1495
 
    def test_encodable_filename(self):
1496
 
        # Just checks file path for external diff tool.
1497
 
        # We cannot change CPython's internal encoding used by os.exec*.
1498
 
        diffobj = diff.DiffFromTool(['dummy', '@old_path', '@new_path'],
1499
 
                                    None, None, None)
1500
 
        for _, scenario in EncodingAdapter.encoding_scenarios:
1501
 
            encoding = scenario['encoding']
1502
 
            dirname = scenario['info']['directory']
1503
 
            filename = scenario['info']['filename']
1504
 
 
1505
 
            self.overrideAttr(diffobj, '_fenc', lambda: encoding)
1506
 
            relpath = dirname + u'/' + filename
1507
 
            fullpath = diffobj._safe_filename('safe', relpath)
1508
 
            self.assertEqual(fullpath,
1509
 
                             fullpath.encode(encoding).decode(encoding))
1510
 
            self.assertTrue(fullpath.startswith(diffobj._root + '/safe'))
1511
 
 
1512
 
    def test_unencodable_filename(self):
1513
 
        diffobj = diff.DiffFromTool(['dummy', '@old_path', '@new_path'],
1514
 
                                    None, None, None)
1515
 
        for _, scenario in EncodingAdapter.encoding_scenarios:
1516
 
            encoding = scenario['encoding']
1517
 
            dirname = scenario['info']['directory']
1518
 
            filename = scenario['info']['filename']
1519
 
 
1520
 
            if encoding == 'iso-8859-1':
1521
 
                encoding = 'iso-8859-2'
1522
 
            else:
1523
 
                encoding = 'iso-8859-1'
1524
 
 
1525
 
            self.overrideAttr(diffobj, '_fenc', lambda: encoding)
1526
 
            relpath = dirname + u'/' + filename
1527
 
            fullpath = diffobj._safe_filename('safe', relpath)
1528
 
            self.assertEqual(fullpath,
1529
 
                             fullpath.encode(encoding).decode(encoding))
1530
 
            self.assertTrue(fullpath.startswith(diffobj._root + '/safe'))
1531
 
 
1532
 
 
1533
 
class TestGetTreesAndBranchesToDiffLocked(tests.TestCaseWithTransport):
1534
 
 
1535
 
    def call_gtabtd(self, path_list, revision_specs, old_url, new_url):
1536
 
        """Call get_trees_and_branches_to_diff_locked."""
1537
 
        return diff.get_trees_and_branches_to_diff_locked(
1538
 
            path_list, revision_specs, old_url, new_url, self.addCleanup)
1539
 
 
1540
 
    def test_basic(self):
1541
 
        tree = self.make_branch_and_tree('tree')
1542
 
        (old_tree, new_tree,
1543
 
         old_branch, new_branch,
1544
 
         specific_files, extra_trees) = self.call_gtabtd(
1545
 
             ['tree'], None, None, None)
1546
 
 
1547
 
        self.assertIsInstance(old_tree, revisiontree.RevisionTree)
1548
 
        self.assertEqual(_mod_revision.NULL_REVISION,
1549
 
                         old_tree.get_revision_id())
1550
 
        self.assertEqual(tree.basedir, new_tree.basedir)
1551
 
        self.assertEqual(tree.branch.base, old_branch.base)
1552
 
        self.assertEqual(tree.branch.base, new_branch.base)
1553
 
        self.assertIs(None, specific_files)
1554
 
        self.assertIs(None, extra_trees)
1555
 
 
1556
 
    def test_with_rev_specs(self):
1557
 
        tree = self.make_branch_and_tree('tree')
1558
 
        self.build_tree_contents([('tree/file', 'oldcontent')])
1559
 
        tree.add('file', 'file-id')
1560
 
        tree.commit('old tree', timestamp=0, rev_id="old-id")
1561
 
        self.build_tree_contents([('tree/file', 'newcontent')])
1562
 
        tree.commit('new tree', timestamp=0, rev_id="new-id")
1563
 
 
1564
 
        revisions = [revisionspec.RevisionSpec.from_string('1'),
1565
 
                     revisionspec.RevisionSpec.from_string('2')]
1566
 
        (old_tree, new_tree,
1567
 
         old_branch, new_branch,
1568
 
         specific_files, extra_trees) = self.call_gtabtd(
1569
 
            ['tree'], revisions, None, None)
1570
 
 
1571
 
        self.assertIsInstance(old_tree, revisiontree.RevisionTree)
1572
 
        self.assertEqual("old-id", old_tree.get_revision_id())
1573
 
        self.assertIsInstance(new_tree, revisiontree.RevisionTree)
1574
 
        self.assertEqual("new-id", new_tree.get_revision_id())
1575
 
        self.assertEqual(tree.branch.base, old_branch.base)
1576
 
        self.assertEqual(tree.branch.base, new_branch.base)
1577
 
        self.assertIs(None, specific_files)
1578
 
        self.assertEqual(tree.basedir, extra_trees[0].basedir)
 
1304
        diff_obj._prepare_files('file-id', 'oldname2', 'newname2')