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):
272
"""Shortcut for showing the diff to the working tree.
274
Please use show_diff_trees instead.
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)
278
def _get_trees_to_diff(path_list, revision_specs, old_url, new_url):
279
"""Get the trees and specific files to diff given a list of paths.
281
This method works out the trees to be diff'ed and the files of
282
interest within those trees.
285
the list of arguments passed to the diff command
286
:param revision_specs:
287
Zero, one or two RevisionSpecs from the diff command line,
288
saying what revisions to compare.
290
The url of the old branch or tree. If None, the tree to use is
291
taken from the first path, if any, or the current working tree.
293
The url of the new branch or tree. If None, the tree to use is
294
taken from the first path, if any, or the current working tree.
296
a tuple of (old_tree, new_tree, specific_files, extra_trees) where
297
extra_trees is a sequence of additional trees to search in for
300
# Get the old and new revision specs
301
old_revision_spec = None
302
new_revision_spec = None
353
303
if revision_specs is not None:
354
assert (old_revision_spec is None
355
and new_revision_spec is None)
356
304
if len(revision_specs) > 0:
357
305
old_revision_spec = revision_specs[0]
307
old_url = old_revision_spec.get_branch()
358
308
if len(revision_specs) > 1:
359
309
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)
311
new_url = new_revision_spec.get_branch()
314
make_paths_wt_relative = True
315
consider_relpath = True
316
if path_list is None or len(path_list) == 0:
317
# If no path is given, the current working tree is used
318
default_location = u'.'
319
consider_relpath = False
320
elif old_url is not None and new_url is not None:
321
other_paths = path_list
322
make_paths_wt_relative = False
324
default_location = path_list[0]
325
other_paths = path_list[1:]
327
# Get the old location
330
old_url = default_location
331
working_tree, branch, relpath = \
332
bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
333
if consider_relpath and relpath != '':
334
specific_files.append(relpath)
335
old_tree = _get_tree_to_diff(old_revision_spec, working_tree, branch)
337
# Get the new location
339
new_url = default_location
340
if new_url != old_url:
341
working_tree, branch, relpath = \
342
bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
343
if consider_relpath and relpath != '':
344
specific_files.append(relpath)
345
new_tree = _get_tree_to_diff(new_revision_spec, working_tree, branch,
346
basis_is_default=working_tree is None)
348
# Get the specific files (all files is None, no files is [])
349
if make_paths_wt_relative and working_tree is not None:
350
other_paths = _relative_paths_in_tree(working_tree, other_paths)
351
specific_files.extend(other_paths)
352
if len(specific_files) == 0:
353
specific_files = None
355
# Get extra trees that ought to be searched for file-ids
357
if working_tree is not None and working_tree not in (old_tree, new_tree):
358
extra_trees = (working_tree,)
359
return old_tree, new_tree, specific_files, extra_trees
362
def _get_tree_to_diff(spec, tree=None, branch=None, basis_is_default=True):
363
if branch is None and tree is not None:
365
if spec is None or spec.spec is None:
368
return tree.basis_tree()
370
return branch.basis_tree()
373
if not spec.needs_branch():
374
branch = _mod_branch.Branch.open(spec.get_branch())
375
revision_id = spec.as_revision_id(branch)
376
return branch.repository.revision_tree(revision_id)
379
def _relative_paths_in_tree(tree, paths):
380
"""Get the relative paths within a working tree.
382
Each path may be either an absolute path or a path relative to the
383
current working directory.
386
for filename in paths:
388
result.append(tree.relpath(osutils.dereference_path(filename)))
389
except errors.PathNotChild:
390
raise errors.BzrCommandError("Files are in different branches")
383
394
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
384
395
external_diff_options=None,
385
396
old_label='a/', new_label='b/',
398
path_encoding='utf8',
387
400
"""Show in text form the changes from one tree to another.
390
If set, include only changes to these files.
406
Include only changes to these files - None for all changes.
392
408
external_diff_options
393
409
If set, use an external GNU diff and pass these options.
396
412
If set, more Trees to use for looking up file ids
415
If set, the path will be encoded as specified, otherwise is supposed
398
418
old_tree.lock_read()
415
436
old_tree.unlock()
418
def _show_diff_trees(old_tree, new_tree, to_file,
419
specific_files, external_diff_options,
420
old_label='a/', new_label='b/', extra_trees=None):
422
# GNU Patch uses the epoch date to detect files that are being added
423
# or removed in a diff.
424
EPOCH_DATE = '1970-01-01 00:00:00 +0000'
426
# TODO: Generation of pseudo-diffs for added/deleted files could
427
# be usefully made into a much faster special case.
429
if external_diff_options:
430
assert isinstance(external_diff_options, basestring)
431
opts = external_diff_options.split()
432
def diff_file(olab, olines, nlab, nlines, to_file):
433
external_diff(olab, olines, nlab, nlines, to_file, opts)
435
diff_file = internal_diff
437
delta = new_tree.changes_from(old_tree,
438
specific_files=specific_files,
439
extra_trees=extra_trees, require_versioned=True)
442
for path, file_id, kind in delta.removed:
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)
450
for path, file_id, kind in delta.added:
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))
484
_maybe_diff_file_or_symlink(old_name, old_tree, file_id,
486
True, kind, to_file, diff_file)
491
439
def _patch_header_date(tree, file_id, path):
492
440
"""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)
441
mtime = tree.get_file_mtime(file_id, path)
442
return timestamp.format_patch_date(mtime)
497
445
def _raise_if_nonexistent(paths, old_tree, new_tree):
513
461
raise errors.PathsDoNotExist(sorted(s))
464
@deprecated_function(one_three)
516
465
def get_prop_change(meta_modified):
517
466
if meta_modified:
518
467
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,
471
def get_executable_change(old_is_x, new_is_x):
472
descr = { True:"+x", False:"-x", None:"??" }
473
if old_is_x != new_is_x:
474
return ["%s to %s" % (descr[old_is_x], descr[new_is_x],)]
479
class DiffPath(object):
480
"""Base type for command object that compare files"""
482
# The type or contents of the file were unsuitable for diffing
483
CANNOT_DIFF = 'CANNOT_DIFF'
484
# The file has changed in a semantic way
486
# The file content may have changed, but there is no semantic change
487
UNCHANGED = 'UNCHANGED'
489
def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8'):
492
:param old_tree: The tree to show as the old tree in the comparison
493
:param new_tree: The tree to show as new in the comparison
494
:param to_file: The file to write comparison data to
495
:param path_encoding: The character encoding to write paths in
497
self.old_tree = old_tree
498
self.new_tree = new_tree
499
self.to_file = to_file
500
self.path_encoding = path_encoding
506
def from_diff_tree(klass, diff_tree):
507
return klass(diff_tree.old_tree, diff_tree.new_tree,
508
diff_tree.to_file, diff_tree.path_encoding)
511
def _diff_many(differs, file_id, old_path, new_path, old_kind, new_kind):
512
for file_differ in differs:
513
result = file_differ.diff(file_id, old_path, new_path, old_kind,
515
if result is not DiffPath.CANNOT_DIFF:
518
return DiffPath.CANNOT_DIFF
521
class DiffKindChange(object):
522
"""Special differ for file kind changes.
524
Represents kind change as deletion + creation. Uses the other differs
527
def __init__(self, differs):
528
self.differs = differs
534
def from_diff_tree(klass, diff_tree):
535
return klass(diff_tree.differs)
537
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
538
"""Perform comparison
540
:param file_id: The file_id of the file to compare
541
:param old_path: Path of the file in the old tree
542
:param new_path: Path of the file in the new tree
543
:param old_kind: Old file-kind of the file
544
:param new_kind: New file-kind of the file
546
if None in (old_kind, new_kind):
547
return DiffPath.CANNOT_DIFF
548
result = DiffPath._diff_many(self.differs, file_id, old_path,
549
new_path, old_kind, None)
550
if result is DiffPath.CANNOT_DIFF:
552
return DiffPath._diff_many(self.differs, file_id, old_path, new_path,
556
class DiffDirectory(DiffPath):
558
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
559
"""Perform comparison between two directories. (dummy)
562
if 'directory' not in (old_kind, new_kind):
563
return self.CANNOT_DIFF
564
if old_kind not in ('directory', None):
565
return self.CANNOT_DIFF
566
if new_kind not in ('directory', None):
567
return self.CANNOT_DIFF
571
class DiffSymlink(DiffPath):
573
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
574
"""Perform comparison between two symlinks
576
:param file_id: The file_id of the file to compare
577
:param old_path: Path of the file in the old tree
578
:param new_path: Path of the file in the new tree
579
:param old_kind: Old file-kind of the file
580
:param new_kind: New file-kind of the file
582
if 'symlink' not in (old_kind, new_kind):
583
return self.CANNOT_DIFF
584
if old_kind == 'symlink':
585
old_target = self.old_tree.get_symlink_target(file_id)
586
elif old_kind is None:
589
return self.CANNOT_DIFF
590
if new_kind == 'symlink':
591
new_target = self.new_tree.get_symlink_target(file_id)
592
elif new_kind is None:
595
return self.CANNOT_DIFF
596
return self.diff_symlink(old_target, new_target)
598
def diff_symlink(self, old_target, new_target):
599
if old_target is None:
600
self.to_file.write('=== target is %r\n' % new_target)
601
elif new_target is None:
602
self.to_file.write('=== target was %r\n' % old_target)
604
self.to_file.write('=== target changed %r => %r\n' %
605
(old_target, new_target))
609
class DiffText(DiffPath):
611
# GNU Patch uses the epoch date to detect files that are being added
612
# or removed in a diff.
613
EPOCH_DATE = '1970-01-01 00:00:00 +0000'
615
def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
616
old_label='', new_label='', text_differ=internal_diff):
617
DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
618
self.text_differ = text_differ
619
self.old_label = old_label
620
self.new_label = new_label
621
self.path_encoding = path_encoding
623
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
624
"""Compare two files in unified diff format
626
:param file_id: The file_id of the file to compare
627
:param old_path: Path of the file in the old tree
628
:param new_path: Path of the file in the new tree
629
:param old_kind: Old file-kind of the file
630
:param new_kind: New file-kind of the file
632
if 'file' not in (old_kind, new_kind):
633
return self.CANNOT_DIFF
634
from_file_id = to_file_id = file_id
635
if old_kind == 'file':
636
old_date = _patch_header_date(self.old_tree, file_id, old_path)
637
elif old_kind is None:
638
old_date = self.EPOCH_DATE
641
return self.CANNOT_DIFF
642
if new_kind == 'file':
643
new_date = _patch_header_date(self.new_tree, file_id, new_path)
644
elif new_kind is None:
645
new_date = self.EPOCH_DATE
648
return self.CANNOT_DIFF
649
from_label = '%s%s\t%s' % (self.old_label, old_path, old_date)
650
to_label = '%s%s\t%s' % (self.new_label, new_path, new_date)
651
return self.diff_text(from_file_id, to_file_id, from_label, to_label)
653
def diff_text(self, from_file_id, to_file_id, from_label, to_label):
654
"""Diff the content of given files in two trees
656
:param from_file_id: The id of the file in the from tree. If None,
657
the file is not present in the from tree.
658
:param to_file_id: The id of the file in the to tree. This may refer
659
to a different file from from_file_id. If None,
660
the file is not present in the to tree.
662
def _get_text(tree, file_id):
663
if file_id is not None:
664
return tree.get_file(file_id).readlines()
668
from_text = _get_text(self.old_tree, from_file_id)
669
to_text = _get_text(self.new_tree, to_file_id)
670
self.text_differ(from_label, from_text, to_label, to_text,
672
except errors.BinaryFile:
674
("Binary files %s and %s differ\n" %
675
(from_label, to_label)).encode(self.path_encoding))
679
class DiffFromTool(DiffPath):
681
def __init__(self, command_template, old_tree, new_tree, to_file,
682
path_encoding='utf-8'):
683
DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
684
self.command_template = command_template
685
self._root = osutils.mkdtemp(prefix='bzr-diff-')
688
def from_string(klass, command_string, old_tree, new_tree, to_file,
689
path_encoding='utf-8'):
690
command_template = commands.shlex_split_unicode(command_string)
691
command_template.extend(['%(old_path)s', '%(new_path)s'])
692
return klass(command_template, old_tree, new_tree, to_file,
696
def make_from_diff_tree(klass, command_string):
697
def from_diff_tree(diff_tree):
698
return klass.from_string(command_string, diff_tree.old_tree,
699
diff_tree.new_tree, diff_tree.to_file)
700
return from_diff_tree
702
def _get_command(self, old_path, new_path):
703
my_map = {'old_path': old_path, 'new_path': new_path}
704
return [t % my_map for t in self.command_template]
706
def _execute(self, old_path, new_path):
707
command = self._get_command(old_path, new_path)
709
proc = subprocess.Popen(command, stdout=subprocess.PIPE,
712
if e.errno == errno.ENOENT:
713
raise errors.ExecutableMissing(command[0])
716
self.to_file.write(proc.stdout.read())
719
def _try_symlink_root(self, tree, prefix):
720
if (getattr(tree, 'abspath', None) is None
721
or not osutils.host_os_dereferences_symlinks()):
724
os.symlink(tree.abspath(''), osutils.pathjoin(self._root, prefix))
726
if e.errno != errno.EEXIST:
730
def _write_file(self, file_id, tree, prefix, relpath):
731
full_path = osutils.pathjoin(self._root, prefix, relpath)
732
if self._try_symlink_root(tree, prefix):
734
parent_dir = osutils.dirname(full_path)
736
os.makedirs(parent_dir)
738
if e.errno != errno.EEXIST:
740
source = tree.get_file(file_id, relpath)
742
target = open(full_path, 'wb')
744
osutils.pumpfile(source, target)
749
osutils.make_readonly(full_path)
750
mtime = tree.get_file_mtime(file_id)
751
os.utime(full_path, (mtime, mtime))
754
def _prepare_files(self, file_id, old_path, new_path):
755
old_disk_path = self._write_file(file_id, self.old_tree, 'old',
757
new_disk_path = self._write_file(file_id, self.new_tree, 'new',
759
return old_disk_path, new_disk_path
762
osutils.rmtree(self._root)
764
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
765
if (old_kind, new_kind) != ('file', 'file'):
766
return DiffPath.CANNOT_DIFF
767
self._prepare_files(file_id, old_path, new_path)
768
self._execute(osutils.pathjoin('old', old_path),
769
osutils.pathjoin('new', new_path))
772
class DiffTree(object):
773
"""Provides textual representations of the difference between two trees.
775
A DiffTree examines two trees and where a file-id has altered
776
between them, generates a textual representation of the difference.
777
DiffTree uses a sequence of DiffPath objects which are each
778
given the opportunity to handle a given altered fileid. The list
779
of DiffPath objects can be extended globally by appending to
780
DiffTree.diff_factories, or for a specific diff operation by
781
supplying the extra_factories option to the appropriate method.
784
# list of factories that can provide instances of DiffPath objects
785
# may be extended by plugins.
786
diff_factories = [DiffSymlink.from_diff_tree,
787
DiffDirectory.from_diff_tree]
789
def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
790
diff_text=None, extra_factories=None):
793
:param old_tree: Tree to show as old in the comparison
794
:param new_tree: Tree to show as new in the comparison
795
:param to_file: File to write comparision to
796
:param path_encoding: Character encoding to write paths in
797
:param diff_text: DiffPath-type object to use as a last resort for
799
:param extra_factories: Factories of DiffPaths to try before any other
801
if diff_text is None:
802
diff_text = DiffText(old_tree, new_tree, to_file, path_encoding,
803
'', '', internal_diff)
804
self.old_tree = old_tree
805
self.new_tree = new_tree
806
self.to_file = to_file
807
self.path_encoding = path_encoding
809
if extra_factories is not None:
810
self.differs.extend(f(self) for f in extra_factories)
811
self.differs.extend(f(self) for f in self.diff_factories)
812
self.differs.extend([diff_text, DiffKindChange.from_diff_tree(self)])
815
def from_trees_options(klass, old_tree, new_tree, to_file,
816
path_encoding, external_diff_options, old_label,
818
"""Factory for producing a DiffTree.
820
Designed to accept options used by show_diff_trees.
821
:param old_tree: The tree to show as old in the comparison
822
:param new_tree: The tree to show as new in the comparison
823
:param to_file: File to write comparisons to
824
:param path_encoding: Character encoding to use for writing paths
825
:param external_diff_options: If supplied, use the installed diff
826
binary to perform file comparison, using supplied options.
827
:param old_label: Prefix to use for old file labels
828
:param new_label: Prefix to use for new file labels
829
:param using: Commandline to use to invoke an external diff tool
831
if using is not None:
832
extra_factories = [DiffFromTool.make_from_diff_tree(using)]
835
if external_diff_options:
836
opts = external_diff_options.split()
837
def diff_file(olab, olines, nlab, nlines, to_file):
838
external_diff(olab, olines, nlab, nlines, to_file, opts)
840
diff_file = internal_diff
841
diff_text = DiffText(old_tree, new_tree, to_file, path_encoding,
842
old_label, new_label, diff_file)
843
return klass(old_tree, new_tree, to_file, path_encoding, diff_text,
846
def show_diff(self, specific_files, extra_trees=None):
847
"""Write tree diff to self.to_file
849
:param sepecific_files: the specific files to compare (recursive)
850
:param extra_trees: extra trees to use for mapping paths to file_ids
853
return self._show_diff(specific_files, extra_trees)
855
for differ in self.differs:
858
def _show_diff(self, specific_files, extra_trees):
859
# TODO: Generation of pseudo-diffs for added/deleted files could
860
# be usefully made into a much faster special case.
861
iterator = self.new_tree.iter_changes(self.old_tree,
862
specific_files=specific_files,
863
extra_trees=extra_trees,
864
require_versioned=True)
866
def changes_key(change):
867
old_path, new_path = change[1]
872
def get_encoded_path(path):
874
return path.encode(self.path_encoding, "replace")
875
for (file_id, paths, changed_content, versioned, parent, name, kind,
876
executable) in sorted(iterator, key=changes_key):
877
# The root does not get diffed, and items with no known kind (that
878
# is, missing) in both trees are skipped as well.
879
if parent == (None, None) or kind == (None, None):
881
oldpath, newpath = paths
882
oldpath_encoded = get_encoded_path(paths[0])
883
newpath_encoded = get_encoded_path(paths[1])
884
old_present = (kind[0] is not None and versioned[0])
885
new_present = (kind[1] is not None and versioned[1])
886
renamed = (parent[0], name[0]) != (parent[1], name[1])
888
properties_changed = []
889
properties_changed.extend(get_executable_change(executable[0], executable[1]))
891
if properties_changed:
892
prop_str = " (properties changed: %s)" % (", ".join(properties_changed),)
896
if (old_present, new_present) == (True, False):
897
self.to_file.write("=== removed %s '%s'\n" %
898
(kind[0], oldpath_encoded))
900
elif (old_present, new_present) == (False, True):
901
self.to_file.write("=== added %s '%s'\n" %
902
(kind[1], newpath_encoded))
905
self.to_file.write("=== renamed %s '%s' => '%s'%s\n" %
906
(kind[0], oldpath_encoded, newpath_encoded, prop_str))
908
# if it was produced by iter_changes, it must be
909
# modified *somehow*, either content or execute bit.
910
self.to_file.write("=== modified %s '%s'%s\n" % (kind[0],
911
newpath_encoded, prop_str))
913
self.diff(file_id, oldpath, newpath)
919
def diff(self, file_id, old_path, new_path):
920
"""Perform a diff of a single file
922
:param file_id: file-id of the file
923
:param old_path: The path of the file in the old tree
924
:param new_path: The path of the file in the new tree
927
old_kind = self.old_tree.kind(file_id)
928
except (errors.NoSuchId, errors.NoSuchFile):
931
new_kind = self.new_tree.kind(file_id)
932
except (errors.NoSuchId, errors.NoSuchFile):
935
result = DiffPath._diff_many(self.differs, file_id, old_path,
936
new_path, old_kind, new_kind)
937
if result is DiffPath.CANNOT_DIFF:
938
error_path = new_path
939
if error_path is None:
940
error_path = old_path
941
raise errors.NoDiffFound(error_path)
added
removed
bzrlib/diff.py
