/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/diff.py

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
1
 
# Copyright (C) 2005-2014 Canonical Ltd.
 
1
# Copyright (C) 2005-2010 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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from __future__ import absolute_import
18
 
 
19
17
import difflib
20
18
import os
21
19
import re
22
20
import string
23
21
import sys
24
22
 
25
 
from .lazy_import import lazy_import
 
23
from bzrlib.lazy_import import lazy_import
26
24
lazy_import(globals(), """
27
25
import errno
28
 
import patiencediff
29
26
import subprocess
30
27
import tempfile
 
28
import time
31
29
 
32
 
from breezy import (
 
30
from bzrlib import (
 
31
    branch as _mod_branch,
 
32
    bzrdir,
33
33
    cmdline,
34
 
    controldir,
 
34
    cleanup,
35
35
    errors,
36
36
    osutils,
 
37
    patiencediff,
37
38
    textfile,
38
39
    timestamp,
39
40
    views,
40
41
    )
41
42
 
42
 
from breezy.workingtree import WorkingTree
43
 
from breezy.i18n import gettext
 
43
from bzrlib.workingtree import WorkingTree
44
44
""")
45
45
 
46
 
from .registry import (
 
46
from bzrlib.registry import (
47
47
    Registry,
48
48
    )
49
 
from .sixish import text_type
50
 
from .trace import mutter, note, warning
51
 
from .tree import FileTimestampUnavailable
52
 
 
53
 
 
54
 
DEFAULT_CONTEXT_AMOUNT = 3
 
49
from bzrlib.symbol_versioning import (
 
50
    deprecated_function,
 
51
    deprecated_in,
 
52
    )
 
53
from bzrlib.trace import mutter, note, warning
55
54
 
56
55
 
57
56
class AtTemplate(string.Template):
74
73
        self.opcodes = None
75
74
 
76
75
 
77
 
def internal_diff(old_label, oldlines, new_label, newlines, to_file,
 
76
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file,
78
77
                  allow_binary=False, sequence_matcher=None,
79
 
                  path_encoding='utf8', context_lines=DEFAULT_CONTEXT_AMOUNT):
 
78
                  path_encoding='utf8'):
80
79
    # FIXME: difflib is wrong if there is no trailing newline.
81
80
    # The syntax used by patch seems to be "\ No newline at
82
81
    # end of file" following the last diff line from that
87
86
    # In the meantime we at least make sure the patch isn't
88
87
    # mangled.
89
88
 
 
89
 
 
90
    # Special workaround for Python2.3, where difflib fails if
 
91
    # both sequences are empty.
 
92
    if not oldlines and not newlines:
 
93
        return
 
94
 
90
95
    if allow_binary is False:
91
96
        textfile.check_text_lines(oldlines)
92
97
        textfile.check_text_lines(newlines)
93
98
 
94
99
    if sequence_matcher is None:
95
100
        sequence_matcher = patiencediff.PatienceSequenceMatcher
96
 
    ud = unified_diff_bytes(
97
 
        oldlines, newlines,
98
 
        fromfile=old_label.encode(path_encoding, 'replace'),
99
 
        tofile=new_label.encode(path_encoding, 'replace'),
100
 
        n=context_lines, sequencematcher=sequence_matcher)
 
101
    ud = patiencediff.unified_diff(oldlines, newlines,
 
102
                      fromfile=old_filename.encode(path_encoding),
 
103
                      tofile=new_filename.encode(path_encoding),
 
104
                      sequencematcher=sequence_matcher)
101
105
 
102
106
    ud = list(ud)
103
 
    if len(ud) == 0:  # Identical contents, nothing to do
 
107
    if len(ud) == 0: # Identical contents, nothing to do
104
108
        return
105
109
    # work-around for difflib being too smart for its own good
106
110
    # if /dev/null is "1,0", patch won't recognize it as /dev/null
107
111
    if not oldlines:
108
 
        ud[2] = ud[2].replace(b'-1,0', b'-0,0')
 
112
        ud[2] = ud[2].replace('-1,0', '-0,0')
109
113
    elif not newlines:
110
 
        ud[2] = ud[2].replace(b'+1,0', b'+0,0')
 
114
        ud[2] = ud[2].replace('+1,0', '+0,0')
111
115
 
112
116
    for line in ud:
113
117
        to_file.write(line)
114
 
        if not line.endswith(b'\n'):
115
 
            to_file.write(b"\n\\ No newline at end of file\n")
116
 
    to_file.write(b'\n')
117
 
 
118
 
 
119
 
def unified_diff_bytes(a, b, fromfile=b'', tofile=b'', fromfiledate=b'',
120
 
                       tofiledate=b'', n=3, lineterm=b'\n', sequencematcher=None):
121
 
    r"""
122
 
    Compare two sequences of lines; generate the delta as a unified diff.
123
 
 
124
 
    Unified diffs are a compact way of showing line changes and a few
125
 
    lines of context.  The number of context lines is set by 'n' which
126
 
    defaults to three.
127
 
 
128
 
    By default, the diff control lines (those with ---, +++, or @@) are
129
 
    created with a trailing newline.  This is helpful so that inputs
130
 
    created from file.readlines() result in diffs that are suitable for
131
 
    file.writelines() since both the inputs and outputs have trailing
132
 
    newlines.
133
 
 
134
 
    For inputs that do not have trailing newlines, set the lineterm
135
 
    argument to "" so that the output will be uniformly newline free.
136
 
 
137
 
    The unidiff format normally has a header for filenames and modification
138
 
    times.  Any or all of these may be specified using strings for
139
 
    'fromfile', 'tofile', 'fromfiledate', and 'tofiledate'.  The modification
140
 
    times are normally expressed in the format returned by time.ctime().
141
 
 
142
 
    Example:
143
 
 
144
 
    >>> for line in bytes_unified_diff(b'one two three four'.split(),
145
 
    ...             b'zero one tree four'.split(), b'Original', b'Current',
146
 
    ...             b'Sat Jan 26 23:30:50 1991', b'Fri Jun 06 10:20:52 2003',
147
 
    ...             lineterm=b''):
148
 
    ...     print line
149
 
    --- Original Sat Jan 26 23:30:50 1991
150
 
    +++ Current Fri Jun 06 10:20:52 2003
151
 
    @@ -1,4 +1,4 @@
152
 
    +zero
153
 
     one
154
 
    -two
155
 
    -three
156
 
    +tree
157
 
     four
158
 
    """
159
 
    if sequencematcher is None:
160
 
        sequencematcher = difflib.SequenceMatcher
161
 
 
162
 
    if fromfiledate:
