/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
6597.2.1 by Richard Wilbur
Split diff format option parser into a separate function, update to include all format options for GNU diff v3.2, and test parser.
1
# Copyright (C) 2005-2014 Canonical Ltd.
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1 by mbp at sourcefrog
import from baz patch-364
16
6379.6.1 by Jelmer Vernooij
Import absolute_import in a few places.
17
from __future__ import absolute_import
18
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
19
import difflib
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
20
import os
1899.1.5 by John Arbash Meinel
Always buffer the output of diff, so we can check if retcode==2 is because of Binary files
21
import re
4603.1.20 by Aaron Bentley
Use string.Template substitution with @ as delimiter.
22
import string
1996.3.9 by John Arbash Meinel
lazy_import diff.py
23
import sys
24
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
25
from .lazy_import import lazy_import
1996.3.9 by John Arbash Meinel
lazy_import diff.py
26
lazy_import(globals(), """
27
import errno
1692.8.7 by James Henstridge
changes suggested by John Meinel
28
import subprocess
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
29
import tempfile
1740.2.5 by Aaron Bentley
Merge from bzr.dev
30
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
31
from breezy import (
6207.3.3 by jelmer at samba
Fix tests and the like.
32
    cleanup,
4913.5.24 by Gordon Tyler
Added cmdline.split function, which replaces commands.shlex_split_unicode.
33
    cmdline,
6207.3.3 by jelmer at samba
Fix tests and the like.
34
    controldir,
1955.2.10 by John Arbash Meinel
Unset a few other LANG type variables when spawning diff
35
    errors,
36
    osutils,
1996.3.9 by John Arbash Meinel
lazy_import diff.py
37
    patiencediff,
38
    textfile,
1551.12.29 by Aaron Bentley
Copy and extend patch date formatting code, add patch-date parsing
39
    timestamp,
3586.1.21 by Ian Clatworthy
enhance diff to support views
40
    views,
1955.2.10 by John Arbash Meinel
Unset a few other LANG type variables when spawning diff
41
    )
4845.2.1 by Gary van der Merwe
When launching an external diff app, don't write temporary files for a working tree.
42
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
43
from breezy.workingtree import WorkingTree
44
from breezy.i18n import gettext
1996.3.9 by John Arbash Meinel
lazy_import diff.py
45
""")
46
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
47
from .registry import (
5131.1.1 by Jelmer Vernooij
Add --format option to 'bzr diff'.
48
    Registry,
49
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
50
from .trace import mutter, note, warning
6731.1.1 by Jelmer Vernooij
Move FileTimestampUnavailable to breezy.tree.
51
from .tree import FileTimestampUnavailable
52
1 by mbp at sourcefrog
import from baz patch-364
53
6524.5.8 by Paul Nixon
Changed "default_context_amount" to be "DEFAULT_CONTEXT_AMOUNT" to be
54
DEFAULT_CONTEXT_AMOUNT = 3
1711.2.24 by John Arbash Meinel
Late bind to PatienceSequenceMatcher to allow plugin to override.
55
4603.1.20 by Aaron Bentley
Use string.Template substitution with @ as delimiter.
56
class AtTemplate(string.Template):
57
    """Templating class that uses @ instead of $."""
58
59
    delimiter = '@'
60
61
767 by Martin Pool
- files are only reported as modified if their name or parent has changed,
62
# TODO: Rather than building a changeset object, we should probably
63
# invoke callbacks on an object.  That object can either accumulate a
64
# list, write them out directly, etc etc.
65
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
66
67
class _PrematchedMatcher(difflib.SequenceMatcher):
68
    """Allow SequenceMatcher operations to use predetermined blocks"""
69
70
    def __init__(self, matching_blocks):
71
        difflib.SequenceMatcher(self, None, None)
72
        self.matching_blocks = matching_blocks
73
        self.opcodes = None
74
75
1558.15.11 by Aaron Bentley
Apply merge review suggestions
76
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file,
1711.2.30 by John Arbash Meinel
Fix bug in internal_diff handling of unicode paths
77
                  allow_binary=False, sequence_matcher=None,
6524.5.8 by Paul Nixon
Changed "default_context_amount" to be "DEFAULT_CONTEXT_AMOUNT" to be
78
                  path_encoding='utf8', context_lines=DEFAULT_CONTEXT_AMOUNT):
475 by Martin Pool
- rewrite diff using compare_trees()
79
    # FIXME: difflib is wrong if there is no trailing newline.
80
    # The syntax used by patch seems to be "\ No newline at
81
    # end of file" following the last diff line from that
82
    # file.  This is not trivial to insert into the
83
    # unified_diff output and it might be better to just fix
84
    # or replace that function.
85
86
    # In the meantime we at least make sure the patch isn't
87
    # mangled.
88
89
90
    # Special workaround for Python2.3, where difflib fails if
91
    # both sequences are empty.
92
    if not oldlines and not newlines:
93
        return
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
94
1558.15.11 by Aaron Bentley
Apply merge review suggestions
95
    if allow_binary is False:
1996.3.9 by John Arbash Meinel
lazy_import diff.py
96
        textfile.check_text_lines(oldlines)
97
        textfile.check_text_lines(newlines)
475 by Martin Pool
- rewrite diff using compare_trees()
98
1185.81.8 by John Arbash Meinel
Updating unified_diff to take a factory, using the new diff algorithm in the code.
99
    if sequence_matcher is None:
1996.3.9 by John Arbash Meinel
lazy_import diff.py
100
        sequence_matcher = patiencediff.PatienceSequenceMatcher
101
    ud = patiencediff.unified_diff(oldlines, newlines,
4797.57.4 by Alexander Belchenko
if filename cannot be encoded in current path_encoding (user_encoding) then use foo.encode(path_encoding, 'replace') so we don't traceback
102
                      fromfile=old_filename.encode(path_encoding, 'replace'),
103
                      tofile=new_filename.encode(path_encoding, 'replace'),
6524.5.1 by pauljnixon at gmail
Made diffs more configurable
104
                      n=context_lines, sequencematcher=sequence_matcher)
475 by Martin Pool
- rewrite diff using compare_trees()
105
1092.1.50 by Robert Collins
make diff lsdiff/filterdiff friendly
106
    ud = list(ud)
3085.1.1 by John Arbash Meinel
Fix internal_diff to not fail when the texts are identical.
107
    if len(ud) == 0: # Identical contents, nothing to do
108
        return
475 by Martin Pool
- rewrite diff using compare_trees()
109
    # work-around for difflib being too smart for its own good
110
    # if /dev/null is "1,0", patch won't recognize it as /dev/null
111
    if not oldlines:
112
        ud[2] = ud[2].replace('-1,0', '-0,0')
113
    elif not newlines:
114
        ud[2] = ud[2].replace('+1,0', '+0,0')
115
804 by Martin Pool
Patch from John:
116
    for line in ud:
117
        to_file.write(line)
974.1.5 by Aaron Bentley
Fixed handling of missing newlines in udiffs
118
        if not line.endswith('\n'):
119
            to_file.write("\n\\ No newline at end of file\n")
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
120
    to_file.write('\n')
475 by Martin Pool
- rewrite diff using compare_trees()
121
122
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
123
def _spawn_external_diff(diffcmd, capture_errors=True):
6597.2.1 by Richard Wilbur
Split diff format option parser into a separate function, update to include all format options for GNU diff v3.2, and test parser.
124
    """Spawn the external diff process, and return the child handle.
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
125
126
    :param diffcmd: The command list to spawn
2138.1.1 by Wouter van Heyst
Robuster external diff output handling.
127
    :param capture_errors: Capture stderr as well as setting LANG=C
128
        and LC_ALL=C. This lets us read and understand the output of diff,
129
        and respond to any errors.
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
130
    :return: A Popen object.
131
    """
132
    if capture_errors:
2321.2.2 by Alexander Belchenko
win32 fixes for test_external_diff_binary (gettext on win32 rely on $LANGUAGE)
133
        # construct minimal environment
134
        env = {}
135
        path = os.environ.get('PATH')
136
        if path is not None:
137
            env['PATH'] = path
2321.2.5 by Alexander Belchenko
external diff: no need for special code path for win32 (suggested by John Meinel)
138
        env['LANGUAGE'] = 'C'   # on win32 only LANGUAGE has effect
139
        env['LANG'] = 'C'
140
        env['LC_ALL'] = 'C'
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
141
        stderr = subprocess.PIPE
142
    else:
