1
# Copyright (C) 2004, 2005, 2006 Canonical Ltd.
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
39
from bzrlib.symbol_versioning import (
43
from bzrlib.trace import mutter, warning
46
# TODO: Rather than building a changeset object, we should probably
47
# invoke callbacks on an object. That object can either accumulate a
48
# list, write them out directly, etc etc.
51
class _PrematchedMatcher(difflib.SequenceMatcher):
52
"""Allow SequenceMatcher operations to use predetermined blocks"""
54
def __init__(self, matching_blocks):
55
difflib.SequenceMatcher(self, None, None)
56
self.matching_blocks = matching_blocks
60
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file,
61
allow_binary=False, sequence_matcher=None,
62
path_encoding='utf8'):
63
# FIXME: difflib is wrong if there is no trailing newline.
64
# The syntax used by patch seems to be "\ No newline at
65
# end of file" following the last diff line from that
66
# file. This is not trivial to insert into the
67
# unified_diff output and it might be better to just fix
68
# or replace that function.
70
# In the meantime we at least make sure the patch isn't
74
# Special workaround for Python2.3, where difflib fails if
75
# both sequences are empty.
76
if not oldlines and not newlines:
79
if allow_binary is False:
80
textfile.check_text_lines(oldlines)
81
textfile.check_text_lines(newlines)
83
if sequence_matcher is None:
84
sequence_matcher = patiencediff.PatienceSequenceMatcher
85
ud = patiencediff.unified_diff(oldlines, newlines,
86
fromfile=old_filename.encode(path_encoding),
87
tofile=new_filename.encode(path_encoding),
88
sequencematcher=sequence_matcher)
91
# work-around for difflib being too smart for its own good
92
# if /dev/null is "1,0", patch won't recognize it as /dev/null
94
ud[2] = ud[2].replace('-1,0', '-0,0')
96
ud[2] = ud[2].replace('+1,0', '+0,0')
97
# work around for difflib emitting random spaces after the label
98
ud[0] = ud[0][:-2] + '\n'
99
ud[1] = ud[1][:-2] + '\n'
103
if not line.endswith('\n'):
104
to_file.write("\n\\ No newline at end of file\n")
108
def _spawn_external_diff(diffcmd, capture_errors=True):
109
"""Spawn the externall diff process, and return the child handle.
111
:param diffcmd: The command list to spawn
112
:param capture_errors: Capture stderr as well as setting LANG=C
113
and LC_ALL=C. This lets us read and understand the output of diff,
114
and respond to any errors.
115
:return: A Popen object.
118
# construct minimal environment
120
path = os.environ.get('PATH')
123
env['LANGUAGE'] = 'C' # on win32 only LANGUAGE has effect
126
stderr = subprocess.PIPE
132
pipe = subprocess.Popen(diffcmd,
133
stdin=subprocess.PIPE,
134
stdout=subprocess.PIPE,
138
if e.errno == errno.ENOENT:
139
raise errors.NoDiff(str(e))
145
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
147
"""Display a diff by calling out to the external diff program."""
148
# make sure our own output is properly ordered before the diff
151
oldtmp_fd, old_abspath = tempfile.mkstemp(prefix='bzr-diff-old-')
152
newtmp_fd, new_abspath = tempfile.mkstemp(prefix='bzr-diff-new-')
153
oldtmpf = os.fdopen(oldtmp_fd, 'wb')
154
newtmpf = os.fdopen(newtmp_fd, 'wb')
157
# TODO: perhaps a special case for comparing to or from the empty
158
# sequence; can just use /dev/null on Unix
160
# TODO: if either of the files being compared already exists as a
161
# regular named file (e.g. in the working directory) then we can
162
# compare directly to that, rather than copying it.
164
oldtmpf.writelines(oldlines)
165
newtmpf.writelines(newlines)
173
'--label', old_filename,
175
'--label', new_filename,
180
# diff only allows one style to be specified; they don't override.
181
# note that some of these take optargs, and the optargs can be
182
# directly appended to the options.
183
# this is only an approximate parser; it doesn't properly understand
185
for s in ['-c', '-u', '-C', '-U',
190
'-y', '--side-by-side',
202
diffcmd.extend(diff_opts)
204
pipe = _spawn_external_diff(diffcmd, capture_errors=True)
205
out,err = pipe.communicate()
208
# internal_diff() adds a trailing newline, add one here for consistency
211
# 'diff' gives retcode == 2 for all sorts of errors
212
# one of those is 'Binary files differ'.
213
# Bad options could also be the problem.
214
# 'Binary files' is not a real error, so we suppress that error.
217
# Since we got here, we want to make sure to give an i18n error
218
pipe = _spawn_external_diff(diffcmd, capture_errors=False)
219
out, err = pipe.communicate()
221
# Write out the new i18n diff response
222
to_file.write(out+'\n')
223
if pipe.returncode != 2:
224
raise errors.BzrError(
225
'external diff failed with exit code 2'
226
' when run with LANG=C and LC_ALL=C,'
227
' but not when run natively: %r' % (diffcmd,))
229
first_line = lang_c_out.split('\n', 1)[0]
230
# Starting with diffutils 2.8.4 the word "binary" was dropped.
231
m = re.match('^(binary )?files.*differ$', first_line, re.I)
233
raise errors.BzrError('external diff failed with exit code 2;'
234
' command: %r' % (diffcmd,))
236
# Binary files differ, just return
239
# If we got to here, we haven't written out the output of diff
243
# returns 1 if files differ; that's OK
245
msg = 'signal %d' % (-rc)
247
msg = 'exit code %d' % rc
249
raise errors.BzrError('external diff failed with %s; command: %r'
254
oldtmpf.close() # and delete
256
# Clean up. Warn in case the files couldn't be deleted
257
# (in case windows still holds the file open, but not
258
# if the files have already been deleted)
260
os.remove(old_abspath)
262
if e.errno not in (errno.ENOENT,):
263
warning('Failed to delete temporary file: %s %s',
266
os.remove(new_abspath)
268
if e.errno not in (errno.ENOENT,):
269
warning('Failed to delete temporary file: %s %s',
273
@deprecated_function(zero_ninetythree)
274
def diff_cmd_helper(tree, specific_files, external_diff_options,
275
old_revision_spec=None, new_revision_spec=None,
277
old_label='a/', new_label='b/'):
278
"""Helper for cmd_diff.
283
:param specific_files:
284
The specific files to compare, or None
286
:param external_diff_options:
287
If non-None, run an external diff, and pass it these options
289
:param old_revision_spec:
290
If None, use basis tree as old revision, otherwise use the tree for
291
the specified revision.
293
:param new_revision_spec:
294
If None, use working tree as new revision, otherwise use the tree for
295
the specified revision.
297
:param revision_specs:
298
Zero, one or two RevisionSpecs from the command line, saying what revisions
299
to compare. This can be passed as an alternative to the old_revision_spec
300
and new_revision_spec parameters.
302
The more general form is show_diff_trees(), where the caller
303
supplies any two trees.
306
# TODO: perhaps remove the old parameters old_revision_spec and
307
# new_revision_spec, since this is only really for use from cmd_diff and
308
# it now always passes through a sequence of revision_specs -- mbp
313
revision = spec.in_store(tree.branch)
315
revision = spec.in_store(None)
316
revision_id = revision.rev_id
317
branch = revision.branch
318
return branch.repository.revision_tree(revision_id)
320
if revision_specs is not None:
321
assert (old_revision_spec is None
322
and new_revision_spec is None)
323
if len(revision_specs) > 0:
324
old_revision_spec = revision_specs[0]
325
if len(revision_specs) > 1:
326
new_revision_spec = revision_specs[1]
328
if old_revision_spec is None:
329
old_tree = tree.basis_tree()
331
old_tree = spec_tree(old_revision_spec)
333
if (new_revision_spec is None
334
or new_revision_spec.spec is None):
337
new_tree = spec_tree(new_revision_spec)
339
if new_tree is not tree:
340
extra_trees = (tree,)
344
return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
345
external_diff_options,
346
old_label=old_label, new_label=new_label,
347
extra_trees=extra_trees)
350
def _get_trees_to_diff(path_list, revision_specs, old_url, new_url):
351
"""Get the trees and specific files to diff given a list of paths.
353
This method works out the trees to be diff'ed and the files of
354
interest within those trees.
357
the list of arguments passed to the diff command
358
:param revision_specs:
359
Zero, one or two RevisionSpecs from the diff command line,
360
saying what revisions to compare.
362
The url of the old branch or tree. If None, the tree to use is
363
taken from the first path, if any, or the current working tree.
365
The url of the new branch or tree. If None, the tree to use is
366
taken from the first path, if any, or the current working tree.
368
a tuple of (old_tree, new_tree, specific_files, extra_trees) where
369
extra_trees is a sequence of additional trees to search in for
372
# Get the old and new revision specs
373
old_revision_spec = None
374
new_revision_spec = None
375
if revision_specs is not None:
376
if len(revision_specs) > 0:
377
old_revision_spec = revision_specs[0]
378
if len(revision_specs) > 1:
379
new_revision_spec = revision_specs[1]
380
# If both revision specs include a branch, we can diff them
381
# without needing to look further for the details
382
if (old_revision_spec is not None and
383
new_revision_spec is not None and
384
not old_revision_spec.needs_branch() and
385
not new_revision_spec.needs_branch()):
386
old_tree = _get_tree_to_diff(old_revision_spec)
387
new_tree = _get_tree_to_diff(new_revision_spec)
388
specific_files = path_list or None
389
return old_tree, new_tree, specific_files, None
391
# If no path is given, assume the current directory
392
if path_list is None or len(path_list) == 0:
393
default_location = u'.'
396
elif old_url is not None and new_url is not None:
397
default_location = None # don't care - not required
398
other_paths = path_list
401
default_location = path_list[0]
402
other_paths = path_list[1:]
405
# Get the old location
407
old_url = default_location
408
working_tree, branch, relpath = \
409
bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
410
old_tree = _get_tree_to_diff(old_revision_spec, working_tree, branch)
412
# Get the new location
414
new_url = default_location
415
if new_url != old_url:
416
working_tree, branch, relpath = \
417
bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
418
new_tree = _get_tree_to_diff(new_revision_spec, working_tree, branch,
419
basis_is_default=working_tree is None)
421
# Get the specific files and extra trees
422
specific_files = _relative_files_for_diff(working_tree, relpath,
423
other_paths, check_paths)
425
if new_tree != working_tree and working_tree is not None:
426
extra_trees = (working_tree,)
427
return old_tree, new_tree, specific_files, extra_trees
430
def _get_tree_to_diff(spec, tree=None, branch=None, basis_is_default=True):
431
if branch is None and tree is not None:
433
if spec is None or spec.spec is None:
435
return branch.basis_tree()
438
revision = spec.in_store(branch)
439
revision_id = revision.rev_id
440
rev_branch = revision.branch
441
return rev_branch.repository.revision_tree(revision_id)
444
def _relative_files_for_diff(tree, first_relpath, other_paths, check_paths):
445
"""Get the specific files for diff.
447
This method converts path arguments to relative paths in a tree.
448
If the tree is None or check_paths is False, other_paths are assumed
449
to be relative already. Otherwise, all arguments must be paths in
453
if first_relpath != '':
454
specific_files.append(first_relpath)
455
if not check_paths or tree is None:
456
specific_files.extend(other_paths)
458
for filename in other_paths:
460
specific_files.append(tree.relpath(osutils.dereference_path(
462
except errors.PathNotChild:
463
raise errors.BzrCommandError("Files are in different branches")
464
if len(specific_files) == 0:
465
specific_files = None
466
return specific_files
469
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
470
external_diff_options=None,
471
old_label='a/', new_label='b/',
473
path_encoding='utf8'):
474
"""Show in text form the changes from one tree to another.
480
Include only changes to these files - None for all changes.
482
external_diff_options
483
If set, use an external GNU diff and pass these options.
486
If set, more Trees to use for looking up file ids
489
If set, the path will be encoded as specified, otherwise is supposed
494
if extra_trees is not None:
495
for tree in extra_trees:
499
differ = DiffTree.from_trees_options(old_tree, new_tree, to_file,
501
external_diff_options,
502
old_label, new_label)
503
return differ.show_diff(specific_files, extra_trees)
506
if extra_trees is not None:
507
for tree in extra_trees:
513
def _patch_header_date(tree, file_id, path):
514
"""Returns a timestamp suitable for use in a patch header."""
515
mtime = tree.get_file_mtime(file_id, path)
516
assert mtime is not None, \
517
"got an mtime of None for file-id %s, path %s in tree %s" % (
519
return timestamp.format_patch_date(mtime)
522
def _raise_if_nonexistent(paths, old_tree, new_tree):
523
"""Complain if paths are not in either inventory or tree.
525
It's OK with the files exist in either tree's inventory, or
526
if they exist in the tree but are not versioned.
528
This can be used by operations such as bzr status that can accept
529
unknown or ignored files.
531
mutter("check paths: %r", paths)
534
s = old_tree.filter_unversioned_files(paths)
535
s = new_tree.filter_unversioned_files(s)
536
s = [path for path in s if not new_tree.has_filename(path)]
538
raise errors.PathsDoNotExist(sorted(s))
541
def get_prop_change(meta_modified):
543
return " (properties changed)"
548
class DiffPath(object):
549
"""Base type for command object that compare files"""
551
# The type or contents of the file were unsuitable for diffing
552
CANNOT_DIFF = 'CANNOT_DIFF'
553
# The file has changed in a semantic way
555
# The file content may have changed, but there is no semantic change
556
UNCHANGED = 'UNCHANGED'
558
def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8'):
561
:param old_tree: The tree to show as the old tree in the comparison
562
:param new_tree: The tree to show as new in the comparison
563
:param to_file: The file to write comparison data to
564
:param path_encoding: The character encoding to write paths in
566
self.old_tree = old_tree
567
self.new_tree = new_tree
568
self.to_file = to_file
569
self.path_encoding = path_encoding
572
def from_diff_tree(klass, diff_tree):
573
return klass(diff_tree.old_tree, diff_tree.new_tree,
574
diff_tree.to_file, diff_tree.path_encoding)
577
def _diff_many(differs, file_id, old_path, new_path, old_kind, new_kind):
578
for file_differ in differs:
579
result = file_differ.diff(file_id, old_path, new_path, old_kind,
581
if result is not DiffPath.CANNOT_DIFF:
584
return DiffPath.CANNOT_DIFF
587
class DiffKindChange(object):
588
"""Special differ for file kind changes.
590
Represents kind change as deletion + creation. Uses the other differs
593
def __init__(self, differs):
594
self.differs = differs
597
def from_diff_tree(klass, diff_tree):
598
return klass(diff_tree.differs)
600
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
601
"""Perform comparison
603
:param file_id: The file_id of the file to compare
604
:param old_path: Path of the file in the old tree
605
:param new_path: Path of the file in the new tree
606
:param old_kind: Old file-kind of the file
607
:param new_kind: New file-kind of the file
609
if None in (old_kind, new_kind):
610
return DiffPath.CANNOT_DIFF
611
result = DiffPath._diff_many(self.differs, file_id, old_path,
612
new_path, old_kind, None)
613
if result is DiffPath.CANNOT_DIFF:
615
return DiffPath._diff_many(self.differs, file_id, old_path, new_path,
619
class DiffDirectory(DiffPath):
621
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
622
"""Perform comparison between two directories. (dummy)
625
if 'directory' not in (old_kind, new_kind):
626
return self.CANNOT_DIFF
627
if old_kind not in ('directory', None):
628
return self.CANNOT_DIFF
629
if new_kind not in ('directory', None):
630
return self.CANNOT_DIFF
634
class DiffSymlink(DiffPath):
636
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
637
"""Perform comparison between two symlinks
639
:param file_id: The file_id of the file to compare
640
:param old_path: Path of the file in the old tree
641
:param new_path: Path of the file in the new tree
642
:param old_kind: Old file-kind of the file
643
:param new_kind: New file-kind of the file
645
if 'symlink' not in (old_kind, new_kind):
646
return self.CANNOT_DIFF
647
if old_kind == 'symlink':
648
old_target = self.old_tree.get_symlink_target(file_id)
649
elif old_kind is None:
652
return self.CANNOT_DIFF
653
if new_kind == 'symlink':
654
new_target = self.new_tree.get_symlink_target(file_id)
655
elif new_kind is None:
658
return self.CANNOT_DIFF
659
return self.diff_symlink(old_target, new_target)
661
def diff_symlink(self, old_target, new_target):
662
if old_target is None:
663
self.to_file.write('=== target is %r\n' % new_target)
664
elif new_target is None:
665
self.to_file.write('=== target was %r\n' % old_target)
667
self.to_file.write('=== target changed %r => %r\n' %
668
(old_target, new_target))
672
class DiffText(DiffPath):
674
# GNU Patch uses the epoch date to detect files that are being added
675
# or removed in a diff.
676
EPOCH_DATE = '1970-01-01 00:00:00 +0000'
678
def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
679
old_label='', new_label='', text_differ=internal_diff):
680
DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
681
self.text_differ = text_differ
682
self.old_label = old_label
683
self.new_label = new_label
684
self.path_encoding = path_encoding
686
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
687
"""Compare two files in unified diff format
689
:param file_id: The file_id of the file to compare
690
:param old_path: Path of the file in the old tree
691
:param new_path: Path of the file in the new tree
692
:param old_kind: Old file-kind of the file
693
:param new_kind: New file-kind of the file
695
if 'file' not in (old_kind, new_kind):
696
return self.CANNOT_DIFF
697
from_file_id = to_file_id = file_id
698
if old_kind == 'file':
699
old_date = _patch_header_date(self.old_tree, file_id, old_path)
700
elif old_kind is None:
701
old_date = self.EPOCH_DATE
704
return self.CANNOT_DIFF
705
if new_kind == 'file':
706
new_date = _patch_header_date(self.new_tree, file_id, new_path)
707
elif new_kind is None:
708
new_date = self.EPOCH_DATE
711
return self.CANNOT_DIFF
712
from_label = '%s%s\t%s' % (self.old_label, old_path, old_date)
713
to_label = '%s%s\t%s' % (self.new_label, new_path, new_date)
714
return self.diff_text(from_file_id, to_file_id, from_label, to_label)
716
def diff_text(self, from_file_id, to_file_id, from_label, to_label):
717
"""Diff the content of given files in two trees
719
:param from_file_id: The id of the file in the from tree. If None,
720
the file is not present in the from tree.
721
:param to_file_id: The id of the file in the to tree. This may refer
722
to a different file from from_file_id. If None,
723
the file is not present in the to tree.
725
def _get_text(tree, file_id):
726
if file_id is not None:
727
return tree.get_file(file_id).readlines()
731
from_text = _get_text(self.old_tree, from_file_id)
732
to_text = _get_text(self.new_tree, to_file_id)
733
self.text_differ(from_label, from_text, to_label, to_text,
735
except errors.BinaryFile:
737
("Binary files %s and %s differ\n" %
738
(from_label, to_label)).encode(self.path_encoding))
742
class DiffTree(object):
743
"""Provides textual representations of the difference between two trees.
745
A DiffTree examines two trees and where a file-id has altered
746
between them, generates a textual representation of the difference.
747
DiffTree uses a sequence of DiffPath objects which are each
748
given the opportunity to handle a given altered fileid. The list
749
of DiffPath objects can be extended globally by appending to
750
DiffTree.diff_factories, or for a specific diff operation by
751
supplying the extra_factories option to the appropriate method.
754
# list of factories that can provide instances of DiffPath objects
755
# may be extended by plugins.
756
diff_factories = [DiffSymlink.from_diff_tree,
757
DiffDirectory.from_diff_tree]
759
def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
760
diff_text=None, extra_factories=None):
763
:param old_tree: Tree to show as old in the comparison
764
:param new_tree: Tree to show as new in the comparison
765
:param to_file: File to write comparision to
766
:param path_encoding: Character encoding to write paths in
767
:param diff_text: DiffPath-type object to use as a last resort for
769
:param extra_factories: Factories of DiffPaths to try before any other
771
if diff_text is None:
772
diff_text = DiffText(old_tree, new_tree, to_file, path_encoding,
773
'', '', internal_diff)
774
self.old_tree = old_tree
775
self.new_tree = new_tree
776
self.to_file = to_file
777
self.path_encoding = path_encoding
779
if extra_factories is not None:
780
self.differs.extend(f(self) for f in extra_factories)
781
self.differs.extend(f(self) for f in self.diff_factories)
782
self.differs.extend([diff_text, DiffKindChange.from_diff_tree(self)])
785
def from_trees_options(klass, old_tree, new_tree, to_file,
786
path_encoding, external_diff_options, old_label,
788
"""Factory for producing a DiffTree.
790
Designed to accept options used by show_diff_trees.
791
:param old_tree: The tree to show as old in the comparison
792
:param new_tree: The tree to show as new in the comparison
793
:param to_file: File to write comparisons to
794
:param path_encoding: Character encoding to use for writing paths
795
:param external_diff_options: If supplied, use the installed diff
796
binary to perform file comparison, using supplied options.
797
:param old_label: Prefix to use for old file labels
798
:param new_label: Prefix to use for new file labels
800
if external_diff_options:
801
assert isinstance(external_diff_options, basestring)
802
opts = external_diff_options.split()
803
def diff_file(olab, olines, nlab, nlines, to_file):
804
external_diff(olab, olines, nlab, nlines, to_file, opts)
806
diff_file = internal_diff
807
diff_text = DiffText(old_tree, new_tree, to_file, path_encoding,
808
old_label, new_label, diff_file)
809
return klass(old_tree, new_tree, to_file, path_encoding, diff_text)
811
def show_diff(self, specific_files, extra_trees=None):
812
"""Write tree diff to self.to_file
814
:param sepecific_files: the specific files to compare (recursive)
815
:param extra_trees: extra trees to use for mapping paths to file_ids
817
# TODO: Generation of pseudo-diffs for added/deleted files could
818
# be usefully made into a much faster special case.
820
delta = self.new_tree.changes_from(self.old_tree,
821
specific_files=specific_files,
822
extra_trees=extra_trees, require_versioned=True)
825
for path, file_id, kind in delta.removed:
827
path_encoded = path.encode(self.path_encoding, "replace")
828
self.to_file.write("=== removed %s '%s'\n" % (kind, path_encoded))
829
self.diff(file_id, path, path)
831
for path, file_id, kind in delta.added:
833
path_encoded = path.encode(self.path_encoding, "replace")
834
self.to_file.write("=== added %s '%s'\n" % (kind, path_encoded))
835
self.diff(file_id, path, path)
836
for (old_path, new_path, file_id, kind,
837
text_modified, meta_modified) in delta.renamed:
839
prop_str = get_prop_change(meta_modified)
840
oldpath_encoded = old_path.encode(self.path_encoding, "replace")
841
newpath_encoded = new_path.encode(self.path_encoding, "replace")
842
self.to_file.write("=== renamed %s '%s' => '%s'%s\n" % (kind,
843
oldpath_encoded, newpath_encoded, prop_str))
845
self.diff(file_id, old_path, new_path)
846
for path, file_id, kind, text_modified, meta_modified in\
849
prop_str = get_prop_change(meta_modified)
850
path_encoded = path.encode(self.path_encoding, "replace")
851
self.to_file.write("=== modified %s '%s'%s\n" % (kind,
852
path_encoded, prop_str))
853
# The file may be in a different location in the old tree (because
854
# the containing dir was renamed, but the file itself was not)
856
old_path = self.old_tree.id2path(file_id)
857
self.diff(file_id, old_path, path)
860
def diff(self, file_id, old_path, new_path):
861
"""Perform a diff of a single file
863
:param file_id: file-id of the file
864
:param old_path: The path of the file in the old tree
865
:param new_path: The path of the file in the new tree
868
old_kind = self.old_tree.kind(file_id)
869
except errors.NoSuchId:
872
new_kind = self.new_tree.kind(file_id)
873
except errors.NoSuchId:
876
result = DiffPath._diff_many(self.differs, file_id, old_path,
877
new_path, old_kind, new_kind)
878
if result is DiffPath.CANNOT_DIFF:
879
error_path = new_path
880
if error_path is None:
881
error_path = old_path
882
raise errors.NoDiffFound(error_path)
added
removed
bzrlib/diff.py