163
 
        fromfiledate = b'\t' + bytes(fromfiledate)
164
 
    if tofiledate:
165
 
        tofiledate = b'\t' + bytes(tofiledate)
166
 
 
167
 
    started = False
168
 
    for group in sequencematcher(None, a, b).get_grouped_opcodes(n):
169
 
        if not started:
170
 
            yield b'--- %s%s%s' % (fromfile, fromfiledate, lineterm)
171
 
            yield b'+++ %s%s%s' % (tofile, tofiledate, lineterm)
172
 
            started = True
173
 
        i1, i2, j1, j2 = group[0][1], group[-1][2], group[0][3], group[-1][4]
174
 
        yield b"@@ -%d,%d +%d,%d @@%s" % (i1 + 1, i2 - i1, j1 + 1, j2 - j1, lineterm)
175
 
        for tag, i1, i2, j1, j2 in group:
176
 
            if tag == 'equal':
177
 
                for line in a[i1:i2]:
178
 
                    yield b' ' + line
179
 
                continue
180
 
            if tag == 'replace' or tag == 'delete':
181
 
                for line in a[i1:i2]:
182
 
                    yield b'-' + line
183
 
            if tag == 'replace' or tag == 'insert':
184
 
                for line in b[j1:j2]:
185
 
                    yield b'+' + line
 
118
        if not line.endswith('\n'):
 
119
            to_file.write("\n\\ No newline at end of file\n")
 
120
    to_file.write('\n')
186
121
 
187
122
 
188
123
def _spawn_external_diff(diffcmd, capture_errors=True):
189
 
    """Spawn the external diff process, and return the child handle.
 
124
    """Spawn the externall diff process, and return the child handle.
190
125
 
191
126
    :param diffcmd: The command list to spawn
192
127
    :param capture_errors: Capture stderr as well as setting LANG=C
214
149
                                stdout=subprocess.PIPE,
215
150
                                stderr=stderr,
216
151
                                env=env)
217
 
    except OSError as e:
 
152
    except OSError, e:
218
153
        if e.errno == errno.ENOENT:
219
154
            raise errors.NoDiff(str(e))
220
155
        raise
222
157
    return pipe
223
158
 
224
159
 
225
 
# diff style options as of GNU diff v3.2
226
 
style_option_list = ['-c', '-C', '--context',
227
 
                     '-e', '--ed',
228
 
                     '-f', '--forward-ed',
229
 
                     '-q', '--brief',
230
 
                     '--normal',
231
 
                     '-n', '--rcs',
232
 
                     '-u', '-U', '--unified',
233
 
                     '-y', '--side-by-side',
234
 
                     '-D', '--ifdef']
235
 
 
236
 
 
237
 
def default_style_unified(diff_opts):
238
 
    """Default to unified diff style if alternative not specified in diff_opts.
239
 
 
240
 
        diff only allows one style to be specified; they don't override.
241
 
        Note that some of these take optargs, and the optargs can be
242
 
        directly appended to the options.
243
 
        This is only an approximate parser; it doesn't properly understand
244
 
        the grammar.
245
 
 
246
 
    :param diff_opts: List of options for external (GNU) diff.
247
 
    :return: List of options with default style=='unified'.
248
 
    """
249
 
    for s in style_option_list:
250
 
        for j in diff_opts:
251
 
            if j.startswith(s):
252
 
                break
253
 
        else:
254
 
            continue
255
 
        break
256
 
    else:
257
 
        diff_opts.append('-u')
258
 
    return diff_opts
259
 
 
260
 
 
261
 
def external_diff(old_label, oldlines, new_label, newlines, to_file,
 
160
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
262
161
                  diff_opts):
263
162
    """Display a diff by calling out to the external diff program."""
264
163
    # make sure our own output is properly ordered before the diff
265
164
    to_file.flush()
266
165
 
267
 
    oldtmp_fd, old_abspath = tempfile.mkstemp(prefix='brz-diff-old-')
268
 
    newtmp_fd, new_abspath = tempfile.mkstemp(prefix='brz-diff-new-')
 
166
    oldtmp_fd, old_abspath = tempfile.mkstemp(prefix='bzr-diff-old-')
 
167
    newtmp_fd, new_abspath = tempfile.mkstemp(prefix='bzr-diff-new-')
269
168
    oldtmpf = os.fdopen(oldtmp_fd, 'wb')
270
169
    newtmpf = os.fdopen(newtmp_fd, 'wb')
271
170
 
288
187
        if sys.platform == 'win32':
289
188
            # Popen doesn't do the proper encoding for external commands
290
189
            # Since we are dealing with an ANSI api, use mbcs encoding
291
 
            old_label = old_label.encode('mbcs')
292
 
            new_label = new_label.encode('mbcs')
 
190
            old_filename = old_filename.encode('mbcs')
 
191
            new_filename = new_filename.encode('mbcs')
293
192
        diffcmd = ['diff',
294
 
                   '--label', old_label,
 
193
                   '--label', old_filename,
295
194
                   old_abspath,
296
 
                   '--label', new_label,
 
195
                   '--label', new_filename,
297
196
                   new_abspath,
298
197
                   '--binary',
299
 
                   ]
 
198
                  ]
300
199
 
301
 
        diff_opts = default_style_unified(diff_opts)
 
200
        # diff only allows one style to be specified; they don't override.
 
201
        # note that some of these take optargs, and the optargs can be
 
202
        # directly appended to the options.
 
203
        # this is only an approximate parser; it doesn't properly understand
 
204
        # the grammar.
 
205
        for s in ['-c', '-u', '-C', '-U',
 
206
                  '-e', '--ed',
 
207
                  '-q', '--brief',
 
208
                  '--normal',
 
209
                  '-n', '--rcs',
 
210
                  '-y', '--side-by-side',
 
211
                  '-D', '--ifdef']:
 
212
            for j in diff_opts:
 
213
                if j.startswith(s):
 
214
                    break
 
215
            else:
 
216
                continue
 
217
            break
 
218
        else:
 
219
            diffcmd.append('-u')
302
220
 
303
221
        if diff_opts:
304
222
            diffcmd.extend(diff_opts)
305
223
 
306
224
        pipe = _spawn_external_diff(diffcmd, capture_errors=True)
307
 
        out, err = pipe.communicate()
 
225
        out,err = pipe.communicate()
308
226
        rc = pipe.returncode
309
227
 
310
228
        # internal_diff() adds a trailing newline, add one here for consistency
311
 
        out += b'\n'
 
229
        out += '\n'
312
230
        if rc == 2:
313
231
            # 'diff' gives retcode == 2 for all sorts of errors
314
232
            # one of those is 'Binary files differ'.
