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