bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
1658.1.9
by Martin Pool
 Give an error for bzr diff on an nonexistent file (Malone #3619)  | 
1  | 
# Copyright (C) 2004, 2005, 2006 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
 | 
|
15  | 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
16  | 
||
| 
2520.4.140
by Aaron Bentley
 Use matching blocks from mpdiff for knit delta creation  | 
17  | 
import difflib  | 
| 
1711.2.54
by John Arbash Meinel
 Use mkstemp instead of NamedTemporary file for external diff.  | 
18  | 
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  | 
19  | 
import re  | 
| 
1996.3.9
by John Arbash Meinel
 lazy_import diff.py  | 
20  | 
import sys  | 
21  | 
||
22  | 
from bzrlib.lazy_import import lazy_import  | 
|
23  | 
lazy_import(globals(), """  | 
|
24  | 
import errno
 | 
|
| 
1692.8.7
by James Henstridge
 changes suggested by John Meinel  | 
25  | 
import subprocess
 | 
| 
1711.2.54
by John Arbash Meinel
 Use mkstemp instead of NamedTemporary file for external diff.  | 
26  | 
import tempfile
 | 
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
27  | 
import time
 | 
28  | 
||
| 
1955.2.10
by John Arbash Meinel
 Unset a few other LANG type variables when spawning diff  | 
29  | 
from bzrlib import (
 | 
30  | 
    errors,
 | 
|
31  | 
    osutils,
 | 
|
| 
1996.3.9
by John Arbash Meinel
 lazy_import diff.py  | 
32  | 
    patiencediff,
 | 
33  | 
    textfile,
 | 
|
| 
1551.12.29
by Aaron Bentley
 Copy and extend patch date formatting code, add patch-date parsing  | 
34  | 
    timestamp,
 | 
| 
1955.2.10
by John Arbash Meinel
 Unset a few other LANG type variables when spawning diff  | 
35  | 
    )
 | 
| 
1996.3.9
by John Arbash Meinel
 lazy_import diff.py  | 
36  | 
""")  | 
37  | 
||
38  | 
from bzrlib.symbol_versioning import (  | 
|
39  | 
deprecated_function,  | 
|
40  | 
        )
 | 
|
| 
1711.2.54
by John Arbash Meinel
 Use mkstemp instead of NamedTemporary file for external diff.  | 
41  | 
from bzrlib.trace import mutter, warning  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
42  | 
|
| 
1711.2.24
by John Arbash Meinel
 Late bind to PatienceSequenceMatcher to allow plugin to override.  | 
43  | 
|
| 
767
by Martin Pool
 - files are only reported as modified if their name or parent has changed,  | 
44  | 
# TODO: Rather than building a changeset object, we should probably
 | 
45  | 
# invoke callbacks on an object.  That object can either accumulate a
 | 
|
46  | 
# list, write them out directly, etc etc.
 | 
|
47  | 
||
| 
2520.4.140
by Aaron Bentley
 Use matching blocks from mpdiff for knit delta creation  | 
48  | 
|
49  | 
class _PrematchedMatcher(difflib.SequenceMatcher):  | 
|
50  | 
"""Allow SequenceMatcher operations to use predetermined blocks"""  | 
|
51  | 
||
52  | 
def __init__(self, matching_blocks):  | 
|
53  | 
difflib.SequenceMatcher(self, None, None)  | 
|
54  | 
self.matching_blocks = matching_blocks  | 
|
55  | 
self.opcodes = None  | 
|
56  | 
||
57  | 
||
| 
1558.15.11
by Aaron Bentley
 Apply merge review suggestions  | 
58  | 
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file,  | 
| 
1711.2.30
by John Arbash Meinel
 Fix bug in internal_diff handling of unicode paths  | 
59  | 
allow_binary=False, sequence_matcher=None,  | 
60  | 
path_encoding='utf8'):  | 
|
| 
475
by Martin Pool
 - rewrite diff using compare_trees()  | 
61  | 
    # FIXME: difflib is wrong if there is no trailing newline.
 | 
62  | 
    # The syntax used by patch seems to be "\ No newline at
 | 
|
63  | 
    # end of file" following the last diff line from that
 | 
|
64  | 
    # file.  This is not trivial to insert into the
 | 
|
65  | 
    # unified_diff output and it might be better to just fix
 | 
|
66  | 
    # or replace that function.
 | 
|
67  | 
||
68  | 
    # In the meantime we at least make sure the patch isn't
 | 
|
69  | 
    # mangled.
 | 
|
70  | 
||
71  | 
||
72  | 
    # Special workaround for Python2.3, where difflib fails if
 | 
|
73  | 
    # both sequences are empty.
 | 
|
74  | 
if not oldlines and not newlines:  | 
|
75  | 
        return
 | 
|
| 
1558.15.2
by Aaron Bentley
 Implemented binary file handling for diff  | 
76  | 
|
| 
1558.15.11
by Aaron Bentley
 Apply merge review suggestions  | 
77  | 
if allow_binary is False:  | 
| 
1996.3.9
by John Arbash Meinel
 lazy_import diff.py  | 