321
239
            out, err = pipe.communicate()
322
240
 
323
241
            # Write out the new i18n diff response
324
 
            to_file.write(out + b'\n')
 
242
            to_file.write(out+'\n')
325
243
            if pipe.returncode != 2:
326
244
                raise errors.BzrError(
327
 
                    'external diff failed with exit code 2'
328
 
                    ' when run with LANG=C and LC_ALL=C,'
329
 
                    ' but not when run natively: %r' % (diffcmd,))
 
245
                               'external diff failed with exit code 2'
 
246
                               ' when run with LANG=C and LC_ALL=C,'
 
247
                               ' but not when run natively: %r' % (diffcmd,))
330
248
 
331
 
            first_line = lang_c_out.split(b'\n', 1)[0]
 
249
            first_line = lang_c_out.split('\n', 1)[0]
332
250
            # Starting with diffutils 2.8.4 the word "binary" was dropped.
333
 
            m = re.match(b'^(binary )?files.*differ$', first_line, re.I)
 
251
            m = re.match('^(binary )?files.*differ$', first_line, re.I)
334
252
            if m is None:
335
253
                raise errors.BzrError('external diff failed with exit code 2;'
336
254
                                      ' command: %r' % (diffcmd,))
349
267
                msg = 'exit code %d' % rc
350
268
 
351
269
            raise errors.BzrError('external diff failed with %s; command: %r'
352
 
                                  % (msg, diffcmd))
 
270
                                  % (rc, diffcmd))
 
271
 
353
272
 
354
273
    finally:
355
274
        oldtmpf.close()                 # and delete
356
275
        newtmpf.close()
357
 
 
358
 
        def cleanup(path):
359
 
            # Warn in case the file couldn't be deleted (in case windows still
360
 
            # holds the file open, but not if the files have already been
361
 
            # deleted)
362
 
            try:
363
 
                os.remove(path)
364
 
            except OSError as e:
365
 
                if e.errno not in (errno.ENOENT,):
366
 
                    warning('Failed to delete temporary file: %s %s', path, e)
367
 
 
368
 
        cleanup(old_abspath)
369
 
        cleanup(new_abspath)
370
 
 
 
276
        # Clean up. Warn in case the files couldn't be deleted
 
277
        # (in case windows still holds the file open, but not
 
278
        # if the files have already been deleted)
 
279
        try:
 
280
            os.remove(old_abspath)
 
281
        except OSError, e:
 
282
            if e.errno not in (errno.ENOENT,):
 
283
                warning('Failed to delete temporary file: %s %s',
 
284
                        old_abspath, e)
 
285
        try:
 
286
            os.remove(new_abspath)
 
287
        except OSError:
 
288
            if e.errno not in (errno.ENOENT,):
 
289
                warning('Failed to delete temporary file: %s %s',
 
290
                        new_abspath, e)
 
291
 
 
292
 
 
293
@deprecated_function(deprecated_in((2, 2, 0)))
 
294
def get_trees_and_branches_to_diff(path_list, revision_specs, old_url, new_url,
 
295
                                   apply_view=True):
 
296
    """Get the trees and specific files to diff given a list of paths.
 
297
 
 
298
    This method works out the trees to be diff'ed and the files of
 
299
    interest within those trees.
 
300
 
 
301
    :param path_list:
 
302
        the list of arguments passed to the diff command
 
303
    :param revision_specs:
 
304
        Zero, one or two RevisionSpecs from the diff command line,
 
305
        saying what revisions to compare.
 
306
    :param old_url:
 
307
        The url of the old branch or tree. If None, the tree to use is
 
308
        taken from the first path, if any, or the current working tree.
 
309
    :param new_url:
 
310
        The url of the new branch or tree. If None, the tree to use is
 
311
        taken from the first path, if any, or the current working tree.
 
312
    :param apply_view:
 
313
        if True and a view is set, apply the view or check that the paths
 
314
        are within it
 
315
    :returns:
 
316
        a tuple of (old_tree, new_tree, old_branch, new_branch,
 
317
        specific_files, extra_trees) where extra_trees is a sequence of
 
318
        additional trees to search in for file-ids.  The trees and branches
 
319
        are not locked.
 
320
    """
 
321
    op = cleanup.OperationWithCleanups(get_trees_and_branches_to_diff_locked)
 
322
    return op.run_simple(path_list, revision_specs, old_url, new_url,
 
323
            op.add_cleanup, apply_view=apply_view)
 
324
    
371
325
 
372
326
def get_trees_and_branches_to_diff_locked(
373
 
        path_list, revision_specs, old_url, new_url, add_cleanup, apply_view=True):
 
327
    path_list, revision_specs, old_url, new_url, add_cleanup, apply_view=True):
374
328
    """Get the trees and specific files to diff given a list of paths.
375
329
 
376
330
    This method works out the trees to be diff'ed and the files of
440
394
    if old_url is None:
441
395
        old_url = default_location
442
396
    working_tree, branch, relpath = \
443
 
        controldir.ControlDir.open_containing_tree_or_branch(old_url)
 
397
        bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
444
398
    lock_tree_or_branch(working_tree, branch)
445
399
    if consider_relpath and relpath != '':
446
400
        if working_tree is not None and apply_view:
454
408
        new_url = default_location
455
409
    if new_url != old_url:
456
410
        working_tree, branch, relpath = \
457
 
            controldir.ControlDir.open_containing_tree_or_branch(new_url)
 
411
            bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
458
412
        lock_tree_or_branch(working_tree, branch)
459
413
        if consider_relpath and relpath != '':
460
414
            if working_tree is not None and apply_view:
461
415
                views.check_path_in_view(working_tree, relpath)
462
416
            specific_files.append(relpath)
463
417
    new_tree = _get_tree_to_diff(new_revision_spec, working_tree, branch,
464
 
                                 basis_is_default=working_tree is None)
 
418
        basis_is_default=working_tree is None)
465
419
    new_branch = branch
466
420
 
467
421
    # Get the specific files (all files is None, no files is [])
468
422
    if make_paths_wt_relative and working_tree is not None:
469
 
        other_paths = working_tree.safe_relpath_files(
470
 
            other_paths,
 
423
        try:
 
424
            from bzrlib.builtins import safe_relpath_files
 
425
            other_paths = safe_relpath_files(working_tree, other_paths,
471
426
            apply_view=apply_view)
 
427
        except errors.FileInWrongBranch:
 
428
            raise errors.BzrCommandError("Files are in different branches")
472
429
    specific_files.extend(other_paths)
473
430
    if len(specific_files) == 0:
474
431
        specific_files = None
475
 
        if (working_tree is not None and working_tree.supports_views() and
476
 
                apply_view):
 
432
        if (working_tree is not None and working_tree.supports_views()
 
433
            and apply_view):
477
434
            view_files = working_tree.views.lookup_view()
478
435
            if view_files:
479
436
                specific_files = view_files
480
437
                view_str = views.view_display_str(view_files)
481
 
                note(gettext("*** Ignoring files outside view. View is %s") % view_str)
 
438
                note("*** Ignoring files outside view. View is %s" % view_str)
482
439
 
483
440
    # Get extra trees that ought to be searched for file-ids
484
441
    extra_trees = None
485
442
    if working_tree is not None and working_tree not in (old_tree, new_tree):
486
443
        extra_trees = (working_tree,)
487
 
    return (old_tree, new_tree, old_branch, new_branch,
488
 
            specific_files, extra_trees)
 
444
    return old_tree, new_tree, old_branch, new_branch, specific_files, extra_trees
489
445
 
490
446
 
491
447
def _get_tree_to_diff(spec, tree=None, branch=None, basis_is_default=True):
508
464
                    extra_trees=None,
509
465
                    path_encoding='utf8',
510
466
                    using=None,
511
 
                    format_cls=None,
512
 
                    context=DEFAULT_CONTEXT_AMOUNT):
 
467
                    format_cls=None):
513
468
    """Show in text form the changes from one tree to another.
