41
65
# both sequences are empty.
42
66
if not oldlines and not newlines:
47
if oldlines and (oldlines[-1][-1] != '\n'):
50
if newlines and (newlines[-1][-1] != '\n'):
54
ud = difflib.unified_diff(oldlines, newlines,
55
fromfile=old_label, tofile=new_label)
69
if allow_binary is False:
70
textfile.check_text_lines(oldlines)
71
textfile.check_text_lines(newlines)
73
if sequence_matcher is None:
74
sequence_matcher = patiencediff.PatienceSequenceMatcher
75
ud = patiencediff.unified_diff(oldlines, newlines,
76
fromfile=old_filename.encode(path_encoding),
77
tofile=new_filename.encode(path_encoding),
78
sequencematcher=sequence_matcher)
57
81
# work-around for difflib being too smart for its own good
58
82
# if /dev/null is "1,0", patch won't recognize it as /dev/null
61
84
ud[2] = ud[2].replace('-1,0', '-0,0')
64
86
ud[2] = ud[2].replace('+1,0', '+0,0')
87
# work around for difflib emitting random spaces after the label
88
ud[0] = ud[0][:-2] + '\n'
89
ud[1] = ud[1][:-2] + '\n'
67
92
to_file.write(line)
69
print >>to_file, "\\ No newline at end of file"
93
if not line.endswith('\n'):
94
to_file.write("\n\\ No newline at end of file\n")
75
def external_diff(old_label, oldlines, new_label, newlines, to_file,
99
"""Set the env vars LANG=C and LC_ALL=C."""
100
osutils.set_or_unset_env('LANG', 'C')
101
osutils.set_or_unset_env('LC_ALL', 'C')
102
osutils.set_or_unset_env('LC_CTYPE', None)
103
osutils.set_or_unset_env('LANGUAGE', None)
106
def _spawn_external_diff(diffcmd, capture_errors=True):
107
"""Spawn the externall diff process, and return the child handle.
109
:param diffcmd: The command list to spawn
110
:param capture_errors: Capture stderr as well as setting LANG=C
111
and LC_ALL=C. This lets us read and understand the output of diff,
112
and respond to any errors.
113
:return: A Popen object.
116
if sys.platform == 'win32':
117
# Win32 doesn't support preexec_fn, but that is
118
# okay, because it doesn't support LANG and LC_ALL either.
121
preexec_fn = _set_lang_C
122
stderr = subprocess.PIPE
128
pipe = subprocess.Popen(diffcmd,
129
stdin=subprocess.PIPE,
130
stdout=subprocess.PIPE,
132
preexec_fn=preexec_fn)
134
if e.errno == errno.ENOENT:
135
raise errors.NoDiff(str(e))
141
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
77
143
"""Display a diff by calling out to the external diff program."""
80
if to_file != sys.stdout:
81
raise NotImplementedError("sorry, can't send external diff other than to stdout yet",
84
144
# make sure our own output is properly ordered before the diff
87
from tempfile import NamedTemporaryFile
90
oldtmpf = NamedTemporaryFile()
91
newtmpf = NamedTemporaryFile()
147
oldtmp_fd, old_abspath = tempfile.mkstemp(prefix='bzr-diff-old-')
148
newtmp_fd, new_abspath = tempfile.mkstemp(prefix='bzr-diff-new-')
149
oldtmpf = os.fdopen(oldtmp_fd, 'wb')
150
newtmpf = os.fdopen(newtmp_fd, 'wb')
94
153
# TODO: perhaps a special case for comparing to or from the empty
137
198
diffcmd.extend(diff_opts)
139
rc = os.spawnvp(os.P_WAIT, 'diff', diffcmd)
200
pipe = _spawn_external_diff(diffcmd, capture_errors=True)
201
out,err = pipe.communicate()
141
if rc != 0 and rc != 1:
204
# internal_diff() adds a trailing newline, add one here for consistency
207
# 'diff' gives retcode == 2 for all sorts of errors
208
# one of those is 'Binary files differ'.
209
# Bad options could also be the problem.
210
# 'Binary files' is not a real error, so we suppress that error.
213
# Since we got here, we want to make sure to give an i18n error
214
pipe = _spawn_external_diff(diffcmd, capture_errors=False)
215
out, err = pipe.communicate()
217
# Write out the new i18n diff response
218
to_file.write(out+'\n')
219
if pipe.returncode != 2:
220
raise errors.BzrError(
221
'external diff failed with exit code 2'
222
' when run with LANG=C and LC_ALL=C,'
223
' but not when run natively: %r' % (diffcmd,))
225
first_line = lang_c_out.split('\n', 1)[0]
226
# Starting with diffutils 2.8.4 the word "binary" was dropped.
227
m = re.match('^(binary )?files.*differ$', first_line, re.I)
229
raise errors.BzrError('external diff failed with exit code 2;'
230
' command: %r' % (diffcmd,))
232
# Binary files differ, just return
235
# If we got to here, we haven't written out the output of diff
142
239
# returns 1 if files differ; that's OK
144
241
msg = 'signal %d' % (-rc)
146
243
msg = 'exit code %d' % rc
148
raise BzrError('external diff failed with %s; command: %r' % (rc, diffcmd))
245
raise errors.BzrError('external diff failed with %s; command: %r'
150
250
oldtmpf.close() # and delete
155
def show_diff(b, revision, specific_files, external_diff_options=None):
252
# Clean up. Warn in case the files couldn't be deleted
253
# (in case windows still holds the file open, but not
254
# if the files have already been deleted)
256
os.remove(old_abspath)
258
if e.errno not in (errno.ENOENT,):
259
warning('Failed to delete temporary file: %s %s',
262
os.remove(new_abspath)
264
if e.errno not in (errno.ENOENT,):
265
warning('Failed to delete temporary file: %s %s',
269
@deprecated_function(zero_eight)
270
def show_diff(b, from_spec, specific_files, external_diff_options=None,
271
revision2=None, output=None, b2=None):
156
272
"""Shortcut for showing the diff to the working tree.
274
Please use show_diff_trees instead.
162
None for each, or otherwise the old revision to compare against.
164
The more general form is show_diff_trees(), where the caller
165
supplies any two trees.
170
old_tree = b.basis_tree()
172
old_tree = b.revision_tree(b.lookup_revision(revision))
174
new_tree = b.working_tree()
176
show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
177
external_diff_options)
280
None for 'basis tree', or otherwise the old revision to compare against.
282
The more general form is show_diff_trees(), where the caller
283
supplies any two trees.
288
if from_spec is None:
289
old_tree = b.bzrdir.open_workingtree()
291
old_tree = old_tree = old_tree.basis_tree()
293
old_tree = b.repository.revision_tree(from_spec.in_history(b).rev_id)
295
if revision2 is None:
297
new_tree = b.bzrdir.open_workingtree()
299
new_tree = b2.bzrdir.open_workingtree()
301
new_tree = b.repository.revision_tree(revision2.in_history(b).rev_id)
303
return show_diff_trees(old_tree, new_tree, output, specific_files,
304
external_diff_options)
307
def diff_cmd_helper(tree, specific_files, external_diff_options,
308
old_revision_spec=None, new_revision_spec=None,
310
old_label='a/', new_label='b/'):
311
"""Helper for cmd_diff.
316
:param specific_files:
317
The specific files to compare, or None
319
:param external_diff_options:
320
If non-None, run an external diff, and pass it these options
322
:param old_revision_spec:
323
If None, use basis tree as old revision, otherwise use the tree for
324
the specified revision.
326
:param new_revision_spec:
327
If None, use working tree as new revision, otherwise use the tree for
328
the specified revision.
330
:param revision_specs:
331
Zero, one or two RevisionSpecs from the command line, saying what revisions
332
to compare. This can be passed as an alternative to the old_revision_spec
333
and new_revision_spec parameters.
335
The more general form is show_diff_trees(), where the caller
336
supplies any two trees.
339
# TODO: perhaps remove the old parameters old_revision_spec and
340
# new_revision_spec, since this is only really for use from cmd_diff and
341
# it now always passes through a sequence of revision_specs -- mbp
346
revision = spec.in_store(tree.branch)
348
revision = spec.in_store(None)
349
revision_id = revision.rev_id
350
branch = revision.branch
351
return branch.repository.revision_tree(revision_id)
353
if revision_specs is not None:
354
assert (old_revision_spec is None
355
and new_revision_spec is None)
356
if len(revision_specs) > 0:
357
old_revision_spec = revision_specs[0]
358
if len(revision_specs) > 1:
359
new_revision_spec = revision_specs[1]
361
if old_revision_spec is None:
362
old_tree = tree.basis_tree()
364
old_tree = spec_tree(old_revision_spec)
366
if (new_revision_spec is None
367
or new_revision_spec.spec is None):
370
new_tree = spec_tree(new_revision_spec)
372
if new_tree is not tree:
373
extra_trees = (tree,)
377
return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
378
external_diff_options,
379
old_label=old_label, new_label=new_label,
380
extra_trees=extra_trees)
181
383
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
182
external_diff_options=None):
384
external_diff_options=None,
385
old_label='a/', new_label='b/',
183
387
"""Show in text form the changes from one tree to another.
210
435
diff_file = internal_diff
213
delta = compare_trees(old_tree, new_tree, want_unchanged=False,
214
specific_files=specific_files)
437
delta = new_tree.changes_from(old_tree,
438
specific_files=specific_files,
439
extra_trees=extra_trees, require_versioned=True)
216
442
for path, file_id, kind in delta.removed:
217
print >>to_file, '*** removed %s %r' % (kind, path)
219
diff_file(old_label + path,
220
old_tree.get_file(file_id).readlines(),
444
print >>to_file, '=== removed %s %r' % (kind, path.encode('utf8'))
445
old_name = '%s%s\t%s' % (old_label, path,
446
_patch_header_date(old_tree, file_id, path))
447
new_name = '%s%s\t%s' % (new_label, path, EPOCH_DATE)
448
old_tree.inventory[file_id].diff(diff_file, old_name, old_tree,
449
new_name, None, None, to_file)
225
450
for path, file_id, kind in delta.added:
226
print >>to_file, '*** added %s %r' % (kind, path)
231
new_tree.get_file(file_id).readlines(),
234
for old_path, new_path, file_id, kind, text_modified in delta.renamed:
235
print >>to_file, '*** renamed %s %r => %r' % (kind, old_path, new_path)
452
print >>to_file, '=== added %s %r' % (kind, path.encode('utf8'))
453
old_name = '%s%s\t%s' % (old_label, path, EPOCH_DATE)
454
new_name = '%s%s\t%s' % (new_label, path,
455
_patch_header_date(new_tree, file_id, path))
456
new_tree.inventory[file_id].diff(diff_file, new_name, new_tree,
457
old_name, None, None, to_file,
459
for (old_path, new_path, file_id, kind,
460
text_modified, meta_modified) in delta.renamed:
462
prop_str = get_prop_change(meta_modified)
463
print >>to_file, '=== renamed %s %r => %r%s' % (
464
kind, old_path.encode('utf8'),
465
new_path.encode('utf8'), prop_str)
466
old_name = '%s%s\t%s' % (old_label, old_path,
467
_patch_header_date(old_tree, file_id,
469
new_name = '%s%s\t%s' % (new_label, new_path,
470
_patch_header_date(new_tree, file_id,
472
_maybe_diff_file_or_symlink(old_name, old_tree, file_id,
474
text_modified, kind, to_file, diff_file)
475
for path, file_id, kind, text_modified, meta_modified in delta.modified:
477
prop_str = get_prop_change(meta_modified)
478
print >>to_file, '=== modified %s %r%s' % (kind, path.encode('utf8'), prop_str)
479
old_name = '%s%s\t%s' % (old_label, path,
480
_patch_header_date(old_tree, file_id, path))
481
new_name = '%s%s\t%s' % (new_label, path,
482
_patch_header_date(new_tree, file_id, path))
236
483
if text_modified:
237
diff_file(old_label + old_path,
238
old_tree.get_file(file_id).readlines(),
239
new_label + new_path,
240
new_tree.get_file(file_id).readlines(),
243
for path, file_id, kind in delta.modified:
244
print >>to_file, '*** modified %s %r' % (kind, path)
246
diff_file(old_label + path,
247
old_tree.get_file(file_id).readlines(),
249
new_tree.get_file(file_id).readlines(),
254
class TreeDelta(object):
255
"""Describes changes from one tree to another.
264
(oldpath, newpath, id, kind, text_modified)
270
Each id is listed only once.
272
Files that are both modified and renamed are listed only in
273
renamed, with the text_modified flag true.
275
Files are only considered renamed if their name has changed or
276
their parent directory has changed. Renaming a directory
277
does not count as renaming all its contents.
279
The lists are normally sorted when the delta is created.
288
def __eq__(self, other):
289
if not isinstance(other, TreeDelta):
291
return self.added == other.added \
292
and self.removed == other.removed \
293
and self.renamed == other.renamed \
294
and self.modified == other.modified \
295
and self.unchanged == other.unchanged
297
def __ne__(self, other):
298
return not (self == other)
301
return "TreeDelta(added=%r, removed=%r, renamed=%r, modified=%r," \
302
" unchanged=%r)" % (self.added, self.removed, self.renamed,
303
self.modified, self.unchanged)
305
def has_changed(self):
306
changes = len(self.added) + len(self.removed) + len(self.renamed)
307
changes += len(self.modified)
308
return (changes != 0)
310
def touches_file_id(self, file_id):
311
"""Return True if file_id is modified by this delta."""
312
for l in self.added, self.removed, self.modified:
316
for v in self.renamed:
322
def show(self, to_file, show_ids=False, show_unchanged=False):
323
def show_list(files):
324
for path, fid, kind in files:
325
if kind == 'directory':
327
elif kind == 'symlink':
331
print >>to_file, ' %-30s %s' % (path, fid)
333
print >>to_file, ' ', path
336
print >>to_file, 'removed:'
337
show_list(self.removed)
340
print >>to_file, 'added:'
341
show_list(self.added)
344
print >>to_file, 'renamed:'
345
for oldpath, newpath, fid, kind, text_modified in self.renamed:
347
print >>to_file, ' %s => %s %s' % (oldpath, newpath, fid)
349
print >>to_file, ' %s => %s' % (oldpath, newpath)
352
print >>to_file, 'modified:'
353
show_list(self.modified)
355
if show_unchanged and self.unchanged:
356
print >>to_file, 'unchanged:'
357
show_list(self.unchanged)
361
def compare_trees(old_tree, new_tree, want_unchanged=False, specific_files=None):
362
"""Describe changes from one tree to another.
364
Returns a TreeDelta with details of added, modified, renamed, and
367
The root entry is specifically exempt.
369
This only considers versioned files.
372
If true, also list files unchanged from one version to
376
If true, only check for changes to specified names or
380
from osutils import is_inside_any
484
_maybe_diff_file_or_symlink(old_name, old_tree, file_id,
486
True, kind, to_file, diff_file)
491
def _patch_header_date(tree, file_id, path):
492
"""Returns a timestamp suitable for use in a patch header."""
493
tm = time.gmtime(tree.get_file_mtime(file_id, path))
494
return time.strftime('%Y-%m-%d %H:%M:%S +0000', tm)
497
def _raise_if_nonexistent(paths, old_tree, new_tree):
498
"""Complain if paths are not in either inventory or tree.
500
It's OK with the files exist in either tree's inventory, or
501
if they exist in the tree but are not versioned.
382
old_inv = old_tree.inventory
383
new_inv = new_tree.inventory
385
mutter('start compare_trees')
387
# TODO: match for specific files can be rather smarter by finding
388
# the IDs of those files up front and then considering only that.
390
for file_id in old_tree:
391
if file_id in new_tree:
392
old_ie = old_inv[file_id]
393
new_ie = new_inv[file_id]
396
assert kind == new_ie.kind
398
assert kind in ('file', 'directory', 'symlink', 'root_directory'), \
399
'invalid file kind %r' % kind
401
if kind == 'root_directory':
405
if (not is_inside_any(specific_files, old_inv.id2path(file_id))
406
and not is_inside_any(specific_files, new_inv.id2path(file_id))):
410
old_sha1 = old_tree.get_file_sha1(file_id)
411
new_sha1 = new_tree.get_file_sha1(file_id)
412
text_modified = (old_sha1 != new_sha1)
414
## mutter("no text to check for %r %r" % (file_id, kind))
415
text_modified = False
417
# TODO: Can possibly avoid calculating path strings if the
418
# two files are unchanged and their names and parents are
419
# the same and the parents are unchanged all the way up.
420
# May not be worthwhile.
422
if (old_ie.name != new_ie.name
423
or old_ie.parent_id != new_ie.parent_id):
424
delta.renamed.append((old_inv.id2path(file_id),
425
new_inv.id2path(file_id),
429
delta.modified.append((new_inv.id2path(file_id), file_id, kind))
431
delta.unchanged.append((new_inv.id2path(file_id), file_id, kind))
433
kind = old_inv.get_file_kind(file_id)
434
old_path = old_inv.id2path(file_id)
436
if not is_inside_any(specific_files, old_path):
438
delta.removed.append((old_path, file_id, kind))
440
mutter('start looking for new files')
441
for file_id in new_inv:
442
if file_id in old_inv:
444
new_path = new_inv.id2path(file_id)
446
if not is_inside_any(specific_files, new_path):
448
kind = new_inv.get_file_kind(file_id)
449
delta.added.append((new_path, file_id, kind))
454
delta.modified.sort()
455
delta.unchanged.sort()
503
This can be used by operations such as bzr status that can accept
504
unknown or ignored files.
506
mutter("check paths: %r", paths)
509
s = old_tree.filter_unversioned_files(paths)
510
s = new_tree.filter_unversioned_files(s)
511
s = [path for path in s if not new_tree.has_filename(path)]
513
raise errors.PathsDoNotExist(sorted(s))
516
def get_prop_change(meta_modified):
518
return " (properties changed)"
523
def _maybe_diff_file_or_symlink(old_path, old_tree, file_id,
524
new_path, new_tree, text_modified,
525
kind, to_file, diff_file):
527
new_entry = new_tree.inventory[file_id]
528
old_tree.inventory[file_id].diff(diff_file,