48
40
# both sequences are empty.
49
41
if not oldlines and not newlines:
52
if allow_binary is False:
53
check_text_lines(oldlines)
54
check_text_lines(newlines)
56
if sequence_matcher is None:
57
sequence_matcher = bzrlib.patiencediff.PatienceSequenceMatcher
58
ud = unified_diff(oldlines, newlines,
59
fromfile=old_filename.encode(path_encoding),
60
tofile=new_filename.encode(path_encoding),
61
sequencematcher=sequence_matcher)
46
if oldlines and (oldlines[-1][-1] != '\n'):
49
if newlines and (newlines[-1][-1] != '\n'):
53
ud = difflib.unified_diff(oldlines, newlines, **kw)
64
55
# work-around for difflib being too smart for its own good
65
56
# if /dev/null is "1,0", patch won't recognize it as /dev/null
67
59
ud[2] = ud[2].replace('-1,0', '-0,0')
69
62
ud[2] = ud[2].replace('+1,0', '+0,0')
70
# work around for difflib emitting random spaces after the label
71
ud[0] = ud[0][:-2] + '\n'
72
ud[1] = ud[1][:-2] + '\n'
76
if not line.endswith('\n'):
77
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"
81
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
83
"""Display a diff by calling out to the external diff program."""
70
def show_diff(b, revision, specific_files):
86
if to_file != sys.stdout:
87
raise NotImplementedError("sorry, can't send external diff other than to stdout yet",
90
# make sure our own output is properly ordered before the diff
93
from tempfile import NamedTemporaryFile
96
oldtmpf = NamedTemporaryFile()
97
newtmpf = NamedTemporaryFile()
100
# TODO: perhaps a special case for comparing to or from the empty
101
# sequence; can just use /dev/null on Unix
103
# TODO: if either of the files being compared already exists as a
104
# regular named file (e.g. in the working directory) then we can
105
# compare directly to that, rather than copying it.
107
oldtmpf.writelines(oldlines)
108
newtmpf.writelines(newlines)
116
'--label', old_filename,
118
'--label', new_filename,
121
# diff only allows one style to be specified; they don't override.
122
# note that some of these take optargs, and the optargs can be
123
# directly appended to the options.
124
# this is only an approximate parser; it doesn't properly understand
126
for s in ['-c', '-u', '-C', '-U',
131
'-y', '--side-by-side',
143
diffcmd.extend(diff_opts)
145
rc = os.spawnvp(os.P_WAIT, 'diff', diffcmd)
74
old_tree = b.basis_tree()
76
old_tree = b.revision_tree(b.lookup_revision(revision))
147
if rc != 0 and rc != 1:
148
# returns 1 if files differ; that's OK
150
msg = 'signal %d' % (-rc)
152
msg = 'exit code %d' % rc
154
raise BzrError('external diff failed with %s; command: %r' % (rc, diffcmd))
156
oldtmpf.close() # and delete
160
@deprecated_function(zero_eight)
161
def show_diff(b, from_spec, specific_files, external_diff_options=None,
162
revision2=None, output=None, b2=None):
163
"""Shortcut for showing the diff to the working tree.
165
Please use show_diff_trees instead.
171
None for 'basis tree', or otherwise the old revision to compare against.
173
The more general form is show_diff_trees(), where the caller
174
supplies any two trees.
180
if from_spec is None:
181
old_tree = b.bzrdir.open_workingtree()
183
old_tree = old_tree = old_tree.basis_tree()
185
old_tree = b.repository.revision_tree(from_spec.in_history(b).rev_id)
187
if revision2 is None:
189
new_tree = b.bzrdir.open_workingtree()
191
new_tree = b2.bzrdir.open_workingtree()
193
new_tree = b.repository.revision_tree(revision2.in_history(b).rev_id)
195
return show_diff_trees(old_tree, new_tree, output, specific_files,
196
external_diff_options)
199
def diff_cmd_helper(tree, specific_files, external_diff_options,
200
old_revision_spec=None, new_revision_spec=None,
201
old_label='a/', new_label='b/'):
202
"""Helper for cmd_diff.
208
The specific files to compare, or None
210
external_diff_options
211
If non-None, run an external diff, and pass it these options
214
If None, use basis tree as old revision, otherwise use the tree for
215
the specified revision.
218
If None, use working tree as new revision, otherwise use the tree for
219
the specified revision.
221
The more general form is show_diff_trees(), where the caller
222
supplies any two trees.
227
revision_id = spec.in_store(tree.branch).rev_id
228
return tree.branch.repository.revision_tree(revision_id)
229
if old_revision_spec is None:
230
old_tree = tree.basis_tree()
232
old_tree = spec_tree(old_revision_spec)
234
if new_revision_spec is None:
237
new_tree = spec_tree(new_revision_spec)
239
return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
240
external_diff_options,
241
old_label=old_label, new_label=new_label)
244
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
245
external_diff_options=None,
246
old_label='a/', new_label='b/'):
247
"""Show in text form the changes from one tree to another.
250
If set, include only changes to these files.
252
external_diff_options
253
If set, use an external GNU diff and pass these options.
259
return _show_diff_trees(old_tree, new_tree, to_file,
260
specific_files, external_diff_options,
261
old_label=old_label, new_label=new_label)
268
def _show_diff_trees(old_tree, new_tree, to_file,
269
specific_files, external_diff_options,
270
old_label='a/', new_label='b/' ):
272
# GNU Patch uses the epoch date to detect files that are being added
273
# or removed in a diff.
274
EPOCH_DATE = '1970-01-01 00:00:00 +0000'
78
new_tree = b.working_tree()
80
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
85
# Windows users, don't panic about this filename -- it is a
86
# special signal to GNU patch that the file should be created or
87
# deleted respectively.
276
89
# TODO: Generation of pseudo-diffs for added/deleted files could
277
90
# be usefully made into a much faster special case.
279
_raise_if_doubly_unversioned(specific_files, old_tree, new_tree)
281
if external_diff_options:
282
assert isinstance(external_diff_options, basestring)
283
opts = external_diff_options.split()
284
def diff_file(olab, olines, nlab, nlines, to_file):
285
external_diff(olab, olines, nlab, nlines, to_file, opts)
287
diff_file = internal_diff
289
92
delta = compare_trees(old_tree, new_tree, want_unchanged=False,
290
93
specific_files=specific_files)
293
95
for path, file_id, kind in delta.removed:
295
print >>to_file, '=== removed %s %r' % (kind, path.encode('utf8'))
296
old_name = '%s%s\t%s' % (old_label, path,
297
_patch_header_date(old_tree, file_id, path))
298
new_name = '%s%s\t%s' % (new_label, path, EPOCH_DATE)
299
old_tree.inventory[file_id].diff(diff_file, old_name, old_tree,
300
new_name, 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,
301
104
for path, file_id, kind in delta.added:
303
print >>to_file, '=== added %s %r' % (kind, path.encode('utf8'))
304
old_name = '%s%s\t%s' % (old_label, path, EPOCH_DATE)
305
new_name = '%s%s\t%s' % (new_label, path,
306
_patch_header_date(new_tree, file_id, path))
307
new_tree.inventory[file_id].diff(diff_file, new_name, new_tree,
308
old_name, None, None, to_file,
310
for (old_path, new_path, file_id, kind,
311
text_modified, meta_modified) in delta.renamed:
313
prop_str = get_prop_change(meta_modified)
314
print >>to_file, '=== renamed %s %r => %r%s' % (
315
kind, old_path.encode('utf8'),
316
new_path.encode('utf8'), prop_str)
317
old_name = '%s%s\t%s' % (old_label, old_path,
318
_patch_header_date(old_tree, file_id,
320
new_name = '%s%s\t%s' % (new_label, new_path,
321
_patch_header_date(new_tree, file_id,
323
_maybe_diff_file_or_symlink(old_name, old_tree, file_id,
325
text_modified, kind, to_file, diff_file)
326
for path, file_id, kind, text_modified, meta_modified in delta.modified:
328
prop_str = get_prop_change(meta_modified)
329
print >>to_file, '=== modified %s %r%s' % (kind, path.encode('utf8'), prop_str)
330
old_name = '%s%s\t%s' % (old_label, path,
331
_patch_header_date(old_tree, file_id, path))
332
new_name = '%s%s\t%s' % (new_label, path,
333
_patch_header_date(new_tree, file_id, path))
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)
334
115
if text_modified:
335
_maybe_diff_file_or_symlink(old_name, old_tree, file_id,
337
True, kind, to_file, diff_file)
342
def _patch_header_date(tree, file_id, path):
343
"""Returns a timestamp suitable for use in a patch header."""
344
tm = time.gmtime(tree.get_file_mtime(file_id, path))
345
return time.strftime('%Y-%m-%d %H:%M:%S +0000', tm)
348
def _raise_if_doubly_unversioned(specific_files, old_tree, new_tree):
349
"""Complain if paths are not versioned in either tree."""
350
if not specific_files:
352
old_unversioned = old_tree.filter_unversioned_files(specific_files)
353
new_unversioned = new_tree.filter_unversioned_files(specific_files)
354
unversioned = old_unversioned.intersection(new_unversioned)
356
raise errors.PathsNotVersionedError(sorted(unversioned))
359
def _raise_if_nonexistent(paths, old_tree, new_tree):
360
"""Complain if paths are not in either inventory or tree.
362
It's OK with the files exist in either tree's inventory, or
363
if they exist in the tree but are not versioned.
365
This can be used by operations such as bzr status that can accept
366
unknown or ignored files.
368
mutter("check paths: %r", paths)
371
s = old_tree.filter_unversioned_files(paths)
372
s = new_tree.filter_unversioned_files(s)
373
s = [path for path in s if not new_tree.has_filename(path)]
375
raise errors.PathsDoNotExist(sorted(s))
378
def get_prop_change(meta_modified):
380
return " (properties changed)"
385
def _maybe_diff_file_or_symlink(old_path, old_tree, file_id,
386
new_path, new_tree, text_modified,
387
kind, to_file, diff_file):
389
new_entry = new_tree.inventory[file_id]
390
old_tree.inventory[file_id].diff(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
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