514
469
 
515
470
    :param to_file: The output stream.
516
 
    :param specific_files: Include only changes to these files - None for all
 
471
    :param specific_files:Include only changes to these files - None for all
517
472
        changes.
518
 
    :param external_diff_options: If set, use an external GNU diff and pass
 
473
    :param external_diff_options: If set, use an external GNU diff and pass 
519
474
        these options.
520
475
    :param extra_trees: If set, more Trees to use for looking up file ids
521
 
    :param path_encoding: If set, the path will be encoded as specified,
 
476
    :param path_encoding: If set, the path will be encoded as specified, 
522
477
        otherwise is supposed to be utf8
523
478
    :param format_cls: Formatter class (DiffTree subclass)
524
479
    """
525
 
    if context is None:
526
 
        context = DEFAULT_CONTEXT_AMOUNT
527
480
    if format_cls is None:
528
481
        format_cls = DiffTree
529
 
    with old_tree.lock_read():
 
482
    old_tree.lock_read()
 
483
    try:
530
484
        if extra_trees is not None:
531
485
            for tree in extra_trees:
532
486
                tree.lock_read()
535
489
            differ = format_cls.from_trees_options(old_tree, new_tree, to_file,
536
490
                                                   path_encoding,
537
491
                                                   external_diff_options,
538
 
                                                   old_label, new_label, using,
539
 
                                                   context_lines=context)
 
492
                                                   old_label, new_label, using)
540
493
            return differ.show_diff(specific_files, extra_trees)
541
494
        finally:
542
495
            new_tree.unlock()
543
496
            if extra_trees is not None:
544
497
                for tree in extra_trees:
545
498
                    tree.unlock()
546
 
 
547
 
 
548
 
def _patch_header_date(tree, path):
 
499
    finally:
 
500
        old_tree.unlock()
 
501
 
 
502
 
 
503
def _patch_header_date(tree, file_id, path):
549
504
    """Returns a timestamp suitable for use in a patch header."""
550
505
    try:
551
 
        mtime = tree.get_file_mtime(path)
552
 
    except FileTimestampUnavailable:
 
506
        mtime = tree.get_file_mtime(file_id, path)
 
507
    except errors.FileTimestampUnavailable:
553
508
        mtime = 0
554
509
    return timestamp.format_patch_date(mtime)
555
510
 
556
511
 
557
512
def get_executable_change(old_is_x, new_is_x):
558
 
    descr = {True: b"+x", False: b"-x", None: b"??"}
 
513
    descr = { True:"+x", False:"-x", None:"??" }
559
514
    if old_is_x != new_is_x:
560
 
        return [b"%s to %s" % (descr[old_is_x], descr[new_is_x],)]
 
515
        return ["%s to %s" % (descr[old_is_x], descr[new_is_x],)]
561
516
    else:
562
517
        return []
563
518
 
594
549
                     diff_tree.to_file, diff_tree.path_encoding)
595
550
 
596
551
    @staticmethod
597
 
    def _diff_many(differs, old_path, new_path, old_kind, new_kind):
 
552
    def _diff_many(differs, file_id, old_path, new_path, old_kind, new_kind):
598
553
        for file_differ in differs:
599
 
            result = file_differ.diff(old_path, new_path, old_kind, new_kind)
 
554
            result = file_differ.diff(file_id, old_path, new_path, old_kind,
 
555
                                      new_kind)
600
556
            if result is not DiffPath.CANNOT_DIFF:
601
557
                return result
602
558
        else:
609
565
    Represents kind change as deletion + creation.  Uses the other differs
610
566
    to do this.
611
567
    """
612
 
 
613
568
    def __init__(self, differs):
614
569
        self.differs = differs
615
570
 
620
575
    def from_diff_tree(klass, diff_tree):
621
576
        return klass(diff_tree.differs)
622
577
 
623
 
    def diff(self, old_path, new_path, old_kind, new_kind):
 
578
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
624
579
        """Perform comparison
625
580
 
 
581
        :param file_id: The file_id of the file to compare
626
582
        :param old_path: Path of the file in the old tree
627
583
        :param new_path: Path of the file in the new tree
628
584
        :param old_kind: Old file-kind of the file
630
586
        """
631
587
        if None in (old_kind, new_kind):
632
588
            return DiffPath.CANNOT_DIFF
633
 
        result = DiffPath._diff_many(
634
 
            self.differs, old_path, new_path, old_kind, None)
 
589
        result = DiffPath._diff_many(self.differs, file_id, old_path,
 
590
                                       new_path, old_kind, None)
635
591
        if result is DiffPath.CANNOT_DIFF:
636
592
            return result
637
 
        return DiffPath._diff_many(
638
 
            self.differs, old_path, new_path, None, new_kind)
639
 
 
640
 
 
641
 
class DiffTreeReference(DiffPath):
642
 
 
643
 
    def diff(self, old_path, new_path, old_kind, new_kind):
644
 
        """Perform comparison between two tree references.  (dummy)
645
 
 
646
 
        """
647
 
        if 'tree-reference' not in (old_kind, new_kind):
648
 
            return self.CANNOT_DIFF
649
 
        if old_kind not in ('tree-reference', None):
650
 
            return self.CANNOT_DIFF
