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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23
from bzrlib.lazy_import import lazy_import
24
lazy_import(globals(), """
31
branch as _mod_branch,
43
from bzrlib.symbol_versioning import (
46
from bzrlib.trace import mutter, note, warning
49
# TODO: Rather than building a changeset object, we should probably
50
# invoke callbacks on an object. That object can either accumulate a
51
# list, write them out directly, etc etc.
54
class _PrematchedMatcher(difflib.SequenceMatcher):
55
"""Allow SequenceMatcher operations to use predetermined blocks"""
57
def __init__(self, matching_blocks):
58
difflib.SequenceMatcher(self, None, None)
59
self.matching_blocks = matching_blocks
63
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file,
64
allow_binary=False, sequence_matcher=None,
65
path_encoding='utf8'):
66
# FIXME: difflib is wrong if there is no trailing newline.
67
# The syntax used by patch seems to be "\ No newline at
68
# end of file" following the last diff line from that
69
# file. This is not trivial to insert into the
70
# unified_diff output and it might be better to just fix
71
# or replace that function.
73
# In the meantime we at least make sure the patch isn't
77
# Special workaround for Python2.3, where difflib fails if
78
# both sequences are empty.
79
if not oldlines and not newlines:
82
if allow_binary is False:
83
textfile.check_text_lines(oldlines)
84
textfile.check_text_lines(newlines)
86
if sequence_matcher is None:
87
sequence_matcher = patiencediff.PatienceSequenceMatcher
88
ud = patiencediff.unified_diff(oldlines, newlines,
89
fromfile=old_filename.encode(path_encoding),
90
tofile=new_filename.encode(path_encoding),
91
sequencematcher=sequence_matcher)
94
if len(ud) == 0: # Identical contents, nothing to do
96
# work-around for difflib being too smart for its own good
97
# if /dev/null is "1,0", patch won't recognize it as /dev/null
99
ud[2] = ud[2].replace('-1,0', '-0,0')
101
ud[2] = ud[2].replace('+1,0', '+0,0')
105
if not line.endswith('\n'):
106
to_file.write("\n\\ No newline at end of file\n")
110
def _spawn_external_diff(diffcmd, capture_errors=True):
111
"""Spawn the externall diff process, and return the child handle.
113
:param diffcmd: The command list to spawn
114
:param capture_errors: Capture stderr as well as setting LANG=C
115
and LC_ALL=C. This lets us read and understand the output of diff,
116
and respond to any errors.
117
:return: A Popen object.
120
# construct minimal environment
122
path = os.environ.get('PATH')
125
env['LANGUAGE'] = 'C' # on win32 only LANGUAGE has effect
128
stderr = subprocess.PIPE
134
pipe = subprocess.Popen(diffcmd,
135
stdin=subprocess.PIPE,
136
stdout=subprocess.PIPE,
140
if e.errno == errno.ENOENT:
141
raise errors.NoDiff(str(e))
147
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
149
"""Display a diff by calling out to the external diff program."""
150
# make sure our own output is properly ordered before the diff
153
oldtmp_fd, old_abspath = tempfile.mkstemp(prefix='bzr-diff-old-')
154
newtmp_fd, new_abspath = tempfile.mkstemp(prefix='bzr-diff-new-')
155
oldtmpf = os.fdopen(oldtmp_fd, 'wb')
156
newtmpf = os.fdopen(newtmp_fd, 'wb')
159
# TODO: perhaps a special case for comparing to or from the empty
160
# sequence; can just use /dev/null on Unix
162
# TODO: if either of the files being compared already exists as a
163
# regular named file (e.g. in the working directory) then we can
164
# compare directly to that, rather than copying it.
166
oldtmpf.writelines(oldlines)
167
newtmpf.writelines(newlines)
175
'--label', old_filename,
177
'--label', new_filename,
182
# diff only allows one style to be specified; they don't override.
183
# note that some of these take optargs, and the optargs can be
184
# directly appended to the options.
185
# this is only an approximate parser; it doesn't properly understand
187
for s in ['-c', '-u', '-C', '-U',
192
'-y', '--side-by-side',
204
diffcmd.extend(diff_opts)
206
pipe = _spawn_external_diff(diffcmd, capture_errors=True)
207
out,err = pipe.communicate()
210
# internal_diff() adds a trailing newline, add one here for consistency
213
# 'diff' gives retcode == 2 for all sorts of errors
214
# one of those is 'Binary files differ'.
215
# Bad options could also be the problem.
216
# 'Binary files' is not a real error, so we suppress that error.
219
# Since we got here, we want to make sure to give an i18n error
220
pipe = _spawn_external_diff(diffcmd, capture_errors=False)
221
out, err = pipe.communicate()
223
# Write out the new i18n diff response
224
to_file.write(out+'\n')
225
if pipe.returncode != 2:
226
raise errors.BzrError(
227
'external diff failed with exit code 2'
228
' when run with LANG=C and LC_ALL=C,'
229
' but not when run natively: %r' % (diffcmd,))
231
first_line = lang_c_out.split('\n', 1)[0]
232
# Starting with diffutils 2.8.4 the word "binary" was dropped.
233
m = re.match('^(binary )?files.*differ$', first_line, re.I)
235
raise errors.BzrError('external diff failed with exit code 2;'
236
' command: %r' % (diffcmd,))
238
# Binary files differ, just return
241
# If we got to here, we haven't written out the output of diff
245
# returns 1 if files differ; that's OK
247
msg = 'signal %d' % (-rc)
249
msg = 'exit code %d' % rc
251
raise errors.BzrError('external diff failed with %s; command: %r'
256
oldtmpf.close() # and delete
258
# Clean up. Warn in case the files couldn't be deleted
259
# (in case windows still holds the file open, but not
260
# if the files have already been deleted)
262
os.remove(old_abspath)
264
if e.errno not in (errno.ENOENT,):
265
warning('Failed to delete temporary file: %s %s',
268
os.remove(new_abspath)
270
if e.errno not in (errno.ENOENT,):
271
warning('Failed to delete temporary file: %s %s',
275
def _get_trees_to_diff(path_list, revision_specs, old_url, new_url,
277
"""Get the trees and specific files to diff given a list of paths.
279
This method works out the trees to be diff'ed and the files of
280
interest within those trees.
283
the list of arguments passed to the diff command
284
:param revision_specs:
285
Zero, one or two RevisionSpecs from the diff command line,
286
saying what revisions to compare.
288
The url of the old branch or tree. If None, the tree to use is
289
taken from the first path, if any, or the current working tree.
291
The url of the new branch or tree. If None, the tree to use is
292
taken from the first path, if any, or the current working tree.
294
if True and a view is set, apply the view or check that the paths
297
a tuple of (old_tree, new_tree, specific_files, extra_trees) where
298
extra_trees is a sequence of additional trees to search in for
301
# Get the old and new revision specs
302
old_revision_spec = None
303
new_revision_spec = None
304
if revision_specs is not None:
305
if len(revision_specs) > 0:
306
old_revision_spec = revision_specs[0]
308
old_url = old_revision_spec.get_branch()
309
if len(revision_specs) > 1:
310
new_revision_spec = revision_specs[1]
312
new_url = new_revision_spec.get_branch()
315
make_paths_wt_relative = True
316
consider_relpath = True
317
if path_list is None or len(path_list) == 0:
318
# If no path is given, the current working tree is used
319
default_location = u'.'
320
consider_relpath = False
321
elif old_url is not None and new_url is not None:
322
other_paths = path_list
323
make_paths_wt_relative = False
325
default_location = path_list[0]
326
other_paths = path_list[1:]
328
# Get the old location
331
old_url = default_location
332
working_tree, branch, relpath = \
333
bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
334
if consider_relpath and relpath != '':
335
if working_tree is not None and apply_view:
336
views.check_path_in_view(working_tree, relpath)
337
specific_files.append(relpath)
338
old_tree = _get_tree_to_diff(old_revision_spec, working_tree, branch)
340
# Get the new location
342
new_url = default_location
343
if new_url != old_url:
344
working_tree, branch, relpath = \
345
bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
346
if consider_relpath and relpath != '':
347
if working_tree is not None and apply_view:
348
views.check_path_in_view(working_tree, relpath)
349
specific_files.append(relpath)
350
new_tree = _get_tree_to_diff(new_revision_spec, working_tree, branch,
351
basis_is_default=working_tree is None)
353
# Get the specific files (all files is None, no files is [])
354
if make_paths_wt_relative and working_tree is not None:
356
from bzrlib.builtins import safe_relpath_files
357
other_paths = safe_relpath_files(working_tree, other_paths,
358
apply_view=apply_view)
359
except errors.FileInWrongBranch:
360
raise errors.BzrCommandError("Files are in different branches")
361
specific_files.extend(other_paths)
362
if len(specific_files) == 0:
363
specific_files = None
364
if (working_tree is not None and working_tree.supports_views()
366
view_files = working_tree.views.lookup_view()
368
specific_files = view_files
369
view_str = views.view_display_str(view_files)
370
note("*** Ignoring files outside view. View is %s" % view_str)
372
# Get extra trees that ought to be searched for file-ids
374
if working_tree is not None and working_tree not in (old_tree, new_tree):
375
extra_trees = (working_tree,)
376
return old_tree, new_tree, specific_files, extra_trees
378
def _get_tree_to_diff(spec, tree=None, branch=None, basis_is_default=True):
379
if branch is None and tree is not None:
381
if spec is None or spec.spec is None:
384
return tree.basis_tree()
386
return branch.basis_tree()
389
return spec.as_tree(branch)
392
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
393
external_diff_options=None,
394
old_label='a/', new_label='b/',
396
path_encoding='utf8',
398
"""Show in text form the changes from one tree to another.
404
Include only changes to these files - None for all changes.
406
external_diff_options
407
If set, use an external GNU diff and pass these options.
410
If set, more Trees to use for looking up file ids
413
If set, the path will be encoded as specified, otherwise is supposed
418
if extra_trees is not None:
419
for tree in extra_trees:
423
differ = DiffTree.from_trees_options(old_tree, new_tree, to_file,
425
external_diff_options,
426
old_label, new_label, using)
427
return differ.show_diff(specific_files, extra_trees)
430
if extra_trees is not None:
431
for tree in extra_trees:
437
def _patch_header_date(tree, file_id, path):
438
"""Returns a timestamp suitable for use in a patch header."""
439
mtime = tree.get_file_mtime(file_id, path)
440
return timestamp.format_patch_date(mtime)
443
def get_executable_change(old_is_x, new_is_x):
444
descr = { True:"+x", False:"-x", None:"??" }
445
if old_is_x != new_is_x:
446
return ["%s to %s" % (descr[old_is_x], descr[new_is_x],)]
451
class DiffPath(object):
452
"""Base type for command object that compare files"""
454
# The type or contents of the file were unsuitable for diffing
455
CANNOT_DIFF = 'CANNOT_DIFF'
456
# The file has changed in a semantic way
458
# The file content may have changed, but there is no semantic change
459
UNCHANGED = 'UNCHANGED'
461
def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8'):
464
:param old_tree: The tree to show as the old tree in the comparison
465
:param new_tree: The tree to show as new in the comparison
466
:param to_file: The file to write comparison data to
467
:param path_encoding: The character encoding to write paths in
469
self.old_tree = old_tree
470
self.new_tree = new_tree
471
self.to_file = to_file
472
self.path_encoding = path_encoding
478
def from_diff_tree(klass, diff_tree):
479
return klass(diff_tree.old_tree, diff_tree.new_tree,
480
diff_tree.to_file, diff_tree.path_encoding)
483
def _diff_many(differs, file_id, old_path, new_path, old_kind, new_kind):
484
for file_differ in differs:
485
result = file_differ.diff(file_id, old_path, new_path, old_kind,
487
if result is not DiffPath.CANNOT_DIFF:
490
return DiffPath.CANNOT_DIFF
493
class DiffKindChange(object):
494
"""Special differ for file kind changes.
496
Represents kind change as deletion + creation. Uses the other differs
499
def __init__(self, differs):
500
self.differs = differs
506
def from_diff_tree(klass, diff_tree):
507
return klass(diff_tree.differs)
509
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
510
"""Perform comparison
512
:param file_id: The file_id of the file to compare
513
:param old_path: Path of the file in the old tree
514
:param new_path: Path of the file in the new tree
515
:param old_kind: Old file-kind of the file
516
:param new_kind: New file-kind of the file
518
if None in (old_kind, new_kind):
519
return DiffPath.CANNOT_DIFF
520
result = DiffPath._diff_many(self.differs, file_id, old_path,
521
new_path, old_kind, None)
522
if result is DiffPath.CANNOT_DIFF:
524
return DiffPath._diff_many(self.differs, file_id, old_path, new_path,
528
class DiffDirectory(DiffPath):
530
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
531
"""Perform comparison between two directories. (dummy)
534
if 'directory' not in (old_kind, new_kind):
535
return self.CANNOT_DIFF
536
if old_kind not in ('directory', None):
537
return self.CANNOT_DIFF
538
if new_kind not in ('directory', None):
539
return self.CANNOT_DIFF
543
class DiffSymlink(DiffPath):
545
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
546
"""Perform comparison between two symlinks
548
:param file_id: The file_id of the file to compare
549
:param old_path: Path of the file in the old tree
550
:param new_path: Path of the file in the new tree
551
:param old_kind: Old file-kind of the file
552
:param new_kind: New file-kind of the file
554
if 'symlink' not in (old_kind, new_kind):
555
return self.CANNOT_DIFF
556
if old_kind == 'symlink':
557
old_target = self.old_tree.get_symlink_target(file_id)
558
elif old_kind is None:
561
return self.CANNOT_DIFF
562
if new_kind == 'symlink':
563
new_target = self.new_tree.get_symlink_target(file_id)
564
elif new_kind is None:
567
return self.CANNOT_DIFF
568
return self.diff_symlink(old_target, new_target)
570
def diff_symlink(self, old_target, new_target):
571
if old_target is None:
572
self.to_file.write('=== target is %r\n' % new_target)
573
elif new_target is None:
574
self.to_file.write('=== target was %r\n' % old_target)
576
self.to_file.write('=== target changed %r => %r\n' %
577
(old_target, new_target))
581
class DiffText(DiffPath):
583
# GNU Patch uses the epoch date to detect files that are being added
584
# or removed in a diff.
585
EPOCH_DATE = '1970-01-01 00:00:00 +0000'
587
def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
588
old_label='', new_label='', text_differ=internal_diff):
589
DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
590
self.text_differ = text_differ
591
self.old_label = old_label
592
self.new_label = new_label
593
self.path_encoding = path_encoding
595
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
596
"""Compare two files in unified diff format
598
:param file_id: The file_id of the file to compare
599
:param old_path: Path of the file in the old tree
600
:param new_path: Path of the file in the new tree
601
:param old_kind: Old file-kind of the file
602
:param new_kind: New file-kind of the file
604
if 'file' not in (old_kind, new_kind):
605
return self.CANNOT_DIFF
606
from_file_id = to_file_id = file_id
607
if old_kind == 'file':
608
old_date = _patch_header_date(self.old_tree, file_id, old_path)
609
elif old_kind is None:
610
old_date = self.EPOCH_DATE
613
return self.CANNOT_DIFF
614
if new_kind == 'file':
615
new_date = _patch_header_date(self.new_tree, file_id, new_path)
616
elif new_kind is None:
617
new_date = self.EPOCH_DATE
620
return self.CANNOT_DIFF
621
from_label = '%s%s\t%s' % (self.old_label, old_path, old_date)
622
to_label = '%s%s\t%s' % (self.new_label, new_path, new_date)
623
return self.diff_text(from_file_id, to_file_id, from_label, to_label,
626
def diff_text(self, from_file_id, to_file_id, from_label, to_label,
627
from_path=None, to_path=None):
628
"""Diff the content of given files in two trees
630
:param from_file_id: The id of the file in the from tree. If None,
631
the file is not present in the from tree.
632
:param to_file_id: The id of the file in the to tree. This may refer
633
to a different file from from_file_id. If None,
634
the file is not present in the to tree.
635
:param from_path: The path in the from tree or None if unknown.
636
:param to_path: The path in the to tree or None if unknown.
638
def _get_text(tree, file_id, path):
639
if file_id is not None:
640
return tree.get_file(file_id, path).readlines()
644
from_text = _get_text(self.old_tree, from_file_id, from_path)
645
to_text = _get_text(self.new_tree, to_file_id, to_path)
646
self.text_differ(from_label, from_text, to_label, to_text,
648
except errors.BinaryFile:
650
("Binary files %s and %s differ\n" %
651
(from_label, to_label)).encode(self.path_encoding))
655
class DiffFromTool(DiffPath):
657
def __init__(self, command_template, old_tree, new_tree, to_file,
658
path_encoding='utf-8'):
659
DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
660
self.command_template = command_template
661
self._root = osutils.mkdtemp(prefix='bzr-diff-')
664
def from_string(klass, command_string, old_tree, new_tree, to_file,
665
path_encoding='utf-8'):
666
command_template = commands.shlex_split_unicode(command_string)
667
command_template.extend(['%(old_path)s', '%(new_path)s'])
668
return klass(command_template, old_tree, new_tree, to_file,
672
def make_from_diff_tree(klass, command_string):
673
def from_diff_tree(diff_tree):
674
return klass.from_string(command_string, diff_tree.old_tree,
675
diff_tree.new_tree, diff_tree.to_file)
676
return from_diff_tree
678
def _get_command(self, old_path, new_path):
679
my_map = {'old_path': old_path, 'new_path': new_path}
680
return [t % my_map for t in self.command_template]
682
def _execute(self, old_path, new_path):
683
command = self._get_command(old_path, new_path)
685
proc = subprocess.Popen(command, stdout=subprocess.PIPE,
688
if e.errno == errno.ENOENT:
689
raise errors.ExecutableMissing(command[0])
692
self.to_file.write(proc.stdout.read())
695
def _try_symlink_root(self, tree, prefix):
696
if (getattr(tree, 'abspath', None) is None
697
or not osutils.host_os_dereferences_symlinks()):
700
os.symlink(tree.abspath(''), osutils.pathjoin(self._root, prefix))
702
if e.errno != errno.EEXIST:
706
def _write_file(self, file_id, tree, prefix, relpath):
707
full_path = osutils.pathjoin(self._root, prefix, relpath)
708
if self._try_symlink_root(tree, prefix):
710
parent_dir = osutils.dirname(full_path)
712
os.makedirs(parent_dir)
714
if e.errno != errno.EEXIST:
716
source = tree.get_file(file_id, relpath)
718
target = open(full_path, 'wb')
720
osutils.pumpfile(source, target)
725
osutils.make_readonly(full_path)
726
mtime = tree.get_file_mtime(file_id)
727
os.utime(full_path, (mtime, mtime))
730
def _prepare_files(self, file_id, old_path, new_path):
731
old_disk_path = self._write_file(file_id, self.old_tree, 'old',
733
new_disk_path = self._write_file(file_id, self.new_tree, 'new',
735
return old_disk_path, new_disk_path
738
osutils.rmtree(self._root)
740
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
741
if (old_kind, new_kind) != ('file', 'file'):
742
return DiffPath.CANNOT_DIFF
743
self._prepare_files(file_id, old_path, new_path)
744
self._execute(osutils.pathjoin('old', old_path),
745
osutils.pathjoin('new', new_path))
748
class DiffTree(object):
749
"""Provides textual representations of the difference between two trees.
751
A DiffTree examines two trees and where a file-id has altered
752
between them, generates a textual representation of the difference.
753
DiffTree uses a sequence of DiffPath objects which are each
754
given the opportunity to handle a given altered fileid. The list
755
of DiffPath objects can be extended globally by appending to
756
DiffTree.diff_factories, or for a specific diff operation by
757
supplying the extra_factories option to the appropriate method.
760
# list of factories that can provide instances of DiffPath objects
761
# may be extended by plugins.
762
diff_factories = [DiffSymlink.from_diff_tree,
763
DiffDirectory.from_diff_tree]
765
def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
766
diff_text=None, extra_factories=None):
769
:param old_tree: Tree to show as old in the comparison
770
:param new_tree: Tree to show as new in the comparison
771
:param to_file: File to write comparision to
772
:param path_encoding: Character encoding to write paths in
773
:param diff_text: DiffPath-type object to use as a last resort for
775
:param extra_factories: Factories of DiffPaths to try before any other
777
if diff_text is None:
778
diff_text = DiffText(old_tree, new_tree, to_file, path_encoding,
779
'', '', internal_diff)
780
self.old_tree = old_tree
781
self.new_tree = new_tree
782
self.to_file = to_file
783
self.path_encoding = path_encoding
785
if extra_factories is not None:
786
self.differs.extend(f(self) for f in extra_factories)
787
self.differs.extend(f(self) for f in self.diff_factories)
788
self.differs.extend([diff_text, DiffKindChange.from_diff_tree(self)])
791
def from_trees_options(klass, old_tree, new_tree, to_file,
792
path_encoding, external_diff_options, old_label,
794
"""Factory for producing a DiffTree.
796
Designed to accept options used by show_diff_trees.
797
:param old_tree: The tree to show as old in the comparison
798
:param new_tree: The tree to show as new in the comparison
799
:param to_file: File to write comparisons to
800
:param path_encoding: Character encoding to use for writing paths
801
:param external_diff_options: If supplied, use the installed diff
802
binary to perform file comparison, using supplied options.
803
:param old_label: Prefix to use for old file labels
804
:param new_label: Prefix to use for new file labels
805
:param using: Commandline to use to invoke an external diff tool
807
if using is not None:
808
extra_factories = [DiffFromTool.make_from_diff_tree(using)]
811
if external_diff_options:
812
opts = external_diff_options.split()
813
def diff_file(olab, olines, nlab, nlines, to_file):
814
external_diff(olab, olines, nlab, nlines, to_file, opts)
816
diff_file = internal_diff
817
diff_text = DiffText(old_tree, new_tree, to_file, path_encoding,
818
old_label, new_label, diff_file)
819
return klass(old_tree, new_tree, to_file, path_encoding, diff_text,
822
def show_diff(self, specific_files, extra_trees=None):
823
"""Write tree diff to self.to_file
825
:param sepecific_files: the specific files to compare (recursive)
826
:param extra_trees: extra trees to use for mapping paths to file_ids
829
return self._show_diff(specific_files, extra_trees)
831
for differ in self.differs:
834
def _show_diff(self, specific_files, extra_trees):
835
# TODO: Generation of pseudo-diffs for added/deleted files could
836
# be usefully made into a much faster special case.
837
iterator = self.new_tree.iter_changes(self.old_tree,
838
specific_files=specific_files,
839
extra_trees=extra_trees,
840
require_versioned=True)
842
def changes_key(change):
843
old_path, new_path = change[1]
848
def get_encoded_path(path):
850
return path.encode(self.path_encoding, "replace")
851
for (file_id, paths, changed_content, versioned, parent, name, kind,
852
executable) in sorted(iterator, key=changes_key):
853
# The root does not get diffed, and items with no known kind (that
854
# is, missing) in both trees are skipped as well.
855
if parent == (None, None) or kind == (None, None):
857
oldpath, newpath = paths
858
oldpath_encoded = get_encoded_path(paths[0])
859
newpath_encoded = get_encoded_path(paths[1])
860
old_present = (kind[0] is not None and versioned[0])
861
new_present = (kind[1] is not None and versioned[1])
862
renamed = (parent[0], name[0]) != (parent[1], name[1])
864
properties_changed = []
865
properties_changed.extend(get_executable_change(executable[0], executable[1]))
867
if properties_changed:
868
prop_str = " (properties changed: %s)" % (", ".join(properties_changed),)
872
if (old_present, new_present) == (True, False):
873
self.to_file.write("=== removed %s '%s'\n" %
874
(kind[0], oldpath_encoded))
876
elif (old_present, new_present) == (False, True):
877
self.to_file.write("=== added %s '%s'\n" %
878
(kind[1], newpath_encoded))
881
self.to_file.write("=== renamed %s '%s' => '%s'%s\n" %
882
(kind[0], oldpath_encoded, newpath_encoded, prop_str))
884
# if it was produced by iter_changes, it must be
885
# modified *somehow*, either content or execute bit.
886
self.to_file.write("=== modified %s '%s'%s\n" % (kind[0],
887
newpath_encoded, prop_str))
889
self._diff(file_id, oldpath, newpath, kind[0], kind[1])
895
def diff(self, file_id, old_path, new_path):
896
"""Perform a diff of a single file
898
:param file_id: file-id of the file
899
:param old_path: The path of the file in the old tree
900
:param new_path: The path of the file in the new tree
903
old_kind = self.old_tree.kind(file_id)
904
except (errors.NoSuchId, errors.NoSuchFile):
907
new_kind = self.new_tree.kind(file_id)
908
except (errors.NoSuchId, errors.NoSuchFile):
910
self._diff(file_id, old_path, new_path, old_kind, new_kind)
913
def _diff(self, file_id, old_path, new_path, old_kind, new_kind):
914
result = DiffPath._diff_many(self.differs, file_id, old_path,
915
new_path, old_kind, new_kind)
916
if result is DiffPath.CANNOT_DIFF:
917
error_path = new_path
918
if error_path is None:
919
error_path = old_path
920
raise errors.NoDiffFound(error_path)
added
removed
bzrlib/diff.py
