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