/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: Sabin Iacob
  • Date: 2009-03-23 14:59:43 UTC
  • mto: (4189.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4193.
  • Revision ID: iacobs@m0n5t3r.info-20090323145943-3s3p1px5q1rkh2e5
update FSF mailing address

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