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