78  | 
textfile.check_text_lines(oldlines)  | 
79  | 
textfile.check_text_lines(newlines)  | 
|
| 
475
by Martin Pool
 - rewrite diff using compare_trees()  | 
80  | 
|
| 
1185.81.8
by John Arbash Meinel
 Updating unified_diff to take a factory, using the new diff algorithm in the code.  | 
81  | 
if sequence_matcher is None:  | 
| 
1996.3.9
by John Arbash Meinel
 lazy_import diff.py  | 
82  | 
sequence_matcher = patiencediff.PatienceSequenceMatcher  | 
83  | 
ud = patiencediff.unified_diff(oldlines, newlines,  | 
|
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
84  | 
fromfile=old_filename.encode(path_encoding),  | 
85  | 
tofile=new_filename.encode(path_encoding),  | 
|
| 
1185.81.8
by John Arbash Meinel
 Updating unified_diff to take a factory, using the new diff algorithm in the code.  | 
86  | 
sequencematcher=sequence_matcher)  | 
| 
475
by Martin Pool
 - rewrite diff using compare_trees()  | 
87  | 
|
| 
1092.1.50
by Robert Collins
 make diff lsdiff/filterdiff friendly  | 
88  | 
ud = list(ud)  | 
| 
475
by Martin Pool
 - rewrite diff using compare_trees()  | 
89  | 
    # work-around for difflib being too smart for its own good
 | 
90  | 
    # if /dev/null is "1,0", patch won't recognize it as /dev/null
 | 
|
91  | 
if not oldlines:  | 
|
92  | 
ud[2] = ud[2].replace('-1,0', '-0,0')  | 
|
93  | 
elif not newlines:  | 
|
94  | 
ud[2] = ud[2].replace('+1,0', '+0,0')  | 
|
| 
1092.1.50
by Robert Collins
 make diff lsdiff/filterdiff friendly  | 
95  | 
    # work around for difflib emitting random spaces after the label
 | 
96  | 
ud[0] = ud[0][:-2] + '\n'  | 
|
97  | 
ud[1] = ud[1][:-2] + '\n'  | 
|
| 
475
by Martin Pool
 - rewrite diff using compare_trees()  | 
98  | 
|
| 
804
by Martin Pool
 Patch from John:  | 
99  | 
for line in ud:  | 
100  | 
to_file.write(line)  | 
|
| 
974.1.5
by Aaron Bentley
 Fixed handling of missing newlines in udiffs  | 
101  | 
if not line.endswith('\n'):  | 
102  | 
to_file.write("\n\\ No newline at end of file\n")  | 
|
| 
475
by Martin Pool
 - rewrite diff using compare_trees()  | 
103  | 
print >>to_file  | 
104  | 
||
105  | 
||
| 
1920.1.1
by John Arbash Meinel
 fix bug #56307, handle binary files even when LANG is not english  | 
106  | 
def _spawn_external_diff(diffcmd, capture_errors=True):  | 
107  | 
"""Spawn the externall diff process, and return the child handle.  | 
|
108  | 
||
109  | 
    :param diffcmd: The command list to spawn
 | 
|
| 
2138.1.1
by Wouter van Heyst
 Robuster external diff output handling.  | 
110  | 
    :param capture_errors: Capture stderr as well as setting LANG=C
 | 
111  | 
        and LC_ALL=C. This lets us read and understand the output of diff,
 | 
|
112  | 
        and respond to any errors.
 | 
|
| 
1920.1.1
by John Arbash Meinel
 fix bug #56307, handle binary files even when LANG is not english  | 
113  | 
    :return: A Popen object.
 | 
114  | 
    """
 | 
|
115  | 
if capture_errors:  | 
|
| 
2321.2.2
by Alexander Belchenko
 win32 fixes for test_external_diff_binary (gettext on win32 rely on $LANGUAGE)  | 
116  | 
        # construct minimal environment
 | 
117  | 
env = {}  | 
|
118  | 
path = os.environ.get('PATH')  | 
|
119  | 
if path is not None:  | 
|
120  | 
env['PATH'] = path  | 
|
| 
2321.2.5
by Alexander Belchenko
 external diff: no need for special code path for win32 (suggested by John Meinel)  | 
121  | 
env['LANGUAGE'] = 'C' # on win32 only LANGUAGE has effect  | 
122  | 
env['LANG'] = 'C'  | 
|
123  | 
env['LC_ALL'] = 'C'  | 
|
| 
1920.1.1
by John Arbash Meinel
 fix bug #56307, handle binary files even when LANG is not english  | 
124  | 
stderr = subprocess.PIPE  | 
125  | 
else:  | 
|
| 
2321.2.2
by Alexander Belchenko
 win32 fixes for test_external_diff_binary (gettext on win32 rely on $LANGUAGE)  | 
126  | 
env = None  | 
| 
1920.1.1
by John Arbash Meinel
 fix bug #56307, handle binary files even when LANG is not english  | 
127  | 
stderr = None  | 
128  | 
||
129  | 
try:  | 
|
130  | 
pipe = subprocess.Popen(diffcmd,  | 
|
131  | 
stdin=subprocess.PIPE,  | 
|
132  | 
stdout=subprocess.PIPE,  | 
|
133  | 
stderr=stderr,  | 
|
| 
2321.2.2
by Alexander Belchenko
 win32 fixes for test_external_diff_binary (gettext on win32 rely on $LANGUAGE)  | 
134  | 
env=env)  | 
| 
1920.1.1
by John Arbash Meinel
 fix bug #56307, handle binary files even when LANG is not english  | 
