/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: John Arbash Meinel
  • Date: 2008-08-25 21:50:11 UTC
  • mfrom: (0.11.3 tools)
  • mto: This revision was merged to the branch mainline in revision 3659.
  • Revision ID: john@arbash-meinel.com-20080825215011-de9esmzgkue3e522
Merge in Lukáš's helper scripts.
Update the packaging documents to describe how to do the releases
using bzr-builddeb to package all distro platforms
simultaneously.

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