651
 
        if new_kind not in ('tree-reference', None):
652
 
            return self.CANNOT_DIFF
653
 
        return self.CHANGED
 
593
        return DiffPath._diff_many(self.differs, file_id, old_path, new_path,
 
594
                                     None, new_kind)
654
595
 
655
596
 
656
597
class DiffDirectory(DiffPath):
657
598
 
658
 
    def diff(self, old_path, new_path, old_kind, new_kind):
 
599
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
659
600
        """Perform comparison between two directories.  (dummy)
660
601
 
661
602
        """
670
611
 
671
612
class DiffSymlink(DiffPath):
672
613
 
673
 
    def diff(self, old_path, new_path, old_kind, new_kind):
 
614
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
674
615
        """Perform comparison between two symlinks
675
616
 
 
617
        :param file_id: The file_id of the file to compare
676
618
        :param old_path: Path of the file in the old tree
677
619
        :param new_path: Path of the file in the new tree
678
620
        :param old_kind: Old file-kind of the file
681
623
        if 'symlink' not in (old_kind, new_kind):
682
624
            return self.CANNOT_DIFF
683
625
        if old_kind == 'symlink':
684
 
            old_target = self.old_tree.get_symlink_target(old_path)
 
626
            old_target = self.old_tree.get_symlink_target(file_id)
685
627
        elif old_kind is None:
686
628
            old_target = None
687
629
        else:
688
630
            return self.CANNOT_DIFF
689
631
        if new_kind == 'symlink':
690
 
            new_target = self.new_tree.get_symlink_target(new_path)
 
632
            new_target = self.new_tree.get_symlink_target(file_id)
691
633
        elif new_kind is None:
692
634
            new_target = None
693
635
        else:
696
638
 
697
639
    def diff_symlink(self, old_target, new_target):
698
640
        if old_target is None:
699
 
            self.to_file.write(b'=== target is \'%s\'\n' %
700
 
                               new_target.encode(self.path_encoding, 'replace'))
 
641
            self.to_file.write('=== target is %r\n' % new_target)
701
642
        elif new_target is None:
702
 
            self.to_file.write(b'=== target was \'%s\'\n' %
703
 
                               old_target.encode(self.path_encoding, 'replace'))
 
643
            self.to_file.write('=== target was %r\n' % old_target)
704
644
        else:
705
 
            self.to_file.write(b'=== target changed \'%s\' => \'%s\'\n' %
706
 
                               (old_target.encode(self.path_encoding, 'replace'),
707
 
                                new_target.encode(self.path_encoding, 'replace')))
 
645
            self.to_file.write('=== target changed %r => %r\n' %
 
646
                              (old_target, new_target))
708
647
        return self.CHANGED
709
648
 
710
649
 
715
654
    EPOCH_DATE = '1970-01-01 00:00:00 +0000'
716
655
 
717
656
    def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
718
 
                 old_label='', new_label='', text_differ=internal_diff,
719
 
                 context_lines=DEFAULT_CONTEXT_AMOUNT):
 
657
                 old_label='', new_label='', text_differ=internal_diff):
720
658
        DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
721
659
        self.text_differ = text_differ
722
660
        self.old_label = old_label
723
661
        self.new_label = new_label
724
662
        self.path_encoding = path_encoding
725
 
        self.context_lines = context_lines
726
663
 
727
 
    def diff(self, old_path, new_path, old_kind, new_kind):
 
664
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
728
665
        """Compare two files in unified diff format
729
666
 
 
667
        :param file_id: The file_id of the file to compare
730
668
        :param old_path: Path of the file in the old tree
731
669
        :param new_path: Path of the file in the new tree
732
670
        :param old_kind: Old file-kind of the file
734
672
        """
735
673
        if 'file' not in (old_kind, new_kind):
736
674
            return self.CANNOT_DIFF
 
675
        from_file_id = to_file_id = file_id
737
676
        if old_kind == 'file':
738
 
            old_date = _patch_header_date(self.old_tree, old_path)
 
677
            old_date = _patch_header_date(self.old_tree, file_id, old_path)
739
678
        elif old_kind is None:
740
679
            old_date = self.EPOCH_DATE
 
680
            from_file_id = None
741
681
        else:
742
682
            return self.CANNOT_DIFF
743
683
        if new_kind == 'file':
744
 
            new_date = _patch_header_date(self.new_tree, new_path)
 
684
            new_date = _patch_header_date(self.new_tree, file_id, new_path)
745
685
        elif new_kind is None:
746
686
            new_date = self.EPOCH_DATE
 
687
            to_file_id = None
747
688
        else:
748
689
            return self.CANNOT_DIFF
749
 
        from_label = '%s%s\t%s' % (self.old_label, old_path,
750
 
                                   old_date)
751
 
        to_label = '%s%s\t%s' % (self.new_label, new_path,
752
 
                                 new_date)
753
 
        return self.diff_text(old_path, new_path, from_label, to_label)
 
690
        from_label = '%s%s\t%s' % (self.old_label, old_path, old_date)
 
691
        to_label = '%s%s\t%s' % (self.new_label, new_path, new_date)
 
692
        return self.diff_text(from_file_id, to_file_id, from_label, to_label,
 
693
            old_path, new_path)
754
694
 
755
 
    def diff_text(self, from_path, to_path, from_label, to_label):
 
695
    def diff_text(self, from_file_id, to_file_id, from_label, to_label,
 
696
        from_path=None, to_path=None):
756
697
        """Diff the content of given files in two trees
757
698
 
758
 
        :param from_path: The path in the from tree. If None,
 
699
        :param from_file_id: The id of the file in the from tree.  If None,
759
700
            the file is not present in the from tree.
760
 
        :param to_path: The path in the to tree. This may refer
761
 
            to a different file from from_path.  If None,
 
701
        :param to_file_id: The id of the file in the to tree.  This may refer
 
702
            to a different file from from_file_id.  If None,
762
703
            the file is not present in the to tree.
 
704
        :param from_path: The path in the from tree or None if unknown.
 
705
        :param to_path: The path in the to tree or None if unknown.