2321.2.2 by Alexander Belchenko
win32 fixes for test_external_diff_binary (gettext on win32 rely on $LANGUAGE)
143
        env = None
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
144
        stderr = None
145
146
    try:
147
        pipe = subprocess.Popen(diffcmd,
148
                                stdin=subprocess.PIPE,
149
                                stdout=subprocess.PIPE,
150
                                stderr=stderr,
2321.2.2 by Alexander Belchenko
win32 fixes for test_external_diff_binary (gettext on win32 rely on $LANGUAGE)
151
                                env=env)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
152
    except OSError as e:
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
153
        if e.errno == errno.ENOENT:
154
            raise errors.NoDiff(str(e))
155
        raise
156
157
    return pipe
158
6597.2.1 by Richard Wilbur
Split diff format option parser into a separate function, update to include all format options for GNU diff v3.2, and test parser.
159
# diff style options as of GNU diff v3.2
160
style_option_list = ['-c', '-C', '--context',
161
                     '-e', '--ed',
6597.2.4 by Vincent Ladeuil
Doh, this is *still* supported by diff 3.3 (just not documented in the man page nor the online help anymore).
162
                     '-f', '--forward-ed',
6597.2.1 by Richard Wilbur
Split diff format option parser into a separate function, update to include all format options for GNU diff v3.2, and test parser.
163
                     '-q', '--brief',
164
                     '--normal',
165
                     '-n', '--rcs',
166
                     '-u', '-U', '--unified',
167
                     '-y', '--side-by-side',
168
                     '-D', '--ifdef']
169
170
def default_style_unified(diff_opts):
171
    """Default to unified diff style if alternative not specified in diff_opts.
172
173
        diff only allows one style to be specified; they don't override.
174
        Note that some of these take optargs, and the optargs can be
175
        directly appended to the options.
176
        This is only an approximate parser; it doesn't properly understand
177
        the grammar.
178
179
    :param diff_opts: List of options for external (GNU) diff.
180
    :return: List of options with default style=='unified'.
181
    """
182
    for s in style_option_list:
183
        for j in diff_opts:
184
            if j.startswith(s):
185
                break
186
        else:
187
            continue
188
        break
189
    else:
190
        diff_opts.append('-u')
191
    return diff_opts
192
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
193
1185.35.29 by Aaron Bentley
Support whitespace in diff filenames
194
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
571 by Martin Pool
- new --diff-options to pass options through to external
195
                  diff_opts):
568 by Martin Pool
- start adding support for showing diffs by calling out to
196
    """Display a diff by calling out to the external diff program."""
581 by Martin Pool
- make sure any bzr output is flushed before
197
    # make sure our own output is properly ordered before the diff
198
    to_file.flush()
199
6681.2.4 by Jelmer Vernooij
More renames.
200
    oldtmp_fd, old_abspath = tempfile.mkstemp(prefix='brz-diff-old-')
201
    newtmp_fd, new_abspath = tempfile.mkstemp(prefix='brz-diff-new-')
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
202
    oldtmpf = os.fdopen(oldtmp_fd, 'wb')
203
    newtmpf = os.fdopen(newtmp_fd, 'wb')
568 by Martin Pool
- start adding support for showing diffs by calling out to
204
205
    try:
206
        # TODO: perhaps a special case for comparing to or from the empty
207
        # sequence; can just use /dev/null on Unix
208
209
        # TODO: if either of the files being compared already exists as a
210
        # regular named file (e.g. in the working directory) then we can
211
        # compare directly to that, rather than copying it.
212
213
        oldtmpf.writelines(oldlines)
214
        newtmpf.writelines(newlines)
215
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
216
        oldtmpf.close()
217
        newtmpf.close()
568 by Martin Pool
- start adding support for showing diffs by calling out to
218
571 by Martin Pool
- new --diff-options to pass options through to external
219
        if not diff_opts:
220
            diff_opts = []
4422.1.1 by John Arbash Meinel
Possibly fix for bug #382709 handling non-ascii external filenames.
221
        if sys.platform == 'win32':
222
            # Popen doesn't do the proper encoding for external commands
223
            # Since we are dealing with an ANSI api, use mbcs encoding
224
            old_filename = old_filename.encode('mbcs')
4422.1.2 by Martin
Fix copy-and-paste error in previous change
225
            new_filename = new_filename.encode('mbcs')
571 by Martin Pool
- new --diff-options to pass options through to external
226
        diffcmd = ['diff',
1740.2.5 by Aaron Bentley
Merge from bzr.dev
227
                   '--label', old_filename,
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
228
                   old_abspath,
1740.2.5 by Aaron Bentley
Merge from bzr.dev
229
                   '--label', new_filename,
1711.2.56 by John Arbash Meinel
Raise NoDiff if 'diff' not present.
230
                   new_abspath,
231
                   '--binary',
232
                  ]
571 by Martin Pool
- new --diff-options to pass options through to external
233
6597.2.1 by Richard Wilbur
Split diff format option parser into a separate function, update to include all format options for GNU diff v3.2, and test parser.
234
        diff_opts = default_style_unified(diff_opts)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
235
571 by Martin Pool
- new --diff-options to pass options through to external
236
        if diff_opts:
237
            diffcmd.extend(diff_opts)
238
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
239
        pipe = _spawn_external_diff(diffcmd, capture_errors=True)
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
240
        out, err = pipe.communicate()
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
241
        rc = pipe.returncode
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
242
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
243
        # internal_diff() adds a trailing newline, add one here for consistency
244
        out += '\n'
1899.1.5 by John Arbash Meinel
Always buffer the output of diff, so we can check if retcode==2 is because of Binary files
245
        if rc == 2:
246
            # 'diff' gives retcode == 2 for all sorts of errors
247
            # one of those is 'Binary files differ'.
248
            # Bad options could also be the problem.
1904.1.4 by Marien Zwart
Make external diff in binary mode work with recent versions of diffutils.
249
            # 'Binary files' is not a real error, so we suppress that error.
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
250
            lang_c_out = out
251
252
            # Since we got here, we want to make sure to give an i18n error
253
            pipe = _spawn_external_diff(diffcmd, capture_errors=False)
254
            out, err = pipe.communicate()
255
256
            # Write out the new i18n diff response
257
            to_file.write(out+'\n')
258
            if pipe.returncode != 2:
1996.3.9 by John Arbash Meinel
lazy_import diff.py
259
                raise errors.BzrError(
260
                               'external diff failed with exit code 2'
2138.1.1 by Wouter van Heyst
Robuster external diff output handling.
261
                               ' when run with LANG=C and LC_ALL=C,'
262
                               ' but not when run natively: %r' % (diffcmd,))
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
263
264
            first_line = lang_c_out.split('\n', 1)[0]
1904.1.4 by Marien Zwart
Make external diff in binary mode work with recent versions of diffutils.
265
            # Starting with diffutils 2.8.4 the word "binary" was dropped.
266
            m = re.match('^(binary )?files.*differ$', first_line, re.I)
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
267
            if m is None:
1996.3.9 by John Arbash Meinel
lazy_import diff.py
268
                raise errors.BzrError('external diff failed with exit code 2;'
269
                                      ' command: %r' % (diffcmd,))
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
270
            else:
271
                # Binary files differ, just return
272
                return
273
274
        # If we got to here, we haven't written out the output of diff
275
        # do so now
276
        to_file.write(out)
277
        if rc not in (0, 1):
571 by Martin Pool
- new --diff-options to pass options through to external
278
            # returns 1 if files differ; that's OK
279
            if rc < 0:
280
                msg = 'signal %d' % (-rc)
281
            else:
282
                msg = 'exit code %d' % rc
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
283
284
            raise errors.BzrError('external diff failed with %s; command: %r'
6597.2.1 by Richard Wilbur
Split diff format option parser into a separate function, update to include all format options for GNU diff v3.2, and test parser.
285
                                  % (msg, diffcmd))
1899.1.6 by John Arbash Meinel
internal_diff always adds a trailing \n, make sure external_diff does too
286
287
568 by Martin Pool
- start adding support for showing diffs by calling out to
288
    finally:
289
        oldtmpf.close()                 # and delete
290
        newtmpf.close()
6597.2.3 by Vincent Ladeuil
Remove duplication in cleanups. Note that --forward-ed is not in diff 3.3 and may need to be removed from the supported options.
291
292
        def cleanup(path):
293
            # Warn in case the file couldn't be deleted (in case windows still
294
            # holds the file open, but not if the files have already been
295
            # deleted)
296
            try:
297
                os.remove(path)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
298
            except OSError as e:
