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