763
706
        """
764
 
        def _get_text(tree, path):
765
 
            if path is None:
766
 
                return []
767
 
            try:
768
 
                return tree.get_file_lines(path)
769
 
            except errors.NoSuchFile:
 
707
        def _get_text(tree, file_id, path):
 
708
            if file_id is not None:
 
709
                return tree.get_file(file_id, path).readlines()
 
710
            else:
770
711
                return []
771
712
        try:
772
 
            from_text = _get_text(self.old_tree, from_path)
773
 
            to_text = _get_text(self.new_tree, to_path)
 
713
            from_text = _get_text(self.old_tree, from_file_id, from_path)
 
714
            to_text = _get_text(self.new_tree, to_file_id, to_path)
774
715
            self.text_differ(from_label, from_text, to_label, to_text,
775
 
                             self.to_file, path_encoding=self.path_encoding,
776
 
                             context_lines=self.context_lines)
 
716
                             self.to_file)
777
717
        except errors.BinaryFile:
778
718
            self.to_file.write(
779
 
                ("Binary files %s and %s differ\n" %
780
 
                 (from_label, to_label)).encode(self.path_encoding, 'replace'))
 
719
                  ("Binary files %s and %s differ\n" %
 
720
                  (from_label, to_label)).encode(self.path_encoding))
781
721
        return self.CHANGED
782
722
 
783
723
 
787
727
                 path_encoding='utf-8'):
788
728
        DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
789
729
        self.command_template = command_template
790
 
        self._root = osutils.mkdtemp(prefix='brz-diff-')
 
730
        self._root = osutils.mkdtemp(prefix='bzr-diff-')
791
731
 
792
732
    @classmethod
793
733
    def from_string(klass, command_string, old_tree, new_tree, to_file,
799
739
                     path_encoding)
800
740
 
801
741
    @classmethod
802
 
    def make_from_diff_tree(klass, command_string, external_diff_options=None):
 
742
    def make_from_diff_tree(klass, command_string):
803
743
        def from_diff_tree(diff_tree):
804
 
            full_command_string = [command_string]
805
 
            if external_diff_options is not None:
806
 
                full_command_string += ' ' + external_diff_options
807
 
            return klass.from_string(full_command_string, diff_tree.old_tree,
 
744
            return klass.from_string(command_string, diff_tree.old_tree,
808
745
                                     diff_tree.new_tree, diff_tree.to_file)
809
746
        return from_diff_tree
810
747
 
811
748
    def _get_command(self, old_path, new_path):
812
749
        my_map = {'old_path': old_path, 'new_path': new_path}
813
 
        command = [AtTemplate(t).substitute(my_map) for t in
814
 
                   self.command_template]
815
 
        if sys.platform == 'win32':  # Popen doesn't accept unicode on win32
816
 
            command_encoded = []
817
 
            for c in command:
818
 
                if isinstance(c, text_type):
819
 
                    command_encoded.append(c.encode('mbcs'))
820
 
                else:
821
 
                    command_encoded.append(c)
822
 
            return command_encoded
823
 
        else:
824
 
            return command
 
750
        return [AtTemplate(t).substitute(my_map) for t in
 
751
                self.command_template]
825
752
 
826
753
    def _execute(self, old_path, new_path):
827
754
        command = self._get_command(old_path, new_path)
828
755
        try:
829
756
            proc = subprocess.Popen(command, stdout=subprocess.PIPE,
830
757
                                    cwd=self._root)
831
 
        except OSError as e:
 
758
        except OSError, e:
832
759
            if e.errno == errno.ENOENT:
833
760
                raise errors.ExecutableMissing(command[0])
834
761
            else:
835
762
                raise
836
763
        self.to_file.write(proc.stdout.read())
837
 
        proc.stdout.close()
838
764
        return proc.wait()
839
765
 
840
766
    def _try_symlink_root(self, tree, prefix):
841
 
        if (getattr(tree, 'abspath', None) is None or
842
 
                not osutils.host_os_dereferences_symlinks()):
 
767
        if (getattr(tree, 'abspath', None) is None
 
768
            or not osutils.host_os_dereferences_symlinks()):
843
769
            return False
844
770
        try:
845
771
            os.symlink(tree.abspath(''), osutils.pathjoin(self._root, prefix))
846
 
        except OSError as e:
 
772
        except OSError, e:
847
773
            if e.errno != errno.EEXIST:
848
774
                raise
849
775
        return True
850
776
 
851
 
    @staticmethod
852
 
    def _fenc():
853
 
        """Returns safe encoding for passing file path to diff tool"""
854
 
        if sys.platform == 'win32':
855
 
            return 'mbcs'
856
 
        else:
857
 
            # Don't fallback to 'utf-8' because subprocess may not be able to
858
 
            # handle utf-8 correctly when locale is not utf-8.
859
 
            return sys.getfilesystemencoding() or 'ascii'
860
 
 
861
 
    def _is_safepath(self, path):
862
 
        """Return true if `path` may be able to pass to subprocess."""
863
 
        fenc = self._fenc()
864
 
        try:
865
 
            return path == path.encode(fenc).decode(fenc)
866
 
        except UnicodeError:
867
 
            return False
868
 
 
869
 
    def _safe_filename(self, prefix, relpath):
870
 
        """Replace unsafe character in `relpath` then join `self._root`,