6597.2.3 by Vincent Ladeuil
Remove duplication in cleanups. Note that --forward-ed is not in diff 3.3 and may need to be removed from the supported options.
299
                if e.errno not in (errno.ENOENT,):
300
                    warning('Failed to delete temporary file: %s %s', path, e)
301
302
        cleanup(old_abspath)
303
        cleanup(new_abspath)
568 by Martin Pool
- start adding support for showing diffs by calling out to
304
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
305
5147.3.3 by Andrew Bennetts
Add get_trees_and_branches_to_diff_locked, leave get_trees_and_branches_to_diff unchanged for qbzr.
306
def get_trees_and_branches_to_diff_locked(
307
    path_list, revision_specs, old_url, new_url, add_cleanup, apply_view=True):
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
308
    """Get the trees and specific files to diff given a list of paths.
309
310
    This method works out the trees to be diff'ed and the files of
311
    interest within those trees.
312
313
    :param path_list:
314
        the list of arguments passed to the diff command
315
    :param revision_specs:
316
        Zero, one or two RevisionSpecs from the diff command line,
317
        saying what revisions to compare.
318
    :param old_url:
319
        The url of the old branch or tree. If None, the tree to use is
320
        taken from the first path, if any, or the current working tree.
321
    :param new_url:
322
        The url of the new branch or tree. If None, the tree to use is
323
        taken from the first path, if any, or the current working tree.
5147.3.1 by Andrew Bennetts
Avoid 6 branch/repo relocks in cmd_diff.
324
    :param add_cleanup:
325
        a callable like Command.add_cleanup.  get_trees_and_branches_to_diff
326
        will register cleanups that must be run to unlock the trees, etc.
3586.1.21 by Ian Clatworthy
enhance diff to support views
327
    :param apply_view:
328
        if True and a view is set, apply the view or check that the paths
329
        are within it
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
330
    :returns:
4739.3.1 by Jonathan Lange
Fix the docstring for get_trees_and_branches_to_diff.
331
        a tuple of (old_tree, new_tree, old_branch, new_branch,
332
        specific_files, extra_trees) where extra_trees is a sequence of
5147.3.1 by Andrew Bennetts
Avoid 6 branch/repo relocks in cmd_diff.
333
        additional trees to search in for file-ids.  The trees and branches
334
        will be read-locked until the cleanups registered via the add_cleanup
335
        param are run.
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
336
    """
337
    # Get the old and new revision specs
338
    old_revision_spec = None
339
    new_revision_spec = None
340
    if revision_specs is not None:
341
        if len(revision_specs) > 0:
342
            old_revision_spec = revision_specs[0]
3072.1.5 by Ian Clatworthy
more good ideas from abentley
343
            if old_url is None:
344
                old_url = old_revision_spec.get_branch()
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
345
        if len(revision_specs) > 1:
346
            new_revision_spec = revision_specs[1]
3072.1.5 by Ian Clatworthy
more good ideas from abentley
347
            if new_url is None:
348
                new_url = new_revision_spec.get_branch()
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
349
3072.1.5 by Ian Clatworthy
more good ideas from abentley
350
    other_paths = []
351
    make_paths_wt_relative = True
3164.1.1 by Ian Clatworthy
diff without arguments means the current tree, not the current directory
352
    consider_relpath = True
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
353
    if path_list is None or len(path_list) == 0:
3164.1.1 by Ian Clatworthy
diff without arguments means the current tree, not the current directory
354
        # If no path is given, the current working tree is used
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
355
        default_location = u'.'
3164.1.1 by Ian Clatworthy
diff without arguments means the current tree, not the current directory
356
        consider_relpath = False
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
357
    elif old_url is not None and new_url is not None:
358
        other_paths = path_list
3072.1.5 by Ian Clatworthy
more good ideas from abentley
359
        make_paths_wt_relative = False
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
360
    else:
361
        default_location = path_list[0]
362
        other_paths = path_list[1:]
363
5147.3.1 by Andrew Bennetts
Avoid 6 branch/repo relocks in cmd_diff.
364
    def lock_tree_or_branch(wt, br):
365
        if wt is not None:
366
            wt.lock_read()
367
            add_cleanup(wt.unlock)
368
        elif br is not None:
369
            br.lock_read()
370
            add_cleanup(br.unlock)
371
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
372
    # Get the old location
3072.1.2 by Ian Clatworthy
Test various --old and --new combinations
373
    specific_files = []
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
374
    if old_url is None:
375
        old_url = default_location
376
    working_tree, branch, relpath = \
6207.3.3 by jelmer at samba
Fix tests and the like.
377
        controldir.ControlDir.open_containing_tree_or_branch(old_url)
5147.3.1 by Andrew Bennetts
Avoid 6 branch/repo relocks in cmd_diff.
378
    lock_tree_or_branch(working_tree, branch)
3164.1.1 by Ian Clatworthy
diff without arguments means the current tree, not the current directory
379
    if consider_relpath and relpath != '':
3586.1.21 by Ian Clatworthy
enhance diff to support views
380
        if working_tree is not None and apply_view:
4032.4.1 by Eduardo Padoan
Moved diff._check_path_in_view() to views.check_path_in_view()
381
            views.check_path_in_view(working_tree, relpath)
3072.1.2 by Ian Clatworthy
Test various --old and --new combinations
382
        specific_files.append(relpath)
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
383
    old_tree = _get_tree_to_diff(old_revision_spec, working_tree, branch)
4705.1.1 by Gary van der Merwe
Change _get_trees_to_diff to get_trees_and_branches_to_diff.
384
    old_branch = branch
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
385
386
    # Get the new location
387
    if new_url is None:
388
        new_url = default_location
389
    if new_url != old_url:
390
        working_tree, branch, relpath = \
6207.3.3 by jelmer at samba
Fix tests and the like.
391
            controldir.ControlDir.open_containing_tree_or_branch(new_url)
5147.3.1 by Andrew Bennetts
Avoid 6 branch/repo relocks in cmd_diff.
392
        lock_tree_or_branch(working_tree, branch)
3164.1.1 by Ian Clatworthy
diff without arguments means the current tree, not the current directory
393
        if consider_relpath and relpath != '':
3586.1.21 by Ian Clatworthy
enhance diff to support views
394
            if working_tree is not None and apply_view:
4032.4.1 by Eduardo Padoan
Moved diff._check_path_in_view() to views.check_path_in_view()
395
                views.check_path_in_view(working_tree, relpath)
3072.1.2 by Ian Clatworthy
Test various --old and --new combinations
396
            specific_files.append(relpath)
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
397
    new_tree = _get_tree_to_diff(new_revision_spec, working_tree, branch,
398
        basis_is_default=working_tree is None)
4705.1.1 by Gary van der Merwe
Change _get_trees_to_diff to get_trees_and_branches_to_diff.
399
    new_branch = branch
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
400
3072.1.2 by Ian Clatworthy
Test various --old and --new combinations
401
    # Get the specific files (all files is None, no files is [])
3072.1.5 by Ian Clatworthy
more good ideas from abentley
402
    if make_paths_wt_relative and working_tree is not None:
5346.4.3 by Martin Pool
PathNotChild should not give a traceback.
403
        other_paths = working_tree.safe_relpath_files(
404
            other_paths,
405
            apply_view=apply_view)
3072.1.2 by Ian Clatworthy
Test various --old and --new combinations
406
    specific_files.extend(other_paths)
407
    if len(specific_files) == 0:
408
        specific_files = None
3586.1.21 by Ian Clatworthy
enhance diff to support views
409
        if (working_tree is not None and working_tree.supports_views()
410
            and apply_view):
411
            view_files = working_tree.views.lookup_view()
412
            if view_files:
413
                specific_files = view_files
414
                view_str = views.view_display_str(view_files)
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
415
                note(gettext("*** Ignoring files outside view. View is %s") % view_str)
3072.1.2 by Ian Clatworthy
Test various --old and --new combinations
416
417
    # Get extra trees that ought to be searched for file-ids
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
418
    extra_trees = None
3072.1.5 by Ian Clatworthy
more good ideas from abentley
419
    if working_tree is not None and working_tree not in (old_tree, new_tree):
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
420
        extra_trees = (working_tree,)
6027.1.4 by Vincent Ladeuil
Remove ``diff.get_trees_and_branches_to_diff`` deprecated in 2.2.0 and the corrsponding tests.
421
    return (old_tree, new_tree, old_branch, new_branch,
422
            specific_files, extra_trees)
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
423
4739.3.1 by Jonathan Lange
Fix the docstring for get_trees_and_branches_to_diff.
424
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
425
def _get_tree_to_diff(spec, tree=None, branch=None, basis_is_default=True):
426
    if branch is None and tree is not None:
