41
41
if not oldlines and not newlines:
44
ud = difflib.unified_diff(oldlines, newlines,
45
fromfile=old_filename+'\t',
46
tofile=new_filename+'\t')
46
if oldlines and (oldlines[-1][-1] != '\n'):
49
if newlines and (newlines[-1][-1] != '\n'):
53
ud = difflib.unified_diff(oldlines, newlines, **kw)
49
55
# work-around for difflib being too smart for its own good
50
56
# if /dev/null is "1,0", patch won't recognize it as /dev/null
52
59
ud[2] = ud[2].replace('-1,0', '-0,0')
54
62
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")
64
to_file.writelines(ud)
66
print >>to_file, "\\ No newline at end of file"
66
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
68
"""Display a diff by calling out to the external diff program."""
70
def show_diff(b, revision, specific_files):
71
if to_file != sys.stdout:
72
raise NotImplementedError("sorry, can't send external diff other than to stdout yet",
75
# make sure our own output is properly ordered before the diff
78
from tempfile import NamedTemporaryFile
81
oldtmpf = NamedTemporaryFile()
82
newtmpf = NamedTemporaryFile()
85
# TODO: perhaps a special case for comparing to or from the empty
86
# sequence; can just use /dev/null on Unix
88
# TODO: if either of the files being compared already exists as a
89
# regular named file (e.g. in the working directory) then we can
90
# compare directly to that, rather than copying it.
92
oldtmpf.writelines(oldlines)
93
newtmpf.writelines(newlines)
101
'--label', old_filename+'\t',
103
'--label', new_filename+'\t',
106
# diff only allows one style to be specified; they don't override.
107
# note that some of these take optargs, and the optargs can be
108
# directly appended to the options.
109
# this is only an approximate parser; it doesn't properly understand
111
for s in ['-c', '-u', '-C', '-U',
116
'-y', '--side-by-side',
128
diffcmd.extend(diff_opts)
130
rc = os.spawnvp(os.P_WAIT, 'diff', diffcmd)
74
old_tree = b.basis_tree()
76
old_tree = b.revision_tree(b.lookup_revision(revision))
132
if rc != 0 and rc != 1:
133
# returns 1 if files differ; that's OK
135
msg = 'signal %d' % (-rc)
137
msg = 'exit code %d' % rc
139
raise BzrError('external diff failed with %s; command: %r' % (rc, diffcmd))
141
oldtmpf.close() # and delete
144
def show_diff(b, from_spec, specific_files, external_diff_options=None,
145
revision2=None, output=None, b2=None):
146
"""Shortcut for showing the diff to the working tree.
152
None for 'basis tree', or otherwise the old revision to compare against.
154
The more general form is show_diff_trees(), where the caller
155
supplies any two trees.
161
if from_spec is None:
163
old_tree = b.basis_tree()
165
old_tree = b.working_tree()
167
old_tree = b.revision_tree(from_spec.in_history(b).rev_id)
169
if revision2 is None:
171
new_tree = b.working_tree()
173
new_tree = b2.working_tree()
175
new_tree = b.revision_tree(revision2.in_history(b).rev_id)
177
return show_diff_trees(old_tree, new_tree, output, specific_files,
178
external_diff_options)
182
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
183
external_diff_options=None):
184
"""Show in text form the changes from one tree to another.
187
If set, include only changes to these files.
189
external_diff_options
190
If set, use an external GNU diff and pass these options.
78
new_tree = b.working_tree()
193
80
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
202
89
# TODO: Generation of pseudo-diffs for added/deleted files could
203
90
# be usefully made into a much faster special case.
205
if external_diff_options:
206
assert isinstance(external_diff_options, basestring)
207
opts = external_diff_options.split()
208
def diff_file(olab, olines, nlab, nlines, to_file):
209
external_diff(olab, olines, nlab, nlines, to_file, opts)
211
diff_file = internal_diff
214
92
delta = compare_trees(old_tree, new_tree, want_unchanged=False,
215
93
specific_files=specific_files)
218
95
for path, file_id, kind in delta.removed:
220
print >>to_file, '=== removed %s %r' % (kind, path)
221
old_tree.inventory[file_id].diff(diff_file, old_label + path, old_tree,
222
DEVNULL, None, None, to_file)
96
print '*** removed %s %r' % (kind, path)
98
_diff_one(old_tree.get_file(file_id).readlines(),
101
fromfile=old_label + path,
223
104
for path, file_id, kind in delta.added:
225
print >>to_file, '=== added %s %r' % (kind, path)
226
new_tree.inventory[file_id].diff(diff_file, new_label + path, new_tree,
227
DEVNULL, None, None, to_file,
229
for (old_path, new_path, file_id, kind,
230
text_modified, meta_modified) in delta.renamed:
232
prop_str = get_prop_change(meta_modified)
233
print >>to_file, '=== renamed %s %r => %r%s' % (
234
kind, old_path, new_path, prop_str)
235
_maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
236
new_label, new_path, new_tree,
237
text_modified, kind, to_file, diff_file)
238
for path, file_id, kind, text_modified, meta_modified in delta.modified:
240
prop_str = get_prop_change(meta_modified)
241
print >>to_file, '=== modified %s %r%s' % (kind, path, prop_str)
105
print '*** added %s %r' % (kind, path)
108
new_tree.get_file(file_id).readlines(),
111
tofile=new_label + path)
113
for old_path, new_path, file_id, kind, text_modified in delta.renamed:
114
print '*** renamed %s %r => %r' % (kind, old_path, new_path)
242
115
if text_modified:
243
_maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
244
new_label, path, new_tree,
245
True, kind, to_file, diff_file)
116
_diff_one(old_tree.get_file(file_id).readlines(),
117
new_tree.get_file(file_id).readlines(),
119
fromfile=old_label + old_path,
120
tofile=new_label + new_path)
122
for path, file_id, kind in delta.modified:
123
print '*** modified %s %r' % (kind, path)
125
_diff_one(old_tree.get_file(file_id).readlines(),
126
new_tree.get_file(file_id).readlines(),
128
fromfile=old_label + path,
129
tofile=new_label + path)
134
"""Describes changes from one tree to another.
143
(oldpath, newpath, id, kind, text_modified)
149
Each id is listed only once.
151
Files that are both modified and renamed are listed only in
152
renamed, with the text_modified flag true.
154
The lists are normally sorted when the delta is created.
163
def show(self, to_file, show_ids=False, show_unchanged=False):
164
def show_list(files):
165
for path, fid, kind in files:
166
if kind == 'directory':
168
elif kind == 'symlink':
172
print >>to_file, ' %-30s %s' % (path, fid)
174
print >>to_file, ' ', path
177
print >>to_file, 'removed:'
178
show_list(self.removed)
181
print >>to_file, 'added:'
182
show_list(self.added)
185
print >>to_file, 'renamed:'
186
for oldpath, newpath, fid, kind, text_modified in self.renamed:
188
print >>to_file, ' %s => %s %s' % (oldpath, newpath, fid)
190
print >>to_file, ' %s => %s' % (oldpath, newpath)
193
print >>to_file, 'modified:'
194
show_list(self.modified)
196
if show_unchanged and self.unchanged:
197
print >>to_file, 'unchanged:'
198
show_list(self.unchanged)
202
def compare_trees(old_tree, new_tree, want_unchanged, specific_files=None):
203
"""Describe changes from one tree to another.
205
Returns a TreeDelta with details of added, modified, renamed, and
208
The root entry is specifically exempt.
210
This only considers versioned files.
213
If true, also list files unchanged from one version to
217
If true, only check for changes to specified names or
221
from osutils import is_inside_any
249
def get_prop_change(meta_modified):
251
return " (properties changed)"
256
def _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
257
new_label, new_path, new_tree, text_modified,
258
kind, to_file, diff_file):
260
new_entry = new_tree.inventory[file_id]
261
old_tree.inventory[file_id].diff(diff_file,
262
old_label + old_path, old_tree,
263
new_label + new_path, new_entry,
223
old_inv = old_tree.inventory
224
new_inv = new_tree.inventory
226
mutter('start compare_trees')
228
# TODO: match for specific files can be rather smarter by finding
229
# the IDs of those files up front and then considering only that.
231
for file_id in old_tree:
232
if file_id in new_tree:
233
kind = old_inv.get_file_kind(file_id)
234
assert kind == new_inv.get_file_kind(file_id)
236
assert kind in ('file', 'directory', 'symlink', 'root_directory'), \
237
'invalid file kind %r' % kind
239
if kind == 'root_directory':
242
old_path = old_inv.id2path(file_id)
243
new_path = new_inv.id2path(file_id)
246
if (not is_inside_any(specific_files, old_path)
247
and not is_inside_any(specific_files, new_path)):
251
old_sha1 = old_tree.get_file_sha1(file_id)
252
new_sha1 = new_tree.get_file_sha1(file_id)
253
text_modified = (old_sha1 != new_sha1)
255
## mutter("no text to check for %r %r" % (file_id, kind))
256
text_modified = False
258
# TODO: Can possibly avoid calculating path strings if the
259
# two files are unchanged and their names and parents are
260
# the same and the parents are unchanged all the way up.
261
# May not be worthwhile.
263
if old_path != new_path:
264
delta.renamed.append((old_path, new_path, file_id, kind,
267
delta.modified.append((new_path, file_id, kind))
269
delta.unchanged.append((new_path, file_id, kind))
271
old_path = old_inv.id2path(file_id)
273
if not is_inside_any(specific_files, old_path):
275
delta.removed.append((old_path, file_id, kind))
277
mutter('start looking for new files')
278
for file_id in new_inv:
279
if file_id in old_inv:
281
new_path = new_inv.id2path(file_id)
283
if not is_inside_any(specific_files, new_path):
285
kind = new_inv.get_file_kind(file_id)
286
delta.added.append((new_path, file_id, kind))
291
delta.modified.sort()
292
delta.unchanged.sort()
added
removed
bzrlib/diff.py