871
 
        `prefix` and `relpath`."""
872
 
        fenc = self._fenc()
873
 
        # encoded_str.replace('?', '_') may break multibyte char.
874
 
        # So we should encode, decode, then replace(u'?', u'_')
875
 
        relpath_tmp = relpath.encode(fenc, 'replace').decode(fenc, 'replace')
876
 
        relpath_tmp = relpath_tmp.replace(u'?', u'_')
877
 
        return osutils.pathjoin(self._root, prefix, relpath_tmp)
878
 
 
879
 
    def _write_file(self, relpath, tree, prefix, force_temp=False,
 
777
    def _write_file(self, file_id, tree, prefix, relpath, force_temp=False,
880
778
                    allow_write=False):
881
779
        if not force_temp and isinstance(tree, WorkingTree):
882
 
            full_path = tree.abspath(relpath)
883
 
            if self._is_safepath(full_path):
884
 
                return full_path
885
 
 
886
 
        full_path = self._safe_filename(prefix, relpath)
 
780
            return tree.abspath(tree.id2path(file_id))
 
781
        
 
782
        full_path = osutils.pathjoin(self._root, prefix, relpath)
887
783
        if not force_temp and self._try_symlink_root(tree, prefix):
888
784
            return full_path
889
785
        parent_dir = osutils.dirname(full_path)
890
786
        try:
891
787
            os.makedirs(parent_dir)
892
 
        except OSError as e:
 
788
        except OSError, e:
893
789
            if e.errno != errno.EEXIST:
894
790
                raise
895
 
        source = tree.get_file(relpath)
 
791
        source = tree.get_file(file_id, relpath)
896
792
        try:
897
 
            with open(full_path, 'wb') as target:
 
793
            target = open(full_path, 'wb')
 
794
            try:
898
795
                osutils.pumpfile(source, target)
 
796
            finally:
 
797
                target.close()
899
798
        finally:
900
799
            source.close()
901
800
        try:
902
 
            mtime = tree.get_file_mtime(relpath)
903
 
        except FileTimestampUnavailable:
 
801
            mtime = tree.get_file_mtime(file_id)
 
802
        except errors.FileTimestampUnavailable:
904
803
            pass
905
804
        else:
906
805
            os.utime(full_path, (mtime, mtime))
908
807
            osutils.make_readonly(full_path)
909
808
        return full_path
910
809
 
911
 
    def _prepare_files(self, old_path, new_path, force_temp=False,
 
810
    def _prepare_files(self, file_id, old_path, new_path, force_temp=False,
912
811
                       allow_write_new=False):
913
 
        old_disk_path = self._write_file(
914
 
            old_path, self.old_tree, 'old', force_temp)
915
 
        new_disk_path = self._write_file(
916
 
            new_path, self.new_tree, 'new', force_temp,
917
 
            allow_write=allow_write_new)
 
812
        old_disk_path = self._write_file(file_id, self.old_tree, 'old',
 
813
                                         old_path, force_temp)
 
814
        new_disk_path = self._write_file(file_id, self.new_tree, 'new',
 
815
                                         new_path, force_temp,
 
816
                                         allow_write=allow_write_new)
918
817
        return old_disk_path, new_disk_path
919
818
 
920
819
    def finish(self):
921
820
        try:
922
821
            osutils.rmtree(self._root)
923
 
        except OSError as e:
 
822
        except OSError, e:
924
823
            if e.errno != errno.ENOENT:
925
824
                mutter("The temporary directory \"%s\" was not "
926
 
                       "cleanly removed: %s." % (self._root, e))
 
825
                        "cleanly removed: %s." % (self._root, e))
927
826
 
928
 
    def diff(self, old_path, new_path, old_kind, new_kind):
 
827
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
929
828
        if (old_kind, new_kind) != ('file', 'file'):
930
829
            return DiffPath.CANNOT_DIFF
931
830
        (old_disk_path, new_disk_path) = self._prepare_files(
932
 
            old_path, new_path)
 
831
                                                file_id, old_path, new_path)
933
832
        self._execute(old_disk_path, new_disk_path)
934
833
 
935
 
    def edit_file(self, old_path, new_path):
 
834
    def edit_file(self, file_id):
936
835
        """Use this tool to edit a file.
937
836
 
938
837
        A temporary copy will be edited, and the new contents will be
939
838
        returned.
940
839
 
 
840
        :param file_id: The id of the file to edit.
941
841
        :return: The new contents of the file.
942
842
        """
943
 
        old_abs_path, new_abs_path = self._prepare_files(
944
 
            old_path, new_path, allow_write_new=True, force_temp=True)
945
 
        command = self._get_command(old_abs_path, new_abs_path)
 
843
        old_path = self.old_tree.id2path(file_id)
 
844
        new_path = self.new_tree.id2path(file_id)
 
845
        new_abs_path = self._prepare_files(file_id, old_path, new_path,
 
846
                                           allow_write_new=True,
 
847
                                           force_temp=True)[1]
 
848
        command = self._get_command(osutils.pathjoin('old', old_path),
 
849
                                    osutils.pathjoin('new', new_path))
946
850
        subprocess.call(command, cwd=self._root)
947
 
        with open(new_abs_path, 'rb') as new_file:
 
851
        new_file = open(new_abs_path, 'r')
 
852
        try:
948
853
            return new_file.read()
 
854
        finally:
 
855
            new_file.close()
949
856
 
950
857
 
951
858
class DiffTree(object):
963
870
    # list of factories that can provide instances of DiffPath objects
964
871
    # may be extended by plugins.
965
872
    diff_factories = [DiffSymlink.from_diff_tree,
966
 
                      DiffDirectory.from_diff_tree,
967
 
                      DiffTreeReference.from_diff_tree]
 
873
                      DiffDirectory.from_diff_tree]
968
874
 
969
875
    def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
970
876
                 diff_text=None, extra_factories=None):
980
886
            DiffPaths"""
981
887
        if diff_text is None:
982
888
            diff_text = DiffText(old_tree, new_tree, to_file, path_encoding,
983
 
                                 '', '', internal_diff)
 
889
                                 '', '',  internal_diff)
984
890
        self.old_tree = old_tree
985
891
        self.new_tree = new_tree
986
892
        self.to_file = to_file
994
900
    @classmethod
995
901
    def from_trees_options(klass, old_tree, new_tree, to_file,
996
902
                           path_encoding, external_diff_options, old_label,
997
 
                           new_label, using, context_lines):
 
903
                           new_label, using):
998
904
        """Factory for producing a DiffTree.
999
905
 
1000
906
        Designed to accept options used by show_diff_trees.
1001
 
 
1002
907
        :param old_tree: The tree to show as old in the comparison
1003
908
        :param new_tree: The tree to show as new in the comparison
1004
909
        :param to_file: File to write comparisons to
1010
915
        :param using: Commandline to use to invoke an external diff tool
1011
916
        """
1012
917
        if using is not None:
1013
 
            extra_factories = [DiffFromTool.make_from_diff_tree(
1014
 
                using, external_diff_options)]
 
918
            extra_factories = [DiffFromTool.make_from_diff_tree(using)]
1015
919
        else:
1016
920
            extra_factories = []
1017
921
        if external_diff_options:
1018
922
            opts = external_diff_options.split()
1019
 
 
1020
 
            def diff_file(olab, olines, nlab, nlines, to_file, path_encoding=None, context_lines=None):
1021
 
                """:param path_encoding: not used but required
1022
 
                        to match the signature of internal_diff.
1023
 
                """
 
923
            def diff_file(olab, olines, nlab, nlines, to_file):
1024
924
                external_diff(olab, olines, nlab, nlines, to_file, opts)
1025
925
        else:
1026
926
            diff_file = internal_diff
1027
927
        diff_text = DiffText(old_tree, new_tree, to_file, path_encoding,
1028
 
                             old_label, new_label, diff_file, context_lines=context_lines)
 
928
                             old_label, new_label, diff_file)
1029
929
        return klass(old_tree, new_tree, to_file, path_encoding, diff_text,
1030
930
                     extra_factories)
1031
931
 
1045
945
        # TODO: Generation of pseudo-diffs for added/deleted files could
1046
946
        # be usefully made into a much faster special case.
1047
947
        iterator = self.new_tree.iter_changes(self.old_tree,
1048
 
                                              specific_files=specific_files,
1049
 
                                              extra_trees=extra_trees,
1050
 
                                              require_versioned=True)
 
948
                                               specific_files=specific_files,
 