427
        branch = tree.branch
428
    if spec is None or spec.spec is None:
429
        if basis_is_default:
3072.1.5 by Ian Clatworthy
more good ideas from abentley
430
            if tree is not None:
431
                return tree.basis_tree()
432
            else:
433
                return branch.basis_tree()
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
434
        else:
435
            return tree
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
436
    return spec.as_tree(branch)
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
437
438
571 by Martin Pool
- new --diff-options to pass options through to external
439
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
440
                    external_diff_options=None,
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
441
                    old_label='a/', new_label='b/',
2598.6.12 by ghigo
Move the encoding of the commit message at the command line level
442
                    extra_trees=None,
3123.6.2 by Aaron Bentley
Implement diff --using natively
443
                    path_encoding='utf8',
5131.1.1 by Jelmer Vernooij
Add --format option to 'bzr diff'.
444
                    using=None,
6524.5.1 by pauljnixon at gmail
Made diffs more configurable
445
                    format_cls=None,
6524.5.8 by Paul Nixon
Changed "default_context_amount" to be "DEFAULT_CONTEXT_AMOUNT" to be
446
                    context=DEFAULT_CONTEXT_AMOUNT):
550 by Martin Pool
- Refactor diff code into one that works purely on
447
    """Show in text form the changes from one tree to another.
448
5131.1.1 by Jelmer Vernooij
Add --format option to 'bzr diff'.
449
    :param to_file: The output stream.
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
450
    :param specific_files: Include only changes to these files - None for all
5131.1.1 by Jelmer Vernooij
Add --format option to 'bzr diff'.
451
        changes.
452
    :param external_diff_options: If set, use an external GNU diff and pass 
453
        these options.
454
    :param extra_trees: If set, more Trees to use for looking up file ids
455
    :param path_encoding: If set, the path will be encoded as specified, 
456
        otherwise is supposed to be utf8
457
    :param format_cls: Formatter class (DiffTree subclass)
550 by Martin Pool
- Refactor diff code into one that works purely on
458
    """
6524.5.4 by Paul Nixon
Clearing up default context options
459
    if context is None:
6524.5.8 by Paul Nixon
Changed "default_context_amount" to be "DEFAULT_CONTEXT_AMOUNT" to be
460
        context = DEFAULT_CONTEXT_AMOUNT
5131.1.1 by Jelmer Vernooij
Add --format option to 'bzr diff'.
461
    if format_cls is None:
462
        format_cls = DiffTree
6754.8.4 by Jelmer Vernooij
Use new context stuff.
463
    with old_tree.lock_read():
2255.7.38 by John Arbash Meinel
show_diff_trees() should lock any extra trees it is passed.
464
        if extra_trees is not None:
465
            for tree in extra_trees:
466
                tree.lock_read()
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
467
        new_tree.lock_read()
468
        try:
5131.1.1 by Jelmer Vernooij
Add --format option to 'bzr diff'.
469
            differ = format_cls.from_trees_options(old_tree, new_tree, to_file,
470
                                                   path_encoding,
471
                                                   external_diff_options,
6524.5.1 by pauljnixon at gmail
Made diffs more configurable
472
                                                   old_label, new_label, using,
473
                                                   context_lines=context)
3009.2.12 by Aaron Bentley
Associate labels with text diffing only
474
            return differ.show_diff(specific_files, extra_trees)
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
475
        finally:
476
            new_tree.unlock()
2255.7.38 by John Arbash Meinel
show_diff_trees() should lock any extra trees it is passed.
477
            if extra_trees is not None:
478
                for tree in extra_trees:
479
                    tree.unlock()
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
480
481
1740.2.5 by Aaron Bentley
Merge from bzr.dev
482
def _patch_header_date(tree, file_id, path):
483
    """Returns a timestamp suitable for use in a patch header."""
4976.1.3 by Jelmer Vernooij
Cope with ghosts in 'bzr diff'
484
    try:
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
485
        mtime = tree.get_file_mtime(path, file_id)
6731.1.1 by Jelmer Vernooij
Move FileTimestampUnavailable to breezy.tree.
486
    except FileTimestampUnavailable:
4976.1.3 by Jelmer Vernooij
Cope with ghosts in 'bzr diff'
487
        mtime = 0
2405.1.2 by John Arbash Meinel
Fix bug #103870 by passing None instead of a (sometimes wrong) path
488
    return timestamp.format_patch_date(mtime)
1740.2.5 by Aaron Bentley
Merge from bzr.dev
489
490
3268.1.1 by C Miller
Describe the property changes in diffs. Currently, this is the executable-bit
491
def get_executable_change(old_is_x, new_is_x):
492
    descr = { True:"+x", False:"-x", None:"??" }
493
    if old_is_x != new_is_x:
494
        return ["%s to %s" % (descr[old_is_x], descr[new_is_x],)]
495
    else:
496
        return []
497
1398 by Robert Collins
integrate in Gustavos x-bit patch
498
3009.2.22 by Aaron Bentley
Update names & docstring
499
class DiffPath(object):
3009.2.14 by Aaron Bentley
Update return type handling
500
    """Base type for command object that compare files"""
3009.2.17 by Aaron Bentley
Update docs
501
3009.2.14 by Aaron Bentley
Update return type handling
502
    # The type or contents of the file were unsuitable for diffing
3009.2.29 by Aaron Bentley
Change constants to strings
503
    CANNOT_DIFF = 'CANNOT_DIFF'
3009.2.14 by Aaron Bentley
Update return type handling
504
    # The file has changed in a semantic way
3009.2.29 by Aaron Bentley
Change constants to strings
505
    CHANGED = 'CHANGED'
506
    # The file content may have changed, but there is no semantic change
507
    UNCHANGED = 'UNCHANGED'
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
508
3009.2.13 by Aaron Bentley
Refactor differ to support registering differ factories
509
    def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8'):
3009.2.17 by Aaron Bentley
Update docs
510
        """Constructor.
511
512
        :param old_tree: The tree to show as the old tree in the comparison
513
        :param new_tree: The tree to show as new in the comparison
514
        :param to_file: The file to write comparison data to
515
        :param path_encoding: The character encoding to write paths in
516
        """
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
517
        self.old_tree = old_tree
518
        self.new_tree = new_tree
519
        self.to_file = to_file
3009.2.13 by Aaron Bentley
Refactor differ to support registering differ factories
520
        self.path_encoding = path_encoding
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
521
3123.6.2 by Aaron Bentley
Implement diff --using natively
522
    def finish(self):
523
        pass
524
3009.2.28 by Aaron Bentley
Add from_diff_tree factories
525
    @classmethod
526
    def from_diff_tree(klass, diff_tree):
527
        return klass(diff_tree.old_tree, diff_tree.new_tree,
528
                     diff_tree.to_file, diff_tree.path_encoding)
529
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
530
    @staticmethod
531
    def _diff_many(differs, file_id, old_path, new_path, old_kind, new_kind):
532
        for file_differ in differs:
533
            result = file_differ.diff(file_id, old_path, new_path, old_kind,
534
                                      new_kind)
3009.2.22 by Aaron Bentley
Update names & docstring
535
            if result is not DiffPath.CANNOT_DIFF:
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
536
                return result
537
        else:
3009.2.22 by Aaron Bentley
Update names & docstring
538
            return DiffPath.CANNOT_DIFF
539
540
541
class DiffKindChange(object):
3009.2.17 by Aaron Bentley
Update docs
542
    """Special differ for file kind changes.
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
543
3009.2.17 by Aaron Bentley
Update docs
544
    Represents kind change as deletion + creation.  Uses the other differs
545
    to do this.
546
    """
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
547
    def __init__(self, differs):
548
        self.differs = differs
549
3123.6.2 by Aaron Bentley
Implement diff --using natively
550
    def finish(self):
551
        pass
552
3009.2.28 by Aaron Bentley
Add from_diff_tree factories
553
    @classmethod
554
    def from_diff_tree(klass, diff_tree):
555
        return klass(diff_tree.differs)
556
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
557
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
3009.2.17 by Aaron Bentley
Update docs
558
        """Perform comparison
559
560
        :param file_id: The file_id of the file to compare
561
        :param old_path: Path of the file in the old tree
562
        :param new_path: Path of the file in the new tree
563
        :param old_kind: Old file-kind of the file
564
        :param new_kind: New file-kind of the file
565
        """
