/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: Joe Julian
  • Date: 2010-01-10 02:25:31 UTC
  • mto: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: joe@julianfamily.org-20100110022531-wqk61rsagz8xsiga
https://launchpad.net/bugs/175839
Added MANIFEST.in to allow bdist_rpm to have all the required include files and tools. bdist_rpm will still fail to build correctly on some distributions due to a disttools bug http://bugs.python.org/issue644744

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