/brz/remove-bazaar

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