/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: Canonical.com Patch Queue Manager
  • Date: 2010-02-11 04:02:41 UTC
  • mfrom: (5017.2.2 tariff)
  • Revision ID: pqm@pqm.ubuntu.com-20100211040241-w6n021dz0uus341n
(mbp) add import-tariff tests

Show diffs side-by-side

added added

removed removed

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