135  | 
except OSError, e:  | 
136  | 
if e.errno == errno.ENOENT:  | 
|
137  | 
raise errors.NoDiff(str(e))  | 
|
138  | 
        raise
 | 
|
139  | 
||
140  | 
return pipe  | 
|
141  | 
||
142  | 
||
| 
1185.35.29
by Aaron Bentley
 Support whitespace in diff filenames  | 
143  | 
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,  | 
| 
571
by Martin Pool
 - new --diff-options to pass options through to external  | 
144  | 
diff_opts):  | 
| 
568
by Martin Pool
 - start adding support for showing diffs by calling out to  | 
145  | 
"""Display a diff by calling out to the external diff program."""  | 
| 
581
by Martin Pool
 - make sure any bzr output is flushed before  | 
146  | 
    # make sure our own output is properly ordered before the diff
 | 
147  | 
to_file.flush()  | 
|
148  | 
||
| 
1711.2.54
by John Arbash Meinel
 Use mkstemp instead of NamedTemporary file for external diff.  | 
149  | 
oldtmp_fd, old_abspath = tempfile.mkstemp(prefix='bzr-diff-old-')  | 
150  | 
newtmp_fd, new_abspath = tempfile.mkstemp(prefix='bzr-diff-new-')  | 
|
151  | 
oldtmpf = os.fdopen(oldtmp_fd, 'wb')  | 
|
152  | 
newtmpf = os.fdopen(newtmp_fd, 'wb')  | 
|
| 
568
by Martin Pool
 - start adding support for showing diffs by calling out to  | 
153  | 
|
154  | 
try:  | 
|
155  | 
        # TODO: perhaps a special case for comparing to or from the empty
 | 
|
156  | 
        # sequence; can just use /dev/null on Unix
 | 
|
157  | 
||
158  | 
        # TODO: if either of the files being compared already exists as a
 | 
|
159  | 
        # regular named file (e.g. in the working directory) then we can
 | 
|
160  | 
        # compare directly to that, rather than copying it.
 | 
|
161  | 
||
162  | 
oldtmpf.writelines(oldlines)  | 
|
163  | 
newtmpf.writelines(newlines)  | 
|
164  | 
||
| 
1711.2.54
by John Arbash Meinel
 Use mkstemp instead of NamedTemporary file for external diff.  | 
165  | 
oldtmpf.close()  | 
166  | 
newtmpf.close()  | 
|
| 
568
by Martin Pool
 - start adding support for showing diffs by calling out to  | 
167  | 
|
| 
571
by Martin Pool
 - new --diff-options to pass options through to external  | 
168  | 
if not diff_opts:  | 
169  | 
diff_opts = []  | 
|
170  | 
diffcmd = ['diff',  | 
|
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
171  | 
'--label', old_filename,  | 
| 
1711.2.54
by John Arbash Meinel
 Use mkstemp instead of NamedTemporary file for external diff.  | 
172  | 
old_abspath,  | 
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
173  | 
'--label', new_filename,  | 
| 
1711.2.56
by John Arbash Meinel
 Raise NoDiff if 'diff' not present.  | 
174  | 
new_abspath,  | 
175  | 
'--binary',  | 
|
176  | 
                  ]
 | 
|
| 
571
by Martin Pool
 - new --diff-options to pass options through to external  | 
177  | 
|
178  | 
        # diff only allows one style to be specified; they don't override.
 | 
|
179  | 
        # note that some of these take optargs, and the optargs can be
 | 
|
180  | 
        # directly appended to the options.
 | 
|
181  | 
        # this is only an approximate parser; it doesn't properly understand
 | 
|
182  | 
        # the grammar.
 | 
|
183  | 
for s in ['-c', '-u', '-C', '-U',  | 
|
184  | 
'-e', '--ed',  | 
|
185  | 
'-q', '--brief',  | 
|
186  | 
'--normal',  | 
|
187  | 
'-n', '--rcs',  | 
|
188  | 
'-y', '--side-by-side',  | 
|
189  | 
'-D', '--ifdef']:  | 
|
190  | 
for j in diff_opts:  | 
|
191  | 
if j.startswith(s):  | 
|
192  | 
                    break
 | 
|
193  | 
else:  | 
|
194  | 
                continue
 | 
|
195  | 
            break
 | 
|
196  | 
else:  | 
|
197  | 
diffcmd.append('-u')  | 
|
198  | 
||
199  | 
if diff_opts:  | 
|
200  | 
diffcmd.extend(diff_opts)  | 
|
201  | 
||
| 
1920.1.1
by John Arbash Meinel
 fix bug #56307, handle binary files even when LANG is not english  | 
202  | 
pipe = _spawn_external_diff(diffcmd, capture_errors=True)  | 
203  | 
out,err = pipe.communicate()  | 
|
204  | 
rc = pipe.returncode  | 
|
| 
571
by Martin Pool
 - new --diff-options to pass options through to external  | 
205  | 
|
| 
1920.1.1
by John Arbash Meinel
 fix bug #56307, handle binary files even when LANG is not english  | 
206  | 
        # internal_diff() adds a trailing newline, add one here for consistency
 | 
207  | 
out += '\n'  | 
|
| 
1899.1.5
by John Arbash Meinel
 Always buffer the output of diff, so we can check if retcode==2 is because of Binary files  | 
208  | 
if rc == 2:  | 
209  | 
            # 'diff' gives retcode == 2 for all sorts of errors
 | 
|
210  | 
            # one of those is 'Binary files differ'.
 | 
|
211  | 
            # 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.  | 
212  | 
            # '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  | 
213  | 
lang_c_out = out  | 
214  | 
||
215  | 
            # Since we got here, we want to make sure to give an i18n error
 | 
|
216  | 
pipe = _spawn_external_diff(diffcmd, capture_errors=False)  | 
|
217  | 
out, err = pipe.communicate()  | 
|
218  | 
||
219  | 
            # Write out the new i18n diff response
 | 
|
220  | 
to_file.write(out+'\n')  | 
|
221  | 
if pipe.returncode != 2:  | 
|
| 
1996.3.9
by John Arbash Meinel
 lazy_import diff.py  | 
222  | 
raise errors.BzrError(  | 
223  | 
                               'external diff failed with exit code 2'
 | 
|
| 
2138.1.1
by Wouter van Heyst
 Robuster external diff output handling.  | 
224  | 
                               ' when run with LANG=C and LC_ALL=C,'
 | 
225  | 
' 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  | 
226  | 
|
227  | 
first_line = lang_c_out.split('\n', 1)[0]  | 
|
| 
1904.1.4
by Marien Zwart
 Make external diff in binary mode work with recent versions of diffutils.  | 
228  | 
            # Starting with diffutils 2.8.4 the word "binary" was dropped.
 | 
229  | 
m = re.match('^(binary )?files.*differ$', first_line, re.I)  | 
|
| 
1920.1.1
by John Arbash Meinel
 fix bug #56307, handle binary files even when LANG is not english  | 
230  | 
if m is None:  | 
| 
1996.3.9
by John Arbash Meinel
 lazy_import diff.py  | 
231  | 
raise errors.BzrError('external diff failed with exit code 2;'  | 
232  | 
' command: %r' % (diffcmd,))  | 
|
| 
1920.1.1
by John Arbash Meinel
 fix bug #56307, handle binary files even when LANG is not english  | 
233  | 
else:  | 
234  | 
                # Binary files differ, just return
 | 
|
235  | 
                return
 | 
|
236  | 
||
237  | 
        # If we got to here, we haven't written out the output of diff
 | 
|
238  | 
        # do so now
 | 
|
239  | 
to_file.write(out)  | 
|
240  | 
if rc not in (0, 1):  | 
|
| 
571
by Martin Pool
 - new --diff-options to pass options through to external  | 
241  | 
            # returns 1 if files differ; that's OK
 | 
242  | 
if rc < 0:  | 
|
243  | 
msg = 'signal %d' % (-rc)  | 
|
244  | 
else:  | 
|
245  | 
msg = 'exit code %d' % rc  | 
|
246  | 
||
| 
1996.3.9
by John Arbash Meinel
 lazy_import diff.py  | 
247  | 
raise errors.BzrError('external diff failed with %s; command: %r'  | 
248  | 
% (rc, diffcmd))  | 
|
| 
1899.1.6
by John Arbash Meinel
 internal_diff always adds a trailing \n, make sure external_diff does too  | 
249  | 
|
250  | 
||
| 
568
by Martin Pool
 - start adding support for showing diffs by calling out to  | 
251  | 
finally:  | 
252  | 
oldtmpf.close() # and delete  | 
|
253  | 
newtmpf.close()  | 
|
| 
1711.2.54
by John Arbash Meinel
 Use mkstemp instead of NamedTemporary file for external diff.  | 
254  | 
        # Clean up. Warn in case the files couldn't be deleted
 | 
255  | 
        # (in case windows still holds the file open, but not
 | 
|
256  | 
        # if the files have already been deleted)
 | 
|
257  | 
try:  | 
|
258  | 
os.remove(old_abspath)  | 
|
259  | 
except OSError, e:  | 
|
260  | 
if e.errno not in (errno.ENOENT,):  | 
|
261  | 
warning('Failed to delete temporary file: %s %s',  | 
|
262  | 
old_abspath, e)  | 
|
263  | 
try:  | 
|
264  | 
os.remove(new_abspath)  | 
|
265  | 
except OSError:  | 
|
266  | 
if e.errno not in (errno.ENOENT,):  | 
|
267  | 
warning('Failed to delete temporary file: %s %s',  | 
|
268  | 
new_abspath, e)  | 
|
| 
568
by Martin Pool
 - start adding support for showing diffs by calling out to  | 
269  | 
|
| 
1551.2.13
by Aaron Bentley
 Got diff working properly with checkouts  | 
270  | 
|
| 
1551.2.15
by Aaron Bentley
 Rename cmd_show_diff to diff_cmd_helper  | 
271  | 
def diff_cmd_helper(tree, specific_files, external_diff_options,  | 
| 
1684.1.6
by Martin Pool
 (patch) --diff-prefix option (goffredo, alexander)  | 
272  | 
old_revision_spec=None, new_revision_spec=None,  | 
| 
2197.2.1
by Martin Pool
 Refactor cmd_diff  | 
273  | 
revision_specs=None,  | 
| 
1684.1.6
by Martin Pool
 (patch) --diff-prefix option (goffredo, alexander)  | 
274  | 
old_label='a/', new_label='b/'):  | 
| 
1551.2.13
by Aaron Bentley
 Got diff working properly with checkouts  | 
275  | 
"""Helper for cmd_diff.  | 
276  | 
||
| 
2197.2.1
by Martin Pool
 Refactor cmd_diff  | 
277  | 
    :param tree:
 | 
| 
1551.2.13
by Aaron Bentley
 Got diff working properly with checkouts  | 
278  | 
        A WorkingTree
 | 
279  | 
||
| 
2197.2.1
by Martin Pool
 Refactor cmd_diff  | 
280  | 
    :param specific_files:
 | 
| 
1551.2.13
by Aaron Bentley
 Got diff working properly with checkouts  | 
281  | 
        The specific files to compare, or None
 | 
282  | 
||
| 
2197.2.1
by Martin Pool
 Refactor cmd_diff  | 
283  | 
    :param external_diff_options:
 | 
| 
1551.2.13
by Aaron Bentley
 Got diff working properly with checkouts  | 
284  | 
        If non-None, run an external diff, and pass it these options
 | 
285  | 
||
| 
2197.2.1
by Martin Pool
 Refactor cmd_diff  | 
286  | 
    :param old_revision_spec:
 | 
| 
1551.2.13
by Aaron Bentley
 Got diff working properly with checkouts  | 
287  | 
        If None, use basis tree as old revision, otherwise use the tree for
 | 
288  | 
        the specified revision. 
 | 
|
289  | 
||
| 
2197.2.1
by Martin Pool
 Refactor cmd_diff  | 
290  | 
    :param new_revision_spec:
 | 
| 
1551.2.13
by Aaron Bentley
 Got diff working properly with checkouts  | 
291  | 
        If None, use working tree as new revision, otherwise use the tree for
 | 
292  | 
        the specified revision.
 | 
|
293  | 
    
 | 
|
| 
2197.2.1
by Martin Pool
 Refactor cmd_diff  | 
294  | 
    :param revision_specs: 
 | 
295  | 
        Zero, one or two RevisionSpecs from the command line, saying what revisions 
 | 
|
296  | 
        to compare.  This can be passed as an alternative to the old_revision_spec 
 | 
|
297  | 
        and new_revision_spec parameters.
 | 
|
298  | 
||
| 
1551.2.13
by Aaron Bentley
 Got diff working properly with checkouts  | 
299  | 
    The more general form is show_diff_trees(), where the caller
 | 
300  | 
    supplies any two trees.
 | 
|
301  | 
    """
 | 
|
| 
2197.2.2
by Martin Pool
 merge bzr.dev, reconcile with option changes  | 
302  | 
|
303  | 
    # TODO: perhaps remove the old parameters old_revision_spec and
 | 
|
304  | 
    # new_revision_spec, since this is only really for use from cmd_diff and
 | 
|
305  | 
    # it now always passes through a sequence of revision_specs -- mbp
 | 
|
306  | 
    # 20061221
 | 
|
307  | 
||
| 
1551.2.14
by Aaron Bentley
 Updated argument names, DRY fixes.  | 
308  | 
def spec_tree(spec):  | 
| 
1732.3.1
by Matthieu Moy
 Implementation of -r revno:N:/path/to/branch  | 
309  | 
if tree:  | 
310  | 
revision = spec.in_store(tree.branch)  | 
|
311  | 
else:  | 
|
312  | 
revision = spec.in_store(None)  | 
|
313  | 
revision_id = revision.rev_id  | 
|
314  | 
branch = revision.branch  | 
|
315  | 
return branch.repository.revision_tree(revision_id)  | 
|
| 
2197.2.1
by Martin Pool
 Refactor cmd_diff  | 
316  | 
|
317  | 
if revision_specs is not None:  | 
|
318  | 
assert (old_revision_spec is None  | 
|
319  | 
and new_revision_spec is None)  | 
|
320  | 
if len(revision_specs) > 0:  | 
|
321  | 
old_revision_spec = revision_specs[0]  | 
|
322  | 
if len(revision_specs) > 1:  | 
|
323  | 
new_revision_spec = revision_specs[1]  | 
|
324  | 
||
| 
1551.2.14
by Aaron Bentley
 Updated argument names, DRY fixes.  | 
325  | 
if old_revision_spec is None:  | 
| 
1551.2.13
by Aaron Bentley
 Got diff working properly with checkouts  | 
326  | 
old_tree = tree.basis_tree()  | 
327  | 
else:  | 
|
| 
1551.2.14
by Aaron Bentley
 Updated argument names, DRY fixes.  | 
328  | 
old_tree = spec_tree(old_revision_spec)  | 
| 
1551.2.13
by Aaron Bentley
 Got diff working properly with checkouts  | 
329  | 
|
| 
2197.2.1
by Martin Pool
 Refactor cmd_diff  | 
330  | 
if (new_revision_spec is None  | 
331  | 
or new_revision_spec.spec is None):  | 
|
| 
1551.2.13
by Aaron Bentley
 Got diff working properly with checkouts  | 
332  | 
new_tree = tree  | 
333  | 
else:  | 
|
| 
1551.2.14
by Aaron Bentley
 Updated argument names, DRY fixes.  | 
334  | 
new_tree = spec_tree(new_revision_spec)  | 
| 
2197.2.1
by Martin Pool
 Refactor cmd_diff  | 
335  | 
|
| 
1551.7.19
by Aaron Bentley
 Always include working tree when calculating file ids for diff  | 
336  | 
if new_tree is not tree:  | 
337  | 
extra_trees = (tree,)  | 
|
338  | 
else:  | 
|
339  | 
extra_trees = None  | 
|
| 
1551.2.13
by Aaron Bentley
 Got diff working properly with checkouts  | 
340  | 
|
| 
1551.2.14
by Aaron Bentley
 Updated argument names, DRY fixes.  | 
341  | 
return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,  | 
| 
1684.1.6
by Martin Pool
 (patch) --diff-prefix option (goffredo, alexander)  | 
342  | 
external_diff_options,  | 
| 
1551.7.19
by Aaron Bentley
 Always include working tree when calculating file ids for diff  | 
343  | 
old_label=old_label, new_label=new_label,  | 
344  | 
extra_trees=extra_trees)  | 
|
| 
1551.2.13
by Aaron Bentley
 Got diff working properly with checkouts  | 
345  | 
|
| 
571
by Martin Pool
 - new --diff-options to pass options through to external  | 
346  | 
|
347  | 
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)  | 
348  | 
external_diff_options=None,  | 
| 
1551.7.17
by Aaron Bentley
 Switch to PathsNotVersioned, accept extra_trees  | 
349  | 
old_label='a/', new_label='b/',  | 
350  | 
extra_trees=None):  | 
|
| 
550
by Martin Pool
 - Refactor diff code into one that works purely on  | 
351  | 
"""Show in text form the changes from one tree to another.  | 
352  | 
||
353  | 
    to_files
 | 
|
354  | 
        If set, include only changes to these files.
 | 
|
| 
571
by Martin Pool
 - new --diff-options to pass options through to external  | 
355  | 
|
356  | 
    external_diff_options
 | 
|
357  | 
        If set, use an external GNU diff and pass these options.
 | 
|
| 
1551.7.18
by Aaron Bentley
 Indentation and documentation fixes  | 
358  | 
|
359  | 
    extra_trees
 | 
|
360  | 
        If set, more Trees to use for looking up file ids
 | 
|
| 
550
by Martin Pool
 - Refactor diff code into one that works purely on  | 
361  | 
    """
 | 
| 
1543.1.1
by Denys Duchier
 lock operations for trees - use them for diff  | 
362  | 
old_tree.lock_read()  | 
363  | 
try:  | 
|
| 
2255.7.38
by John Arbash Meinel
 show_diff_trees() should lock any extra trees it is passed.  | 
364  | 
if extra_trees is not None:  | 
365  | 
for tree in extra_trees:  | 
|
366  | 
tree.lock_read()  | 
|
| 
1543.1.1
by Denys Duchier
 lock operations for trees - use them for diff  | 
367  | 
new_tree.lock_read()  | 
368  | 
try:  | 
|
369  | 
return _show_diff_trees(old_tree, new_tree, to_file,  | 
|
| 
1684.1.6
by Martin Pool
 (patch) --diff-prefix option (goffredo, alexander)  | 
370  | 
specific_files, external_diff_options,  | 
| 
1551.7.17
by Aaron Bentley
 Switch to PathsNotVersioned, accept extra_trees  | 
371  | 
old_label=old_label, new_label=new_label,  | 
372  | 
extra_trees=extra_trees)  | 
|
| 
1543.1.1
by Denys Duchier
 lock operations for trees - use them for diff  | 
373  | 
finally:  | 
374  | 
new_tree.unlock()  | 
|
| 
2255.7.38
by John Arbash Meinel
 show_diff_trees() should lock any extra trees it is passed.  | 
375  | 
if extra_trees is not None:  | 
376  | 
for tree in extra_trees:  | 
|
377  | 
tree.unlock()  | 
|
| 
1543.1.1
by Denys Duchier
 lock operations for trees - use them for diff  | 
378  | 
finally:  | 
379  | 
old_tree.unlock()  | 
|
380  | 
||
381  | 
||
382  | 
def _show_diff_trees(old_tree, new_tree, to_file,  | 
|
| 
1684.1.6
by Martin Pool
 (patch) --diff-prefix option (goffredo, alexander)  | 
383  | 
specific_files, external_diff_options,  | 
| 
1551.7.17
by Aaron Bentley
 Switch to PathsNotVersioned, accept extra_trees  | 
384  | 
old_label='a/', new_label='b/', extra_trees=None):  | 
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
385  | 
|
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
386  | 
    # GNU Patch uses the epoch date to detect files that are being added
 | 
387  | 
    # or removed in a diff.
 | 
|
388  | 
EPOCH_DATE = '1970-01-01 00:00:00 +0000'  | 
|
| 
1706.1.2
by James Henstridge
 Simplify logic a little  | 
389  | 
|
| 
329
by Martin Pool
 - refactor command functions into command classes  | 
390  | 
    # TODO: Generation of pseudo-diffs for added/deleted files could
 | 
391  | 
    # be usefully made into a much faster special case.
 | 
|
392  | 
||
| 
571
by Martin Pool
 - new --diff-options to pass options through to external  | 
393  | 
if external_diff_options:  | 
394  | 
assert isinstance(external_diff_options, basestring)  | 
|
395  | 
opts = external_diff_options.split()  | 
|
396  | 
def diff_file(olab, olines, nlab, nlines, to_file):  | 
|
397  | 
external_diff(olab, olines, nlab, nlines, to_file, opts)  | 
|
398  | 
else:  | 
|
399  | 
diff_file = internal_diff  | 
|
400  | 
||
| 
1852.10.3
by Robert Collins
 Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.  | 
401  | 
delta = new_tree.changes_from(old_tree,  | 
402  | 
specific_files=specific_files,  | 
|
403  | 
extra_trees=extra_trees, require_versioned=True)  | 
|
| 
475
by Martin Pool
 - rewrite diff using compare_trees()  | 
404  | 
|
| 
1490
by Robert Collins
 Implement a 'bzr push' command, with saved locations; update diff to return 1.  | 
405  | 
has_changes = 0  | 
| 
475
by Martin Pool
 - rewrite diff using compare_trees()  | 
406  | 
for path, file_id, kind in delta.removed:  | 
| 
1490
by Robert Collins
 Implement a 'bzr push' command, with saved locations; update diff to return 1.  | 
407  | 
has_changes = 1  | 
| 
2592.2.2
by Jonathan Lange
 Apply jam's comments to test_binary_unicode_filenames. Change the  | 
408  | 
print >>to_file, "=== removed %s '%s'" % (kind, path.encode('utf8'))  | 
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
409  | 
old_name = '%s%s\t%s' % (old_label, path,  | 
410  | 
_patch_header_date(old_tree, file_id, path))  | 
|
411  | 
new_name = '%s%s\t%s' % (new_label, path, EPOCH_DATE)  | 
|
412  | 
old_tree.inventory[file_id].diff(diff_file, old_name, old_tree,  | 
|
413  | 
new_name, None, None, to_file)  | 
|
| 
475
by Martin Pool
 - rewrite diff using compare_trees()  | 
414  | 
for path, file_id, kind in delta.added:  | 
| 
1490
by Robert Collins
 Implement a 'bzr push' command, with saved locations; update diff to return 1.  | 
415  | 
has_changes = 1  | 
| 
2592.2.2
by Jonathan Lange
 Apply jam's comments to test_binary_unicode_filenames. Change the  | 
416  | 
print >>to_file, "=== added %s '%s'" % (kind, path.encode('utf8'))  | 
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
417  | 
old_name = '%s%s\t%s' % (old_label, path, EPOCH_DATE)  | 
418  | 
new_name = '%s%s\t%s' % (new_label, path,  | 
|
419  | 
_patch_header_date(new_tree, file_id, path))  | 
|
420  | 
new_tree.inventory[file_id].diff(diff_file, new_name, new_tree,  | 
|
421  | 
old_name, None, None, to_file,  | 
|
| 
1399.1.4
by Robert Collins
 move diff and symlink conditionals into inventory.py from diff.py  | 
422  | 
reverse=True)  | 
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
423  | 
for (old_path, new_path, file_id, kind,  | 
424  | 
text_modified, meta_modified) in delta.renamed:  | 
|
| 
1490
by Robert Collins
 Implement a 'bzr push' command, with saved locations; update diff to return 1.  | 
425  | 
has_changes = 1  | 
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
426  | 
prop_str = get_prop_change(meta_modified)  | 
| 
2725.2.1
by ghigo
 When a unicode filename is renamed, in the diff is showed a wrong result  | 
427  | 
print >>to_file, "=== renamed %s '%s' => '%s'%s" % (  | 
| 
1711.2.28
by John Arbash Meinel
 Fix up bzrlib.diff now that compare_trees is returning unicode paths.  | 
428  | 
kind, old_path.encode('utf8'),  | 
429  | 
new_path.encode('utf8'), prop_str)  | 
|
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
430  | 
old_name = '%s%s\t%s' % (old_label, old_path,  | 
431  | 
_patch_header_date(old_tree, file_id,  | 
|
432  | 
old_path))  | 
|
433  | 
new_name = '%s%s\t%s' % (new_label, new_path,  | 
|
434  | 
_patch_header_date(new_tree, file_id,  | 
|
435  | 
new_path))  | 
|
436  | 
_maybe_diff_file_or_symlink(old_name, old_tree, file_id,  | 
|
437  | 
new_name, new_tree,  | 
|
| 
1092.2.9
by Robert Collins
 bugfix _maybe_diff, the test was not catching the error  | 
438  | 
text_modified, kind, to_file, diff_file)  | 
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
439  | 
for path, file_id, kind, text_modified, meta_modified in delta.modified:  | 
| 
1490
by Robert Collins
 Implement a 'bzr push' command, with saved locations; update diff to return 1.  | 
440  | 
has_changes = 1  | 
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
441  | 
prop_str = get_prop_change(meta_modified)  | 
| 
2592.2.2
by Jonathan Lange
 Apply jam's comments to test_binary_unicode_filenames. Change the  | 
442  | 
print >>to_file, "=== modified %s '%s'%s" % (kind, path.encode('utf8'),  | 
443  | 
prop_str)  | 
|
| 
2405.1.3
by John Arbash Meinel
 Do a better fix, which recognizes that we should pass the correct old path.  | 
444  | 
        # The file may be in a different location in the old tree (because
 | 
445  | 
        # the containing dir was renamed, but the file itself was not)
 | 
|
446  | 
old_path = old_tree.id2path(file_id)  | 
|
447  | 
old_name = '%s%s\t%s' % (old_label, old_path,  | 
|
448  | 
_patch_header_date(old_tree, file_id, old_path))  | 
|
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
449  | 
new_name = '%s%s\t%s' % (new_label, path,  | 
450  | 
_patch_header_date(new_tree, file_id, path))  | 
|
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
451  | 
if text_modified:  | 
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
452  | 
_maybe_diff_file_or_symlink(old_name, old_tree, file_id,  | 
453  | 
new_name, new_tree,  | 
|
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
454  | 
True, kind, to_file, diff_file)  | 
| 
1658.1.9
by Martin Pool
 Give an error for bzr diff on an nonexistent file (Malone #3619)  | 
455  | 
|
| 
1490
by Robert Collins
 Implement a 'bzr push' command, with saved locations; update diff to return 1.  | 
456  | 
return has_changes  | 
| 
1658.1.9
by Martin Pool
 Give an error for bzr diff on an nonexistent file (Malone #3619)  | 
457  | 
|
458  | 
||
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
459  | 
def _patch_header_date(tree, file_id, path):  | 
460  | 
"""Returns a timestamp suitable for use in a patch header."""  | 
|
| 
2405.1.2
by John Arbash Meinel
 Fix bug #103870 by passing None instead of a (sometimes wrong) path  | 
461  | 
mtime = tree.get_file_mtime(file_id, path)  | 
462  | 
assert mtime is not None, \  | 
|
463  | 
"got an mtime of None for file-id %s, path %s in tree %s" % (  | 
|
464  | 
file_id, path, tree)  | 
|
465  | 
return timestamp.format_patch_date(mtime)  | 
|
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
466  | 
|
467  | 
||
| 
1662.1.9
by Martin Pool
 Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)  | 
468  | 
def _raise_if_nonexistent(paths, old_tree, new_tree):  | 
469  | 
"""Complain if paths are not in either inventory or tree.  | 
|
470  | 
||
471  | 
    It's OK with the files exist in either tree's inventory, or 
 | 
|
472  | 
    if they exist in the tree but are not versioned.
 | 
|
473  | 
    
 | 
|
474  | 
    This can be used by operations such as bzr status that can accept
 | 
|
475  | 
    unknown or ignored files.
 | 
|
476  | 
    """
 | 
|
477  | 
mutter("check paths: %r", paths)  | 
|
478  | 
if not paths:  | 
|
479  | 
        return
 | 
|
480  | 
s = old_tree.filter_unversioned_files(paths)  | 
|
481  | 
s = new_tree.filter_unversioned_files(s)  | 
|
482  | 
s = [path for path in s if not new_tree.has_filename(path)]  | 
|
483  | 
if s:  | 
|
484  | 
raise errors.PathsDoNotExist(sorted(s))  | 
|
485  | 
||
486  | 
||
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
487  | 
def get_prop_change(meta_modified):  | 
488  | 
if meta_modified:  | 
|
489  | 
return " (properties changed)"  | 
|
490  | 
else:  | 
|
491  | 
return ""  | 
|
492  | 
||
493  | 
||
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
494  | 
def _maybe_diff_file_or_symlink(old_path, old_tree, file_id,  | 
495  | 
new_path, new_tree, text_modified,  | 
|
| 
1092.2.9
by Robert Collins
 bugfix _maybe_diff, the test was not catching the error  | 
496  | 
kind, to_file, diff_file):  | 
| 
1092.2.6
by Robert Collins
 symlink support updated to work  | 
497  | 
if text_modified:  | 
| 
1399.1.4
by Robert Collins
 move diff and symlink conditionals into inventory.py from diff.py  | 
498  | 
new_entry = new_tree.inventory[file_id]  | 
499  | 
old_tree.inventory[file_id].diff(diff_file,  | 
|
| 
1740.2.5
by Aaron Bentley
 Merge from bzr.dev  | 
500  | 
old_path, old_tree,  | 
501  | 
new_path, new_entry,  | 
|
| 
1399.1.4
by Robert Collins
 move diff and symlink conditionals into inventory.py from diff.py  | 
502  | 
new_tree, to_file)  |