43
39
if not oldlines and not newlines:
46
ud = difflib.unified_diff(oldlines, newlines,
47
fromfile=old_filename+'\t',
48
tofile=new_filename+'\t')
44
if oldlines and (oldlines[-1][-1] != '\n'):
47
if newlines and (newlines[-1][-1] != '\n'):
51
ud = difflib.unified_diff(oldlines, newlines, **kw)
51
53
# work-around for difflib being too smart for its own good
52
54
# if /dev/null is "1,0", patch won't recognize it as /dev/null
54
57
ud[2] = ud[2].replace('-1,0', '-0,0')
56
60
ud[2] = ud[2].replace('+1,0', '+0,0')
57
# work around for difflib emitting random spaces after the label
58
ud[0] = ud[0][:-2] + '\n'
59
ud[1] = ud[1][:-2] + '\n'
63
if not line.endswith('\n'):
64
to_file.write("\n\\ No newline at end of file\n")
62
to_file.writelines(ud)
64
print >>to_file, "\\ No newline at end of file"
68
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
70
"""Display a diff by calling out to the external diff program."""
69
def show_diff(b, revision, specific_files):
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_filename+'\t',
105
'--label', new_filename+'\t',
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)
73
old_tree = b.basis_tree()
75
old_tree = b.revision_tree(b.lookup_revision(revision))
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
147
@deprecated_function(zero_eight)
148
def show_diff(b, from_spec, specific_files, external_diff_options=None,
149
revision2=None, output=None, b2=None):
150
"""Shortcut for showing the diff to the working tree.
152
Please use show_diff_trees instead.
158
None for 'basis tree', or otherwise the old revision to compare against.
160
The more general form is show_diff_trees(), where the caller
161
supplies any two trees.
167
if from_spec is None:
168
old_tree = b.bzrdir.open_workingtree()
170
old_tree = old_tree = old_tree.basis_tree()
172
old_tree = b.repository.revision_tree(from_spec.in_history(b).rev_id)
174
if revision2 is None:
176
new_tree = b.bzrdir.open_workingtree()
178
new_tree = b2.bzrdir.open_workingtree()
180
new_tree = b.repository.revision_tree(revision2.in_history(b).rev_id)
182
return show_diff_trees(old_tree, new_tree, output, specific_files,
183
external_diff_options)
186
def diff_cmd_helper(tree, specific_files, external_diff_options,
187
old_revision_spec=None, new_revision_spec=None):
188
"""Helper for cmd_diff.
194
The specific files to compare, or None
196
external_diff_options
197
If non-None, run an external diff, and pass it these options
200
If None, use basis tree as old revision, otherwise use the tree for
201
the specified revision.
204
If None, use working tree as new revision, otherwise use the tree for
205
the specified revision.
207
The more general form is show_diff_trees(), where the caller
208
supplies any two trees.
213
revision_id = spec.in_store(tree.branch).rev_id
214
return tree.branch.repository.revision_tree(revision_id)
215
if old_revision_spec is None:
216
old_tree = tree.basis_tree()
218
old_tree = spec_tree(old_revision_spec)
220
if new_revision_spec is None:
223
new_tree = spec_tree(new_revision_spec)
225
return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
226
external_diff_options)
229
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
230
external_diff_options=None):
77
new_tree = b.working_tree()
79
show_diff_trees(old_tree, new_tree, sys.stdout, specific_files)
83
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None):
231
84
"""Show in text form the changes from one tree to another.
234
87
If set, include only changes to these files.
236
external_diff_options
237
If set, use an external GNU diff and pass these options.
243
return _show_diff_trees(old_tree, new_tree, to_file,
244
specific_files, external_diff_options)
251
def _show_diff_trees(old_tree, new_tree, to_file,
252
specific_files, external_diff_options):
254
# TODO: Options to control putting on a prefix or suffix, perhaps
255
# as a format string?
90
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
259
94
DEVNULL = '/dev/null'
260
95
# Windows users, don't panic about this filename -- it is a
264
99
# TODO: Generation of pseudo-diffs for added/deleted files could
265
100
# be usefully made into a much faster special case.
267
_raise_if_doubly_unversioned(specific_files, old_tree, new_tree)
269
if external_diff_options:
270
assert isinstance(external_diff_options, basestring)
271
opts = external_diff_options.split()
272
def diff_file(olab, olines, nlab, nlines, to_file):
273
external_diff(olab, olines, nlab, nlines, to_file, opts)
275
diff_file = internal_diff
277
102
delta = compare_trees(old_tree, new_tree, want_unchanged=False,
278
103
specific_files=specific_files)
281
105
for path, file_id, kind in delta.removed:
283
print >>to_file, '=== removed %s %r' % (kind, old_label + path)
284
old_tree.inventory[file_id].diff(diff_file, old_label + path, old_tree,
285
DEVNULL, None, None, to_file)
106
print '*** removed %s %r' % (kind, path)
108
_diff_one(old_tree.get_file(file_id).readlines(),
111
fromfile=old_label + path,
286
114
for path, file_id, kind in delta.added:
288
print >>to_file, '=== added %s %r' % (kind, new_label + path)
289
new_tree.inventory[file_id].diff(diff_file, new_label + path, new_tree,
290
DEVNULL, None, None, to_file,
292
for (old_path, new_path, file_id, kind,
293
text_modified, meta_modified) in delta.renamed:
295
prop_str = get_prop_change(meta_modified)
296
print >>to_file, '=== renamed %s %r => %r%s' % (
297
kind, old_label + old_path, new_label + new_path, prop_str)
298
_maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
299
new_label, new_path, new_tree,
300
text_modified, kind, to_file, diff_file)
301
for path, file_id, kind, text_modified, meta_modified in delta.modified:
303
prop_str = get_prop_change(meta_modified)
304
print >>to_file, '=== modified %s %r%s' % (kind, old_label + path,
115
print '*** added %s %r' % (kind, path)
118
new_tree.get_file(file_id).readlines(),
121
tofile=new_label + path)
123
for old_path, new_path, file_id, kind, text_modified in delta.renamed:
124
print '*** renamed %s %r => %r' % (kind, old_path, new_path)
306
125
if text_modified:
307
_maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
308
new_label, path, new_tree,
309
True, kind, to_file, diff_file)
314
def _raise_if_doubly_unversioned(specific_files, old_tree, new_tree):
315
"""Complain if paths are not versioned in either tree."""
316
if not specific_files:
318
old_unversioned = old_tree.filter_unversioned_files(specific_files)
319
new_unversioned = new_tree.filter_unversioned_files(specific_files)
320
unversioned = old_unversioned.intersection(new_unversioned)
322
raise errors.PathsNotVersionedError(sorted(unversioned))
126
_diff_one(old_tree.get_file(file_id).readlines(),
127
new_tree.get_file(file_id).readlines(),
129
fromfile=old_label + old_path,
130
tofile=new_label + new_path)
132
for path, file_id, kind in delta.modified:
133
print '*** modified %s %r' % (kind, path)
135
_diff_one(old_tree.get_file(file_id).readlines(),
136
new_tree.get_file(file_id).readlines(),
138
fromfile=old_label + path,
139
tofile=new_label + path)
144
"""Describes changes from one tree to another.
153
(oldpath, newpath, id, kind, text_modified)
159
Each id is listed only once.
161
Files that are both modified and renamed are listed only in
162
renamed, with the text_modified flag true.
164
The lists are normally sorted when the delta is created.
174
def touches_file_id(self, file_id):
175
"""Return True if file_id is modified by this delta."""
176
for l in self.added, self.removed, self.modified:
180
for v in self.renamed:
186
def show(self, to_file, show_ids=False, show_unchanged=False):
187
def show_list(files):
188
for path, fid, kind in files:
189
if kind == 'directory':
191
elif kind == 'symlink':
195
print >>to_file, ' %-30s %s' % (path, fid)
197
print >>to_file, ' ', path
200
print >>to_file, 'removed:'
201
show_list(self.removed)
204
print >>to_file, 'added:'
205
show_list(self.added)
208
print >>to_file, 'renamed:'
209
for oldpath, newpath, fid, kind, text_modified in self.renamed:
211
print >>to_file, ' %s => %s %s' % (oldpath, newpath, fid)
213
print >>to_file, ' %s => %s' % (oldpath, newpath)
216
print >>to_file, 'modified:'
217
show_list(self.modified)
219
if show_unchanged and self.unchanged:
220
print >>to_file, 'unchanged:'
221
show_list(self.unchanged)
225
def compare_trees(old_tree, new_tree, want_unchanged, specific_files=None):
226
"""Describe changes from one tree to another.
228
Returns a TreeDelta with details of added, modified, renamed, and
231
The root entry is specifically exempt.
233
This only considers versioned files.
236
If true, also list files unchanged from one version to
240
If true, only check for changes to specified names or
244
from osutils import is_inside_any
325
def get_prop_change(meta_modified):
327
return " (properties changed)"
332
def _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
333
new_label, new_path, new_tree, text_modified,
334
kind, to_file, diff_file):
336
new_entry = new_tree.inventory[file_id]
337
old_tree.inventory[file_id].diff(diff_file,
338
old_label + old_path, old_tree,
339
new_label + new_path, new_entry,
246
old_inv = old_tree.inventory
247
new_inv = new_tree.inventory
249
mutter('start compare_trees')
251
# TODO: match for specific files can be rather smarter by finding
252
# the IDs of those files up front and then considering only that.
254
for file_id in old_tree:
255
if file_id in new_tree:
256
kind = old_inv.get_file_kind(file_id)
257
assert kind == new_inv.get_file_kind(file_id)
259
assert kind in ('file', 'directory', 'symlink', 'root_directory'), \
260
'invalid file kind %r' % kind
262
if kind == 'root_directory':
265
old_path = old_inv.id2path(file_id)
266
new_path = new_inv.id2path(file_id)
269
if (not is_inside_any(specific_files, old_path)
270
and not is_inside_any(specific_files, new_path)):
274
old_sha1 = old_tree.get_file_sha1(file_id)
275
new_sha1 = new_tree.get_file_sha1(file_id)
276
text_modified = (old_sha1 != new_sha1)
278
## mutter("no text to check for %r %r" % (file_id, kind))
279
text_modified = False
281
# TODO: Can possibly avoid calculating path strings if the
282
# two files are unchanged and their names and parents are
283
# the same and the parents are unchanged all the way up.
284
# May not be worthwhile.
286
if old_path != new_path:
287
delta.renamed.append((old_path, new_path, file_id, kind,
290
delta.modified.append((new_path, file_id, kind))
292
delta.unchanged.append((new_path, file_id, kind))
294
old_path = old_inv.id2path(file_id)
296
if not is_inside_any(specific_files, old_path):
298
delta.removed.append((old_path, file_id, kind))
300
mutter('start looking for new files')
301
for file_id in new_inv:
302
if file_id in old_inv:
304
new_path = new_inv.id2path(file_id)
306
if not is_inside_any(specific_files, new_path):
308
kind = new_inv.get_file_kind(file_id)
309
delta.added.append((new_path, file_id, kind))
314
delta.modified.sort()
315
delta.unchanged.sort()
added
removed
bzrlib/diff.py