949
                                               extra_trees=extra_trees,
 
950
                                               require_versioned=True)
1051
951
        has_changes = 0
1052
 
 
1053
952
        def changes_key(change):
1054
953
            old_path, new_path = change[1]
1055
954
            path = new_path
1056
955
            if path is None:
1057
956
                path = old_path
1058
957
            return path
1059
 
 
1060
958
        def get_encoded_path(path):
1061
959
            if path is not None:
1062
960
                return path.encode(self.path_encoding, "replace")
1063
 
        for change in sorted(iterator, key=changes_key):
 
961
        for (file_id, paths, changed_content, versioned, parent, name, kind,
 
962
             executable) in sorted(iterator, key=changes_key):
1064
963
            # The root does not get diffed, and items with no known kind (that
1065
964
            # is, missing) in both trees are skipped as well.
1066
 
            if change.parent_id == (None, None) or change.kind == (None, None):
1067
 
                continue
1068
 
            if change.kind[0] == 'symlink' and not self.new_tree.supports_symlinks():
1069
 
                warning(
1070
 
                    'Ignoring "%s" as symlinks are not '
1071
 
                    'supported on this filesystem.' % (change.path[0],))
1072
 
                continue
1073
 
            oldpath, newpath = change.path
1074
 
            oldpath_encoded = get_encoded_path(change.path[0])
1075
 
            newpath_encoded = get_encoded_path(change.path[1])
1076
 
            old_present = (change.kind[0] is not None and change.versioned[0])
1077
 
            new_present = (change.kind[1] is not None and change.versioned[1])
1078
 
            executable = change.executable
1079
 
            kind = change.kind
1080
 
            renamed = (change.parent_id[0], change.name[0]) != (change.parent_id[1], change.name[1])
 
965
            if parent == (None, None) or kind == (None, None):
 
966
                continue
 
967
            oldpath, newpath = paths
 
968
            oldpath_encoded = get_encoded_path(paths[0])
 
969
            newpath_encoded = get_encoded_path(paths[1])
 
970
            old_present = (kind[0] is not None and versioned[0])
 
971
            new_present = (kind[1] is not None and versioned[1])
 
972
            renamed = (parent[0], name[0]) != (parent[1], name[1])
1081
973
 
1082
974
            properties_changed = []
1083
 
            properties_changed.extend(
1084
 
                get_executable_change(executable[0], executable[1]))
 
975
            properties_changed.extend(get_executable_change(executable[0], executable[1]))
1085
976
 
1086
977
            if properties_changed:
1087
 
                prop_str = b" (properties changed: %s)" % (
1088
 
                    b", ".join(properties_changed),)
 
978
                prop_str = " (properties changed: %s)" % (", ".join(properties_changed),)
1089
979
            else:
1090
 
                prop_str = b""
 
980
                prop_str = ""
1091
981
 
1092
982
            if (old_present, new_present) == (True, False):
1093
 
                self.to_file.write(b"=== removed %s '%s'\n" %
1094
 
                                   (kind[0].encode('ascii'), oldpath_encoded))
 
983
                self.to_file.write("=== removed %s '%s'\n" %
 
984
                                   (kind[0], oldpath_encoded))
1095
985
                newpath = oldpath
1096
986
            elif (old_present, new_present) == (False, True):
1097
 
                self.to_file.write(b"=== added %s '%s'\n" %
1098
 
                                   (kind[1].encode('ascii'), newpath_encoded))
 
987
                self.to_file.write("=== added %s '%s'\n" %
 
988
                                   (kind[1], newpath_encoded))
1099
989
                oldpath = newpath
1100
990
            elif renamed:
1101
 
                self.to_file.write(b"=== renamed %s '%s' => '%s'%s\n" %
1102
 
                                   (kind[0].encode('ascii'), oldpath_encoded, newpath_encoded, prop_str))
 
991
                self.to_file.write("=== renamed %s '%s' => '%s'%s\n" %
 
992
                    (kind[0], oldpath_encoded, newpath_encoded, prop_str))
1103
993
            else:
1104
994
                # if it was produced by iter_changes, it must be
1105
995
                # modified *somehow*, either content or execute bit.
1106
 
                self.to_file.write(b"=== modified %s '%s'%s\n" % (kind[0].encode('ascii'),
1107
 
                                                                  newpath_encoded, prop_str))
1108
 
            if change.changed_content:
1109
 
                self._diff(oldpath, newpath, kind[0], kind[1])
 
996
                self.to_file.write("=== modified %s '%s'%s\n" % (kind[0],
 
997
                                   newpath_encoded, prop_str))
 
998
            if changed_content:
 
999
                self._diff(file_id, oldpath, newpath, kind[0], kind[1])
1110
1000
                has_changes = 1
1111
1001
            if renamed:
1112
1002
                has_changes = 1
1113
1003
        return has_changes
1114
1004
 
1115
 
    def diff(self, old_path, new_path):
 
1005
    def diff(self, file_id, old_path, new_path):
1116
1006
        """Perform a diff of a single file
1117
1007
 
 
1008
        :param file_id: file-id of the file
1118
1009
        :param old_path: The path of the file in the old tree
1119
1010
        :param new_path: The path of the file in the new tree
1120
1011
        """
1121
 
        if old_path is None:
 
1012
        try:
 
1013
            old_kind = self.old_tree.kind(file_id)
 
1014
        except (errors.NoSuchId, errors.NoSuchFile):
1122
1015
            old_kind = None
1123
 
        else:
1124
 
            old_kind = self.old_tree.kind(old_path)
1125
 
        if new_path is None:
 
1016
        try:
 
1017
            new_kind = self.new_tree.kind(file_id)
 
1018
        except (errors.NoSuchId, errors.NoSuchFile):
1126
1019
            new_kind = None
1127
 
        else:
1128
 
            new_kind = self.new_tree.kind(new_path)
1129
 
        self._diff(old_path, new_path, old_kind, new_kind)
1130
 
 
1131
 
    def _diff(self, old_path, new_path, old_kind, new_kind):
1132
 
        result = DiffPath._diff_many(
1133
 
            self.differs, old_path, new_path, old_kind, new_kind)
 
1020
        self._diff(file_id, old_path, new_path, old_kind, new_kind)
 
1021
 
 
1022
 
 
1023
    def _diff(self, file_id, old_path, new_path, old_kind, new_kind):
 
1024
        result = DiffPath._diff_many(self.differs, file_id, old_path,
 
1025
                                       new_path, old_kind, new_kind)
1134
1026
        if result is DiffPath.CANNOT_DIFF:
1135
1027
            error_path = new_path
1136
1028
            if error_path is None: