2
# -*- coding: UTF-8 -*-
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
# GNU General Public License for more details.
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from bzrlib.trace import mutter
19
from bzrlib.errors import BzrError
20
from bzrlib.delta import compare_trees
22
# TODO: Rather than building a changeset object, we should probably
23
# invoke callbacks on an object. That object can either accumulate a
24
# list, write them out directly, etc etc.
26
def internal_diff(old_label, oldlines, new_label, newlines, to_file):
29
# FIXME: difflib is wrong if there is no trailing newline.
30
# The syntax used by patch seems to be "\ No newline at
31
# end of file" following the last diff line from that
32
# file. This is not trivial to insert into the
33
# unified_diff output and it might be better to just fix
34
# or replace that function.
36
# In the meantime we at least make sure the patch isn't
40
# Special workaround for Python2.3, where difflib fails if
41
# both sequences are empty.
42
if not oldlines and not newlines:
45
ud = difflib.unified_diff(oldlines, newlines,
46
fromfile=old_label, tofile=new_label)
48
# work-around for difflib being too smart for its own good
49
# if /dev/null is "1,0", patch won't recognize it as /dev/null
52
ud[2] = ud[2].replace('-1,0', '-0,0')
55
ud[2] = ud[2].replace('+1,0', '+0,0')
59
if not line.endswith('\n'):
60
to_file.write("\n\\ No newline at end of file\n")
64
def external_diff(old_label, oldlines, new_label, newlines, to_file,
66
"""Display a diff by calling out to the external diff program."""
69
if to_file != sys.stdout:
70
raise NotImplementedError("sorry, can't send external diff other than to stdout yet",
73
# make sure our own output is properly ordered before the diff
76
from tempfile import NamedTemporaryFile
79
oldtmpf = NamedTemporaryFile()
80
newtmpf = NamedTemporaryFile()
83
# TODO: perhaps a special case for comparing to or from the empty
84
# sequence; can just use /dev/null on Unix
86
# TODO: if either of the files being compared already exists as a
87
# regular named file (e.g. in the working directory) then we can
88
# compare directly to that, rather than copying it.
90
oldtmpf.writelines(oldlines)
91
newtmpf.writelines(newlines)
101
'--label', new_label,
104
# diff only allows one style to be specified; they don't override.
105
# note that some of these take optargs, and the optargs can be
106
# directly appended to the options.
107
# this is only an approximate parser; it doesn't properly understand
109
for s in ['-c', '-u', '-C', '-U',
114
'-y', '--side-by-side',
126
diffcmd.extend(diff_opts)
128
rc = os.spawnvp(os.P_WAIT, 'diff', diffcmd)
130
if rc != 0 and rc != 1:
131
# returns 1 if files differ; that's OK
133
msg = 'signal %d' % (-rc)
135
msg = 'exit code %d' % rc
137
raise BzrError('external diff failed with %s; command: %r' % (rc, diffcmd))
139
oldtmpf.close() # and delete
142
def show_diff(b, revision, specific_files, external_diff_options=None,
143
revision2=None, output=None):
144
"""Shortcut for showing the diff to the working tree.
150
None for each, or otherwise the old revision to compare against.
152
The more general form is show_diff_trees(), where the caller
153
supplies any two trees.
160
old_tree = b.basis_tree()
162
old_tree = b.revision_tree(b.lookup_revision(revision))
164
if revision2 == None:
165
new_tree = b.working_tree()
167
new_tree = b.revision_tree(b.lookup_revision(revision2))
169
show_diff_trees(old_tree, new_tree, output, specific_files,
170
external_diff_options)
174
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
175
external_diff_options=None):
176
"""Show in text form the changes from one tree to another.
179
If set, include only changes to these files.
181
external_diff_options
182
If set, use an external GNU diff and pass these options.
185
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
189
DEVNULL = '/dev/null'
190
# Windows users, don't panic about this filename -- it is a
191
# special signal to GNU patch that the file should be created or
192
# deleted respectively.
194
# TODO: Generation of pseudo-diffs for added/deleted files could
195
# be usefully made into a much faster special case.
197
if external_diff_options:
198
assert isinstance(external_diff_options, basestring)
199
opts = external_diff_options.split()
200
def diff_file(olab, olines, nlab, nlines, to_file):
201
external_diff(olab, olines, nlab, nlines, to_file, opts)
203
diff_file = internal_diff
206
delta = compare_trees(old_tree, new_tree, want_unchanged=False,
207
specific_files=specific_files)
209
for path, file_id, kind in delta.removed:
210
print >>to_file, '*** removed %s %r' % (kind, path)
212
diff_file(old_label + path,
213
old_tree.get_file(file_id).readlines(),
218
for path, file_id, kind in delta.added:
219
print >>to_file, '*** added %s %r' % (kind, path)
224
new_tree.get_file(file_id).readlines(),
227
for old_path, new_path, file_id, kind, text_modified in delta.renamed:
228
print >>to_file, '*** renamed %s %r => %r' % (kind, old_path, new_path)
229
_maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
230
new_label, new_path, new_tree,
231
text_modified, kind, to_file)
233
for path, file_id, kind in delta.modified:
234
print >>to_file, '*** modified %s %r' % (kind, path)
235
_maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
236
new_label, path, new_tree,
239
def _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
240
new_label, new_path, new_tree, text_modified,
244
diff_file(old_label + old_path,
245
old_tree.get_file(file_id).readlines(),
246
new_label + new_path,
247
new_tree.get_file(file_id).readlines(),
249
elif kind == 'symlink':
250
_diff_symlink(old_tree, new_tree, file_id, to_file)
252
def _diff_symlink(old_tree, new_tree, file_id, to_file):
253
t1 = old_tree.get_symlink_target(file_id)
254
t2 = new_tree.get_symlink_target(file_id)
255
print >>to_file, '*** *** target changed %r => %r' % (t1, t2)
added
removed
bzrlib/diff.py
