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

  • Committer: Jelmer Vernooij
  • Date: 2019-07-12 01:01:45 UTC
  • mto: This revision was merged to the branch mainline in revision 7375.
  • Revision ID: jelmer@jelmer.uk-20190712010145-m7224qumb8w068zw
https://launchpad.net/bugs/1836238
Fix importing from remote git repositories.

Show diffs side-by-side

added added

removed removed

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