3009.2.18 by Aaron Bentley
Change KindChangeDiffer's anti-recursion to avoid kind pairs with None
566
        if None in (old_kind, new_kind):
3009.2.22 by Aaron Bentley
Update names & docstring
567
            return DiffPath.CANNOT_DIFF
568
        result = DiffPath._diff_many(self.differs, file_id, old_path,
3009.2.18 by Aaron Bentley
Change KindChangeDiffer's anti-recursion to avoid kind pairs with None
569
                                       new_path, old_kind, None)
3009.2.22 by Aaron Bentley
Update names & docstring
570
        if result is DiffPath.CANNOT_DIFF:
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
571
            return result
3009.2.22 by Aaron Bentley
Update names & docstring
572
        return DiffPath._diff_many(self.differs, file_id, old_path, new_path,
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
573
                                     None, new_kind)
574
575
3009.2.22 by Aaron Bentley
Update names & docstring
576
class DiffDirectory(DiffPath):
3009.2.19 by Aaron Bentley
Implement directory diffing
577
578
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
579
        """Perform comparison between two directories.  (dummy)
580
581
        """
582
        if 'directory' not in (old_kind, new_kind):
583
            return self.CANNOT_DIFF
584
        if old_kind not in ('directory', None):
585
            return self.CANNOT_DIFF
586
        if new_kind not in ('directory', None):
587
            return self.CANNOT_DIFF
588
        return self.CHANGED
589
3009.2.20 by Aaron Bentley
PEP8
590
3009.2.22 by Aaron Bentley
Update names & docstring
591
class DiffSymlink(DiffPath):
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
592
593
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
3009.2.17 by Aaron Bentley
Update docs
594
        """Perform comparison between two symlinks
595
596
        :param file_id: The file_id of the file to compare
597
        :param old_path: Path of the file in the old tree
598
        :param new_path: Path of the file in the new tree
599
        :param old_kind: Old file-kind of the file
600
        :param new_kind: New file-kind of the file
601
        """
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
602
        if 'symlink' not in (old_kind, new_kind):
3009.2.14 by Aaron Bentley
Update return type handling
603
            return self.CANNOT_DIFF
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
604
        if old_kind == 'symlink':
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
605
            old_target = self.old_tree.get_symlink_target(old_path, file_id)
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
606
        elif old_kind is None:
607
            old_target = None
608
        else:
3009.2.14 by Aaron Bentley
Update return type handling
609
            return self.CANNOT_DIFF
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
610
        if new_kind == 'symlink':
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
611
            new_target = self.new_tree.get_symlink_target(new_path, file_id)
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
612
        elif new_kind is None:
613
            new_target = None
614
        else:
3009.2.14 by Aaron Bentley
Update return type handling
615
            return self.CANNOT_DIFF
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
616
        return self.diff_symlink(old_target, new_target)
617
618
    def diff_symlink(self, old_target, new_target):
619
        if old_target is None:
620
            self.to_file.write('=== target is %r\n' % new_target)
621
        elif new_target is None:
622
            self.to_file.write('=== target was %r\n' % old_target)
623
        else:
624
            self.to_file.write('=== target changed %r => %r\n' %
625
                              (old_target, new_target))
3009.2.14 by Aaron Bentley
Update return type handling
626
        return self.CHANGED
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
627
628
3009.2.22 by Aaron Bentley
Update names & docstring
629
class DiffText(DiffPath):
3009.2.2 by Aaron Bentley
Implement Differ object for abstracting diffing
630
3009.2.7 by Aaron Bentley
Move responsibility for generating diff labels into Differ.diff
631
    # GNU Patch uses the epoch date to detect files that are being added
632
    # or removed in a diff.
633
    EPOCH_DATE = '1970-01-01 00:00:00 +0000'
634
6524.5.5 by Paul Nixon
Added tests of configurable context
635
    def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8', 
636
                 old_label='', new_label='', text_differ=internal_diff, 
6524.5.8 by Paul Nixon
Changed "default_context_amount" to be "DEFAULT_CONTEXT_AMOUNT" to be
637
                 context_lines=DEFAULT_CONTEXT_AMOUNT):
3009.2.22 by Aaron Bentley
Update names & docstring
638
        DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
639
        self.text_differ = text_differ
640
        self.old_label = old_label
641
        self.new_label = new_label
3009.2.12 by Aaron Bentley
Associate labels with text diffing only
642
        self.path_encoding = path_encoding
6524.5.1 by pauljnixon at gmail
Made diffs more configurable
643
        self.context_lines = context_lines
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
644
645
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
3009.2.17 by Aaron Bentley
Update docs
646
        """Compare two files in unified diff format
647
648
        :param file_id: The file_id of the file to compare
649
        :param old_path: Path of the file in the old tree
650
        :param new_path: Path of the file in the new tree
651
        :param old_kind: Old file-kind of the file
652
        :param new_kind: New file-kind of the file
653
        """
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
654
        if 'file' not in (old_kind, new_kind):
3009.2.14 by Aaron Bentley
Update return type handling
655
            return self.CANNOT_DIFF
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
656
        from_file_id = to_file_id = file_id
657
        if old_kind == 'file':
658
            old_date = _patch_header_date(self.old_tree, file_id, old_path)
659
        elif old_kind is None:
660
            old_date = self.EPOCH_DATE
3009.2.12 by Aaron Bentley
Associate labels with text diffing only
661
            from_file_id = None
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
662
        else:
3009.2.14 by Aaron Bentley
Update return type handling
663
            return self.CANNOT_DIFF
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
664
        if new_kind == 'file':
665
            new_date = _patch_header_date(self.new_tree, file_id, new_path)
666
        elif new_kind is None:
667
            new_date = self.EPOCH_DATE
668
            to_file_id = None
669
        else:
3009.2.14 by Aaron Bentley
Update return type handling
670
            return self.CANNOT_DIFF
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
671
        from_label = '%s%s\t%s' % (self.old_label, old_path, old_date)
672
        to_label = '%s%s\t%s' % (self.new_label, new_path, new_date)
6809.4.9 by Jelmer Vernooij
Fix some more tests.
673
        return self.diff_text(old_path, new_path, from_label, to_label,
674
            from_file_id, to_file_id)
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
675
6809.4.9 by Jelmer Vernooij
Fix some more tests.
676
    def diff_text(self, from_path, to_path, from_label, to_label,
677
        from_file_id=None, to_file_id=None):
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
678
        """Diff the content of given files in two trees
679
6809.4.9 by Jelmer Vernooij
Fix some more tests.
680
        :param from_path: The path in the from tree. If None,
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
681
            the file is not present in the from tree.
6809.4.9 by Jelmer Vernooij
Fix some more tests.
682
        :param to_path: The path in the to tree. This may refer
683
            to a different file from from_path.  If None,
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
684
            the file is not present in the to tree.
6809.4.9 by Jelmer Vernooij
Fix some more tests.
685
        :param from_file_id: The id of the file in the from tree or None if
686
            unknown.
687
        :param to_file_id: The id of the file in the to tree or None if
688
            unknown.
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
689
        """
4377.3.3 by Ian Clatworthy
avoid unnecessary id2path calculation when diffing
690
        def _get_text(tree, file_id, path):
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
691
            if file_id is None:
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
692
                return []
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
693
            return tree.get_file_lines(path, file_id)
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
694
        try:
4377.3.3 by Ian Clatworthy
avoid unnecessary id2path calculation when diffing
695
            from_text = _get_text(self.old_tree, from_file_id, from_path)
696
            to_text = _get_text(self.new_tree, to_file_id, to_path)
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
697
            self.text_differ(from_label, from_text, to_label, to_text,
6524.5.1 by pauljnixon at gmail
Made diffs more configurable
698
                             self.to_file, path_encoding=self.path_encoding,
699
                             context_lines=self.context_lines)
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
700
        except errors.BinaryFile:
701
            self.to_file.write(
702
                  ("Binary files %s and %s differ\n" %
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
703
                  (from_label, to_label)).encode(self.path_encoding, 'replace'))
3009.2.14 by Aaron Bentley
Update return type handling
704
        return self.CHANGED
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
705
706
3123.6.2 by Aaron Bentley
Implement diff --using natively
707
class DiffFromTool(DiffPath):
708
709
    def __init__(self, command_template, old_tree, new_tree, to_file,
710
                 path_encoding='utf-8'):
711
        DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
712
        self.command_template = command_template
6681.2.4 by Jelmer Vernooij
More renames.
713
        self._root = osutils.mkdtemp(prefix='brz-diff-')
3123.6.2 by Aaron Bentley
Implement diff --using natively
714
715
    @classmethod
716
    def from_string(klass, command_string, old_tree, new_tree, to_file,
717
                    path_encoding='utf-8'):
4913.5.24 by Gordon Tyler
Added cmdline.split function, which replaces commands.shlex_split_unicode.
718
        command_template = cmdline.split(command_string)
4603.1.20 by Aaron Bentley
Use string.Template substitution with @ as delimiter.
719
        if '@' not in command_string:
720
            command_template.extend(['@old_path', '@new_path'])
3123.6.2 by Aaron Bentley
Implement diff --using natively
721
        return klass(command_template, old_tree, new_tree, to_file,
722
                     path_encoding)
723
724
    @classmethod
5349.1.4 by Matthäus G. Chajdas
Allow both --using and --diff-options.
725
    def make_from_diff_tree(klass, command_string, external_diff_options=None):
3123.6.2 by Aaron Bentley
Implement diff --using natively
726
        def from_diff_tree(diff_tree):
5349.1.4 by Matthäus G. Chajdas
Allow both --using and --diff-options.
727
            full_command_string = [command_string]
728
            if external_diff_options is not None:
729
                full_command_string += ' ' + external_diff_options
730
            return klass.from_string(full_command_string, diff_tree.old_tree,
3123.6.2 by Aaron Bentley
Implement diff --using natively
731
                                     diff_tree.new_tree, diff_tree.to_file)
732
        return from_diff_tree
733
734
    def _get_command(self, old_path, new_path):
735
        my_map = {'old_path': old_path, 'new_path': new_path}
5074.5.1 by INADA Naoki
merge #523746 fix from lp:~songofacandy/bzr/fix-523746-2
736
        command = [AtTemplate(t).substitute(my_map) for t in
737
                   self.command_template]
4634.171.2 by INADA Naoki
Make temporary filename more friendly for non ascii filename.
738
        if sys.platform == 'win32': # Popen doesn't accept unicode on win32
739
            command_encoded = []
740
            for c in command:
741
                if isinstance(c, unicode):
742
                    command_encoded.append(c.encode('mbcs'))
743
                else:
744
                    command_encoded.append(c)
745
            return command_encoded
746
        else:
747
            return command
3123.6.2 by Aaron Bentley
Implement diff --using natively
748
749
    def _execute(self, old_path, new_path):
3145.1.1 by Aaron Bentley
Handle missing tools gracefully in diff --using
750
        command = self._get_command(old_path, new_path)
751
        try:
752
            proc = subprocess.Popen(command, stdout=subprocess.PIPE,
753
                                    cwd=self._root)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
754
        except OSError as e:
3145.1.1 by Aaron Bentley
Handle missing tools gracefully in diff --using
755
            if e.errno == errno.ENOENT:
756
                raise errors.ExecutableMissing(command[0])
3145.1.2 by Aaron Bentley
Don't swallow other OSErrors
757
            else:
758
                raise
3123.6.2 by Aaron Bentley
Implement diff --using natively
759
        self.to_file.write(proc.stdout.read())
760
        return proc.wait()
761
3123.6.5 by Aaron Bentley
Symlink to real files if possible
762
    def _try_symlink_root(self, tree, prefix):
3287.18.3 by Matt McClure
Toward a more acceptable patch for bug 209281.
763
        if (getattr(tree, 'abspath', None) is None
3287.18.14 by Matt McClure
Extracted a host_os_dereferences_symlinks method.
764
            or not osutils.host_os_dereferences_symlinks()):
3123.6.5 by Aaron Bentley
Symlink to real files if possible
765
            return False
766
        try:
767
            os.symlink(tree.abspath(''), osutils.pathjoin(self._root, prefix))
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
768
        except OSError as e:
3123.6.5 by Aaron Bentley
Symlink to real files if possible
769
            if e.errno != errno.EEXIST:
770
                raise
771
        return True
772
5074.5.8 by INADA Naoki
Use tempfile when filepath in tree is not be able to encode with fsencoding.
773
    @staticmethod
774
    def _fenc():
5074.5.9 by INADA Naoki
Make additional comments to clarify
775
        """Returns safe encoding for passing file path to diff tool"""
5074.5.8 by INADA Naoki
Use tempfile when filepath in tree is not be able to encode with fsencoding.
776
        if sys.platform == 'win32':
777
            return 'mbcs'
778
        else:
779
            # Don't fallback to 'utf-8' because subprocess may not be able to
780
            # handle utf-8 correctly when locale is not utf-8.
781
            return sys.getfilesystemencoding() or 'ascii'
782
783
    def _is_safepath(self, path):
784
        """Return true if `path` may be able to pass to subprocess."""
785
        fenc = self._fenc()
786
        try:
787
            return path == path.encode(fenc).decode(fenc)
788
        except UnicodeError:
789
            return False
790
5074.5.7 by INADA Naoki
Test for filename encoding can't test subprocess execution because
791
    def _safe_filename(self, prefix, relpath):
5074.5.8 by INADA Naoki
Use tempfile when filepath in tree is not be able to encode with fsencoding.
792
        """Replace unsafe character in `relpath` then join `self._root`,
793
        `prefix` and `relpath`."""
794
        fenc = self._fenc()
4634.171.4 by INADA Naoki
Append comment for why decode() needed before replace().
795
        # encoded_str.replace('?', '_') may break multibyte char.
796
        # So we should encode, decode, then replace(u'?', u'_')
4634.171.2 by INADA Naoki
Make temporary filename more friendly for non ascii filename.
797
        relpath_tmp = relpath.encode(fenc, 'replace').decode(fenc, 'replace')
4634.171.3 by INADA Naoki
Fix easy miss.
798
        relpath_tmp = relpath_tmp.replace(u'?', u'_')
5074.5.7 by INADA Naoki
Test for filename encoding can't test subprocess execution because
799
        return osutils.pathjoin(self._root, prefix, relpath_tmp)
800
6809.4.15 by Jelmer Vernooij
Fix some more tests.
801
    def _write_file(self, relpath, tree, prefix, force_temp=False,
802
                    allow_write=False, file_id=None):
5074.5.7 by INADA Naoki
Test for filename encoding can't test subprocess execution because
803
        if not force_temp and isinstance(tree, WorkingTree):
6809.4.15 by Jelmer Vernooij
Fix some more tests.
804
            full_path = tree.abspath(relpath)
5074.5.8 by INADA Naoki
Use tempfile when filepath in tree is not be able to encode with fsencoding.
805
            if self._is_safepath(full_path):
806
                return full_path
5074.5.7 by INADA Naoki
Test for filename encoding can't test subprocess execution because
807
808
        full_path = self._safe_filename(prefix, relpath)
4603.1.4 by Aaron Bentley
Implement DiffFromTool.edit_file
809
        if not force_temp and self._try_symlink_root(tree, prefix):
3123.6.5 by Aaron Bentley
Symlink to real files if possible
810
            return full_path
3123.6.4 by Aaron Bentley
Set mtime (and atime) on files for --using
811
        parent_dir = osutils.dirname(full_path)
3123.6.2 by Aaron Bentley
Implement diff --using natively
812
        try:
813
            os.makedirs(parent_dir)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
814
        except OSError as e:
3123.6.2 by Aaron Bentley
Implement diff --using natively
815
            if e.errno != errno.EEXIST:
816
                raise
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
817
        source = tree.get_file(relpath, file_id)
3123.6.2 by Aaron Bentley
Implement diff --using natively
818
        try:
3123.6.4 by Aaron Bentley
Set mtime (and atime) on files for --using
819
            target = open(full_path, 'wb')
3123.6.2 by Aaron Bentley
Implement diff --using natively
820
            try:
821
                osutils.pumpfile(source, target)
822
            finally:
823
                target.close()
824
        finally:
825
            source.close()
4976.1.3 by Jelmer Vernooij
Cope with ghosts in 'bzr diff'
826
        try:
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
827
            mtime = tree.get_file_mtime(relpath, file_id)
6731.1.1 by Jelmer Vernooij
Move FileTimestampUnavailable to breezy.tree.
828
        except FileTimestampUnavailable:
5151.3.2 by Martin
Don't try and warp files back to the 70s if no timestamp is available
829
            pass
830
        else:
831
            os.utime(full_path, (mtime, mtime))
5151.3.1 by Martin
Fix os.utime test failures, three on FAT filesystems and one with readonly files
832
        if not allow_write:
833
            osutils.make_readonly(full_path)
3123.6.4 by Aaron Bentley
Set mtime (and atime) on files for --using
834
        return full_path
3123.6.2 by Aaron Bentley
Implement diff --using natively
835
6809.4.15 by Jelmer Vernooij
Fix some more tests.
836
    def _prepare_files(self, old_path, new_path, force_temp=False,
837
                       allow_write_new=False, file_id=None):
838
        old_disk_path = self._write_file(old_path, self.old_tree, 'old',
839
                                         force_temp, file_id=file_id)
840
        new_disk_path = self._write_file(new_path, self.new_tree, 'new',
841
                                         force_temp, file_id=file_id,
4603.1.4 by Aaron Bentley
Implement DiffFromTool.edit_file
842
                                         allow_write=allow_write_new)
3123.6.2 by Aaron Bentley
Implement diff --using natively
843
        return old_disk_path, new_disk_path
844
845
    def finish(self):
4354.6.1 by Martitza Mendez
Fix 363837 : catch OSError from osutils.rmtree and mutter to trace file.
846
        try:
847
            osutils.rmtree(self._root)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
848
        except OSError as e:
4354.6.1 by Martitza Mendez
Fix 363837 : catch OSError from osutils.rmtree and mutter to trace file.
849
            if e.errno != errno.ENOENT:
4399.1.1 by Ian Clatworthy
(igc) address temp file issue with diff --using on Windows (Martitza Mendez)
850
                mutter("The temporary directory \"%s\" was not "
851
                        "cleanly removed: %s." % (self._root, e))
3123.6.2 by Aaron Bentley
Implement diff --using natively
852
853
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
854
        if (old_kind, new_kind) != ('file', 'file'):
855
            return DiffPath.CANNOT_DIFF
4845.2.1 by Gary van der Merwe
When launching an external diff app, don't write temporary files for a working tree.
856
        (old_disk_path, new_disk_path) = self._prepare_files(
6809.4.15 by Jelmer Vernooij
Fix some more tests.
857
                old_path, new_path, file_id=file_id)
4845.2.1 by Gary van der Merwe
When launching an external diff app, don't write temporary files for a working tree.
858
        self._execute(old_disk_path, new_disk_path)
4603.1.1 by Aaron Bentley
Initial pass at shelve-via-editor.
859
6809.4.20 by Jelmer Vernooij
Fix tests.
860
    def edit_file(self, old_path, new_path, file_id=None):
4603.1.4 by Aaron Bentley
Implement DiffFromTool.edit_file
861
        """Use this tool to edit a file.
862
863
        A temporary copy will be edited, and the new contents will be
864
        returned.
865
866
        :param file_id: The id of the file to edit.
867
        :return: The new contents of the file.
868
        """
5074.5.1 by INADA Naoki
merge #523746 fix from lp:~songofacandy/bzr/fix-523746-2
869
        old_abs_path, new_abs_path = self._prepare_files(
6809.4.20 by Jelmer Vernooij
Fix tests.
870
                old_path, new_path, allow_write_new=True, force_temp=True,
871
                file_id=file_id)
5074.5.1 by INADA Naoki
merge #523746 fix from lp:~songofacandy/bzr/fix-523746-2
872
        command = self._get_command(old_abs_path, new_abs_path)
4603.1.24 by Aaron Bentley
Fix call import/invocation.
873
        subprocess.call(command, cwd=self._root)
5074.5.1 by INADA Naoki
merge #523746 fix from lp:~songofacandy/bzr/fix-523746-2
874
        new_file = open(new_abs_path, 'rb')
4603.1.4 by Aaron Bentley
Implement DiffFromTool.edit_file
875
        try:
876
            return new_file.read()
877
        finally:
878
            new_file.close()
879
3123.6.2 by Aaron Bentley
Implement diff --using natively
880
3009.2.22 by Aaron Bentley
Update names & docstring
881
class DiffTree(object):
882
    """Provides textual representations of the difference between two trees.
883
884
    A DiffTree examines two trees and where a file-id has altered
885
    between them, generates a textual representation of the difference.
886
    DiffTree uses a sequence of DiffPath objects which are each
887
    given the opportunity to handle a given altered fileid. The list
888
    of DiffPath objects can be extended globally by appending to
889
    DiffTree.diff_factories, or for a specific diff operation by
3009.2.27 by Aaron Bentley
Use extra_factories instead of extra_diffs
890
    supplying the extra_factories option to the appropriate method.
3009.2.22 by Aaron Bentley
Update names & docstring
891
    """
892
893
    # list of factories that can provide instances of DiffPath objects
3009.2.17 by Aaron Bentley
Update docs
894
    # may be extended by plugins.
3009.2.28 by Aaron Bentley
Add from_diff_tree factories
895
    diff_factories = [DiffSymlink.from_diff_tree,
896
                      DiffDirectory.from_diff_tree]
3009.2.13 by Aaron Bentley
Refactor differ to support registering differ factories
897
3009.2.12 by Aaron Bentley
Associate labels with text diffing only
898
    def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
3009.2.28 by Aaron Bentley
Add from_diff_tree factories
899
                 diff_text=None, extra_factories=None):
3009.2.17 by Aaron Bentley
Update docs
900
        """Constructor
901
902
        :param old_tree: Tree to show as old in the comparison
903
        :param new_tree: Tree to show as new in the comparison
904
        :param to_file: File to write comparision to
905
        :param path_encoding: Character encoding to write paths in
3009.2.28 by Aaron Bentley
Add from_diff_tree factories
906
        :param diff_text: DiffPath-type object to use as a last resort for
3009.2.17 by Aaron Bentley
Update docs
907
            diffing text files.
3009.2.27 by Aaron Bentley
Use extra_factories instead of extra_diffs
908
        :param extra_factories: Factories of DiffPaths to try before any other
909
            DiffPaths"""
3009.2.28 by Aaron Bentley
Add from_diff_tree factories
910
        if diff_text is None:
911
            diff_text = DiffText(old_tree, new_tree, to_file, path_encoding,
912
                                 '', '',  internal_diff)
3009.2.4 by Aaron Bentley
Make old_tree/new_tree construction parameters of Differ
913
        self.old_tree = old_tree
914
        self.new_tree = new_tree
3009.2.2 by Aaron Bentley
Implement Differ object for abstracting diffing
915
        self.to_file = to_file
3009.2.28 by Aaron Bentley
Add from_diff_tree factories
916
        self.path_encoding = path_encoding
3009.2.13 by Aaron Bentley
Refactor differ to support registering differ factories
917
        self.differs = []
3009.2.27 by Aaron Bentley
Use extra_factories instead of extra_diffs
918
        if extra_factories is not None:
3009.2.28 by Aaron Bentley
Add from_diff_tree factories
919
            self.differs.extend(f(self) for f in extra_factories)
920
        self.differs.extend(f(self) for f in self.diff_factories)
921
        self.differs.extend([diff_text, DiffKindChange.from_diff_tree(self)])
3009.2.6 by Aaron Bentley
Convert show_diff_trees into a Differ method
922
923
    @classmethod
924
    def from_trees_options(klass, old_tree, new_tree, to_file,
3009.2.17 by Aaron Bentley
Update docs
925
                           path_encoding, external_diff_options, old_label,
6524.5.4 by Paul Nixon
Clearing up default context options
926
                           new_label, using, context_lines):
3009.2.22 by Aaron Bentley
Update names & docstring
927
        """Factory for producing a DiffTree.
3009.2.17 by Aaron Bentley
Update docs
928
929
        Designed to accept options used by show_diff_trees.
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
930
3009.2.17 by Aaron Bentley
Update docs
931
        :param old_tree: The tree to show as old in the comparison
932
        :param new_tree: The tree to show as new in the comparison
933
        :param to_file: File to write comparisons to
934
        :param path_encoding: Character encoding to use for writing paths
935
        :param external_diff_options: If supplied, use the installed diff
936
            binary to perform file comparison, using supplied options.
937
        :param old_label: Prefix to use for old file labels
938
        :param new_label: Prefix to use for new file labels
3123.6.2 by Aaron Bentley
Implement diff --using natively
939
        :param using: Commandline to use to invoke an external diff tool
3009.2.17 by Aaron Bentley
Update docs
940
        """
3123.6.2 by Aaron Bentley
Implement diff --using natively
941
        if using is not None:
5349.1.4 by Matthäus G. Chajdas
Allow both --using and --diff-options.
942
            extra_factories = [DiffFromTool.make_from_diff_tree(using, external_diff_options)]
3123.6.2 by Aaron Bentley
Implement diff --using natively
943
        else:
944
            extra_factories = []
3009.2.6 by Aaron Bentley
Convert show_diff_trees into a Differ method
945
        if external_diff_options:
946
            opts = external_diff_options.split()
6524.5.5 by Paul Nixon
Added tests of configurable context
947
            def diff_file(olab, olines, nlab, nlines, to_file, path_encoding=None, context_lines=None):
4797.57.2 by Alexander Belchenko
fixing test with external_diff
948
                """:param path_encoding: not used but required
949
                        to match the signature of internal_diff.
950
                """
3009.2.6 by Aaron Bentley
Convert show_diff_trees into a Differ method
951
                external_diff(olab, olines, nlab, nlines, to_file, opts)
952
        else:
953
            diff_file = internal_diff
3009.2.28 by Aaron Bentley
Add from_diff_tree factories
954
        diff_text = DiffText(old_tree, new_tree, to_file, path_encoding,
6524.5.1 by pauljnixon at gmail
Made diffs more configurable
955
                             old_label, new_label, diff_file, context_lines=context_lines)
3123.6.2 by Aaron Bentley
Implement diff --using natively
956
        return klass(old_tree, new_tree, to_file, path_encoding, diff_text,
957
                     extra_factories)
3009.2.6 by Aaron Bentley
Convert show_diff_trees into a Differ method
958
3009.2.12 by Aaron Bentley
Associate labels with text diffing only
959
    def show_diff(self, specific_files, extra_trees=None):
3009.2.17 by Aaron Bentley
Update docs
960
        """Write tree diff to self.to_file
961
5131.1.4 by Jelmer Vernooij
Add test for custom diff format.
962
        :param specific_files: the specific files to compare (recursive)
3009.2.17 by Aaron Bentley
Update docs
963
        :param extra_trees: extra trees to use for mapping paths to file_ids
964
        """
3123.6.2 by Aaron Bentley
Implement diff --using natively
965
        try:
966
            return self._show_diff(specific_files, extra_trees)
967
        finally:
968
            for differ in self.differs:
969
                differ.finish()
970
971
    def _show_diff(self, specific_files, extra_trees):
3009.2.6 by Aaron Bentley
Convert show_diff_trees into a Differ method
972
        # TODO: Generation of pseudo-diffs for added/deleted files could
973
        # be usefully made into a much faster special case.
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
974
        iterator = self.new_tree.iter_changes(self.old_tree,
3123.4.1 by Aaron Bentley
Diff sorts files in alphabetical order
975
                                               specific_files=specific_files,
976
                                               extra_trees=extra_trees,
977
                                               require_versioned=True)
3009.2.6 by Aaron Bentley
Convert show_diff_trees into a Differ method
978
        has_changes = 0
3123.4.1 by Aaron Bentley
Diff sorts files in alphabetical order
979
        def changes_key(change):
980
            old_path, new_path = change[1]
981
            path = new_path
982
            if path is None:
983
                path = old_path
984
            return path
985
        def get_encoded_path(path):
986
            if path is not None:
987
                return path.encode(self.path_encoding, "replace")
988
        for (file_id, paths, changed_content, versioned, parent, name, kind,
989
             executable) in sorted(iterator, key=changes_key):
3619.4.2 by Robert Collins
Change bzrlib.diff.DiffTree.show_diff to skip entries missing in both trees.
990
            # The root does not get diffed, and items with no known kind (that
991
            # is, missing) in both trees are skipped as well.
992
            if parent == (None, None) or kind == (None, None):
3123.4.3 by Aaron Bentley
Tweak path handling
993
                continue
994
            oldpath, newpath = paths
3123.4.1 by Aaron Bentley
Diff sorts files in alphabetical order
995
            oldpath_encoded = get_encoded_path(paths[0])
996
            newpath_encoded = get_encoded_path(paths[1])
997
            old_present = (kind[0] is not None and versioned[0])
998
            new_present = (kind[1] is not None and versioned[1])
999
            renamed = (parent[0], name[0]) != (parent[1], name[1])
3268.1.1 by C Miller
Describe the property changes in diffs. Currently, this is the executable-bit
1000
1001
            properties_changed = []
1002
            properties_changed.extend(get_executable_change(executable[0], executable[1]))
1003
1004
            if properties_changed:
1005
                prop_str = " (properties changed: %s)" % (", ".join(properties_changed),)
1006
            else:
1007
                prop_str = ""
1008
3123.4.1 by Aaron Bentley
Diff sorts files in alphabetical order
1009
            if (old_present, new_present) == (True, False):
1010
                self.to_file.write("=== removed %s '%s'\n" %
1011
                                   (kind[0], oldpath_encoded))
3123.4.3 by Aaron Bentley
Tweak path handling
1012
                newpath = oldpath
3123.4.1 by Aaron Bentley
Diff sorts files in alphabetical order
1013
            elif (old_present, new_present) == (False, True):
1014
                self.to_file.write("=== added %s '%s'\n" %
1015
                                   (kind[1], newpath_encoded))
3123.4.3 by Aaron Bentley
Tweak path handling
1016
                oldpath = newpath
3123.4.1 by Aaron Bentley
Diff sorts files in alphabetical order
1017
            elif renamed:
1018
                self.to_file.write("=== renamed %s '%s' => '%s'%s\n" %
1019
                    (kind[0], oldpath_encoded, newpath_encoded, prop_str))
3123.4.2 by Aaron Bentley
Handle diff with property change correctly
1020
            else:
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
1021
                # if it was produced by iter_changes, it must be
3123.4.2 by Aaron Bentley
Handle diff with property change correctly
1022
                # modified *somehow*, either content or execute bit.
3123.4.1 by Aaron Bentley
Diff sorts files in alphabetical order
1023
                self.to_file.write("=== modified %s '%s'%s\n" % (kind[0],
1024
                                   newpath_encoded, prop_str))
1025
            if changed_content:
6809.4.15 by Jelmer Vernooij
Fix some more tests.
1026
                self._diff(oldpath, newpath, kind[0], kind[1], file_id=file_id)
3123.4.1 by Aaron Bentley
Diff sorts files in alphabetical order
1027
                has_changes = 1
1028
            if renamed:
1029
                has_changes = 1
3009.2.6 by Aaron Bentley
Convert show_diff_trees into a Differ method
1030
        return has_changes
3009.2.2 by Aaron Bentley
Implement Differ object for abstracting diffing
1031
3009.2.12 by Aaron Bentley
Associate labels with text diffing only
1032
    def diff(self, file_id, old_path, new_path):
3009.2.17 by Aaron Bentley
Update docs
1033
        """Perform a diff of a single file
1034
1035
        :param file_id: file-id of the file
1036
        :param old_path: The path of the file in the old tree
1037
        :param new_path: The path of the file in the new tree
1038
        """
6809.4.11 by Jelmer Vernooij
Fix diff tests.
1039
        if old_path is None:
1040
            old_kind = None
1041
        else:
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
1042
            old_kind = self.old_tree.kind(old_path, file_id)
6809.4.11 by Jelmer Vernooij
Fix diff tests.
1043
        if new_path is None:
1044
            new_kind = None
1045
        else:
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
1046
            new_kind = self.new_tree.kind(new_path, file_id)
6809.4.15 by Jelmer Vernooij
Fix some more tests.
1047
        self._diff(old_path, new_path, old_kind, new_kind, file_id=file_id)
4377.3.1 by Ian Clatworthy
faster diff on large trees
1048
6809.4.15 by Jelmer Vernooij
Fix some more tests.
1049
    def _diff(self, old_path, new_path, old_kind, new_kind, file_id):
3009.2.22 by Aaron Bentley
Update names & docstring
1050
        result = DiffPath._diff_many(self.differs, file_id, old_path,
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
1051
                                       new_path, old_kind, new_kind)
3009.2.22 by Aaron Bentley
Update names & docstring
1052
        if result is DiffPath.CANNOT_DIFF:
3009.2.11 by Aaron Bentley
Refactor diff to be more pluggable
1053
            error_path = new_path
1054
            if error_path is None:
1055
                error_path = old_path
3009.2.22 by Aaron Bentley
Update names & docstring
1056
            raise errors.NoDiffFound(error_path)
5131.1.1 by Jelmer Vernooij
Add --format option to 'bzr diff'.
1057
1058
1059
format_registry = Registry()
1060
format_registry.register('default', DiffTree)