/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: Andrew Bennetts
  • Date: 2011-06-09 07:38:32 UTC
  • mto: This revision was merged to the branch mainline in revision 5964.
  • Revision ID: andrew.bennetts@canonical.com-20110609073832-dt6oww033iexli4l
Fix thinko in wording regarding stacking invariants and revisions with multiple parents.

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