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)
49
# work-around for difflib being too smart for its own good
50
# if /dev/null is "1,0", patch won't recognize it as /dev/null
52
ud[2] = ud[2].replace('-1,0', '-0,0')
54
ud[2] = ud[2].replace('+1,0', '+0,0')
55
# work around for difflib emitting random spaces after the label
56
ud[0] = ud[0][:-2] + '\n'
57
ud[1] = ud[1][:-2] + '\n'
61
if not line.endswith('\n'):
62
to_file.write("\n\\ No newline at end of file\n")
68
def external_diff(old_label, oldlines, new_label, newlines, to_file,
70
"""Display a diff by calling out to the external diff program."""
73
if to_file != sys.stdout:
74
raise NotImplementedError("sorry, can't send external diff other than to stdout yet",
77
# make sure our own output is properly ordered before the diff
80
from tempfile import NamedTemporaryFile
83
oldtmpf = NamedTemporaryFile()
84
newtmpf = NamedTemporaryFile()
87
# TODO: perhaps a special case for comparing to or from the empty
88
# sequence; can just use /dev/null on Unix
90
# TODO: if either of the files being compared already exists as a
91
# regular named file (e.g. in the working directory) then we can
92
# compare directly to that, rather than copying it.
94
oldtmpf.writelines(oldlines)
95
newtmpf.writelines(newlines)
103
'--label', old_label,
105
'--label', new_label,
108
# diff only allows one style to be specified; they don't override.
109
# note that some of these take optargs, and the optargs can be
110
# directly appended to the options.
111
# this is only an approximate parser; it doesn't properly understand
113
for s in ['-c', '-u', '-C', '-U',
118
'-y', '--side-by-side',
130
diffcmd.extend(diff_opts)
132
rc = os.spawnvp(os.P_WAIT, 'diff', diffcmd)
134
if rc != 0 and rc != 1:
135
# returns 1 if files differ; that's OK
137
msg = 'signal %d' % (-rc)
139
msg = 'exit code %d' % rc
141
raise BzrError('external diff failed with %s; command: %r' % (rc, diffcmd))
143
oldtmpf.close() # and delete
148
def show_diff(b, revision, specific_files, external_diff_options=None,
149
revision2=None, output=None):
150
"""Shortcut for showing the diff to the working tree.
156
None for each, or otherwise the old revision to compare against.
158
The more general form is show_diff_trees(), where the caller
159
supplies any two trees.
166
old_tree = b.basis_tree()
168
old_tree = b.revision_tree(b.lookup_revision(revision))
170
if revision2 == None:
171
new_tree = b.working_tree()
173
new_tree = b.revision_tree(b.lookup_revision(revision2))
175
show_diff_trees(old_tree, new_tree, output, specific_files,
176
external_diff_options)
180
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
181
external_diff_options=None):
182
"""Show in text form the changes from one tree to another.
185
If set, include only changes to these files.
187
external_diff_options
188
If set, use an external GNU diff and pass these options.
191
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
195
DEVNULL = '/dev/null'
196
# Windows users, don't panic about this filename -- it is a
197
# special signal to GNU patch that the file should be created or
198
# deleted respectively.
200
# TODO: Generation of pseudo-diffs for added/deleted files could
201
# be usefully made into a much faster special case.
203
if external_diff_options:
204
assert isinstance(external_diff_options, basestring)
205
opts = external_diff_options.split()
206
def diff_file(olab, olines, nlab, nlines, to_file):
207
external_diff(olab, olines, nlab, nlines, to_file, opts)
209
diff_file = internal_diff
212
delta = compare_trees(old_tree, new_tree, want_unchanged=False,
213
specific_files=specific_files)
215
for path, file_id, kind in delta.removed:
216
print >>to_file, '=== removed %s %r' % (kind, path)
218
diff_file(old_label + path,
219
old_tree.get_file(file_id).readlines(),
224
for path, file_id, kind in delta.added:
225
print >>to_file, '=== added %s %r' % (kind, path)
230
new_tree.get_file(file_id).readlines(),
233
for old_path, new_path, file_id, kind, text_modified in delta.renamed:
234
print >>to_file, '=== renamed %s %r => %r' % (kind, old_path, new_path)
236
diff_file(old_label + old_path,
237
old_tree.get_file(file_id).readlines(),
238
new_label + new_path,
239
new_tree.get_file(file_id).readlines(),
242
for path, file_id, kind in delta.modified:
243
print >>to_file, '=== modified %s %r' % (kind, path)
245
diff_file(old_label + path,
246
old_tree.get_file(file_id).readlines(),
248
new_tree.get_file(file_id).readlines(),
added
removed
bzrlib/diff.py
