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
23
from bzrlib.lazy_import import lazy_import
24
lazy_import(globals(), """
31
branch as _mod_branch,
43
from bzrlib.symbol_versioning import (
47
from bzrlib.trace import mutter, note, warning
50
# TODO: Rather than building a changeset object, we should probably
51
# invoke callbacks on an object. That object can either accumulate a
52
# list, write them out directly, etc etc.
55
class _PrematchedMatcher(difflib.SequenceMatcher):
56
"""Allow SequenceMatcher operations to use predetermined blocks"""
58
def __init__(self, matching_blocks):
59
difflib.SequenceMatcher(self, None, None)
60
self.matching_blocks = matching_blocks
64
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file,
65
allow_binary=False, sequence_matcher=None,
66
path_encoding='utf8'):
67
# FIXME: difflib is wrong if there is no trailing newline.
68
# The syntax used by patch seems to be "\ No newline at
69
# end of file" following the last diff line from that
70
# file. This is not trivial to insert into the
71
# unified_diff output and it might be better to just fix
72
# or replace that function.
74
# In the meantime we at least make sure the patch isn't
78
# Special workaround for Python2.3, where difflib fails if
79
# both sequences are empty.
80
if not oldlines and not newlines:
83
if allow_binary is False:
84
textfile.check_text_lines(oldlines)
85
textfile.check_text_lines(newlines)
87
if sequence_matcher is None:
88
sequence_matcher = patiencediff.PatienceSequenceMatcher
89
ud = patiencediff.unified_diff(oldlines, newlines,
90
fromfile=old_filename.encode(path_encoding),
91
tofile=new_filename.encode(path_encoding),
92
sequencematcher=sequence_matcher)
95
if len(ud) == 0: # Identical contents, nothing to do
97
# work-around for difflib being too smart for its own good
98
# if /dev/null is "1,0", patch won't recognize it as /dev/null
100
ud[2] = ud[2].replace('-1,0', '-0,0')
102
ud[2] = ud[2].replace('+1,0', '+0,0')
106
if not line.endswith('\n'):
107
to_file.write("\n\\ No newline at end of file\n")
111
def _spawn_external_diff(diffcmd, capture_errors=True):
112
"""Spawn the externall diff process, and return the child handle.
114
:param diffcmd: The command list to spawn
115
:param capture_errors: Capture stderr as well as setting LANG=C
116
and LC_ALL=C. This lets us read and understand the output of diff,
117
and respond to any errors.
118
:return: A Popen object.
121
# construct minimal environment
123
path = os.environ.get('PATH')
126
env['LANGUAGE'] = 'C' # on win32 only LANGUAGE has effect
129
stderr = subprocess.PIPE
135
pipe = subprocess.Popen(diffcmd,
136
stdin=subprocess.PIPE,
137
stdout=subprocess.PIPE,
141
if e.errno == errno.ENOENT:
142
raise errors.NoDiff(str(e))
148
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
150
"""Display a diff by calling out to the external diff program."""
151
# make sure our own output is properly ordered before the diff
154
oldtmp_fd, old_abspath = tempfile.mkstemp(prefix='bzr-diff-old-')
155
newtmp_fd, new_abspath = tempfile.mkstemp(prefix='bzr-diff-new-')
156
oldtmpf = os.fdopen(oldtmp_fd, 'wb')
157
newtmpf = os.fdopen(newtmp_fd, 'wb')
160
# TODO: perhaps a special case for comparing to or from the empty
161
# sequence; can just use /dev/null on Unix
163
# TODO: if either of the files being compared already exists as a
164
# regular named file (e.g. in the working directory) then we can
165
# compare directly to that, rather than copying it.
167
oldtmpf.writelines(oldlines)
168
newtmpf.writelines(newlines)
176
'--label', old_filename,
178
'--label', new_filename,
183
# diff only allows one style to be specified; they don't override.
184
# note that some of these take optargs, and the optargs can be
185
# directly appended to the options.
186
# this is only an approximate parser; it doesn't properly understand
188
for s in ['-c', '-u', '-C', '-U',
193
'-y', '--side-by-side',
205
diffcmd.extend(diff_opts)
207
pipe = _spawn_external_diff(diffcmd, capture_errors=True)
208
out,err = pipe.communicate()
211
# internal_diff() adds a trailing newline, add one here for consistency
214
# 'diff' gives retcode == 2 for all sorts of errors
215
# one of those is 'Binary files differ'.
216
# Bad options could also be the problem.
217
# 'Binary files' is not a real error, so we suppress that error.
220
# Since we got here, we want to make sure to give an i18n error
221
pipe = _spawn_external_diff(diffcmd, capture_errors=False)
222
out, err = pipe.communicate()
224
# Write out the new i18n diff response
225
to_file.write(out+'\n')
226
if pipe.returncode != 2:
227
raise errors.BzrError(
228
'external diff failed with exit code 2'
229
' when run with LANG=C and LC_ALL=C,'
230
' but not when run natively: %r' % (diffcmd,))
232
first_line = lang_c_out.split('\n', 1)[0]
233
# Starting with diffutils 2.8.4 the word "binary" was dropped.
234
m = re.match('^(binary )?files.*differ$', first_line, re.I)
236
raise errors.BzrError('external diff failed with exit code 2;'
237
' command: %r' % (diffcmd,))
239
# Binary files differ, just return
242
# If we got to here, we haven't written out the output of diff
246
# returns 1 if files differ; that's OK
248
msg = 'signal %d' % (-rc)
250
msg = 'exit code %d' % rc
252
raise errors.BzrError('external diff failed with %s; command: %r'
257
oldtmpf.close() # and delete
259
# Clean up. Warn in case the files couldn't be deleted
260
# (in case windows still holds the file open, but not
261
# if the files have already been deleted)
263
os.remove(old_abspath)
265
if e.errno not in (errno.ENOENT,):
266
warning('Failed to delete temporary file: %s %s',
269
os.remove(new_abspath)
271
if e.errno not in (errno.ENOENT,):
272
warning('Failed to delete temporary file: %s %s',
276
def _get_trees_to_diff(path_list, revision_specs, old_url, new_url,
278
"""Get the trees and specific files to diff given a list of paths.
280
This method works out the trees to be diff'ed and the files of
281
interest within those trees.
284
the list of arguments passed to the diff command
285
:param revision_specs:
286
Zero, one or two RevisionSpecs from the diff command line,
287
saying what revisions to compare.
289
The url of the old branch or tree. If None, the tree to use is
290
taken from the first path, if any, or the current working tree.
292
The url of the new branch or tree. If None, the tree to use is
293
taken from the first path, if any, or the current working tree.
295
if True and a view is set, apply the view or check that the paths
298
a tuple of (old_tree, new_tree, specific_files, extra_trees) where
299
extra_trees is a sequence of additional trees to search in for
302
# Get the old and new revision specs
303
old_revision_spec = None
304
new_revision_spec = None
305
if revision_specs is not None:
306
if len(revision_specs) > 0:
307
old_revision_spec = revision_specs[0]
309
old_url = old_revision_spec.get_branch()
310
if len(revision_specs) > 1:
311
new_revision_spec = revision_specs[1]
313
new_url = new_revision_spec.get_branch()
316
make_paths_wt_relative = True
317
consider_relpath = True
318
if path_list is None or len(path_list) == 0:
319
# If no path is given, the current working tree is used
320
default_location = u'.'
321
consider_relpath = False
322
elif old_url is not None and new_url is not None:
323
other_paths = path_list
324
make_paths_wt_relative = False
326
default_location = path_list[0]
327
other_paths = path_list[1:]
329
# Get the old location
332
old_url = default_location
333
working_tree, branch, relpath = \
334
bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
335
if consider_relpath and relpath != '':
336
if working_tree is not None and apply_view:
337
_check_path_in_view(working_tree, relpath)
338
specific_files.append(relpath)
339
old_tree = _get_tree_to_diff(old_revision_spec, working_tree, branch)
341
# Get the new location
343
new_url = default_location
344
if new_url != old_url:
345
working_tree, branch, relpath = \
346
bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
347
if consider_relpath and relpath != '':
348
if working_tree is not None and apply_view:
349
_check_path_in_view(working_tree, relpath)
350
specific_files.append(relpath)
351
new_tree = _get_tree_to_diff(new_revision_spec, working_tree, branch,
352
basis_is_default=working_tree is None)
354
# Get the specific files (all files is None, no files is [])
355
if make_paths_wt_relative and working_tree is not None:
357
from bzrlib.builtins import safe_relpath_files
358
other_paths = safe_relpath_files(working_tree, other_paths,
359
apply_view=apply_view)
360
except errors.FileInWrongBranch:
361
raise errors.BzrCommandError("Files are in different branches")
362
specific_files.extend(other_paths)
363
if len(specific_files) == 0:
364
specific_files = None
365
if (working_tree is not None and working_tree.supports_views()
367
view_files = working_tree.views.lookup_view()
369
specific_files = view_files
370
view_str = views.view_display_str(view_files)
371
note("*** ignoring files outside view: %s" % view_str)
373
# Get extra trees that ought to be searched for file-ids
375
if working_tree is not None and working_tree not in (old_tree, new_tree):
376
extra_trees = (working_tree,)
377
return old_tree, new_tree, specific_files, extra_trees
380
def _check_path_in_view(tree, relpath):
381
"""If a working tree has a view enabled, check the path is within it."""
382
if tree.supports_views():
383
view_files = tree.views.lookup_view()
384
if view_files and not osutils.is_inside_any(view_files, relpath):
385
raise errors.FileOutsideView(relpath, view_files)
388
def _get_tree_to_diff(spec, tree=None, branch=None, basis_is_default=True):
389
if branch is None and tree is not None:
391
if spec is None or spec.spec is None:
394
return tree.basis_tree()
396
return branch.basis_tree()
399
return spec.as_tree(branch)
402
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
403
external_diff_options=None,
404
old_label='a/', new_label='b/',
406
path_encoding='utf8',
408
"""Show in text form the changes from one tree to another.
414
Include only changes to these files - None for all changes.
416
external_diff_options
417
If set, use an external GNU diff and pass these options.
420
If set, more Trees to use for looking up file ids
423
If set, the path will be encoded as specified, otherwise is supposed
428
if extra_trees is not None:
429
for tree in extra_trees:
433
differ = DiffTree.from_trees_options(old_tree, new_tree, to_file,
435
external_diff_options,
436
old_label, new_label, using)
437
return differ.show_diff(specific_files, extra_trees)
440
if extra_trees is not None:
441
for tree in extra_trees:
447
def _patch_header_date(tree, file_id, path):
448
"""Returns a timestamp suitable for use in a patch header."""
449
mtime = tree.get_file_mtime(file_id, path)
450
return timestamp.format_patch_date(mtime)
453
@deprecated_function(one_three)
454
def get_prop_change(meta_modified):
456
return " (properties changed)"
460
def get_executable_change(old_is_x, new_is_x):
461
descr = { True:"+x", False:"-x", None:"??" }
462
if old_is_x != new_is_x:
463
return ["%s to %s" % (descr[old_is_x], descr[new_is_x],)]
468
class DiffPath(object):
469
"""Base type for command object that compare files"""
471
# The type or contents of the file were unsuitable for diffing
472
CANNOT_DIFF = 'CANNOT_DIFF'
473
# The file has changed in a semantic way
475
# The file content may have changed, but there is no semantic change
476
UNCHANGED = 'UNCHANGED'
478
def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8'):
481
:param old_tree: The tree to show as the old tree in the comparison
482
:param new_tree: The tree to show as new in the comparison
483
:param to_file: The file to write comparison data to
484
:param path_encoding: The character encoding to write paths in
486
self.old_tree = old_tree
487
self.new_tree = new_tree
488
self.to_file = to_file
489
self.path_encoding = path_encoding
495
def from_diff_tree(klass, diff_tree):
496
return klass(diff_tree.old_tree, diff_tree.new_tree,
497
diff_tree.to_file, diff_tree.path_encoding)
500
def _diff_many(differs, file_id, old_path, new_path, old_kind, new_kind):
501
for file_differ in differs:
502
result = file_differ.diff(file_id, old_path, new_path, old_kind,
504
if result is not DiffPath.CANNOT_DIFF:
507
return DiffPath.CANNOT_DIFF
510
class DiffKindChange(object):
511
"""Special differ for file kind changes.
513
Represents kind change as deletion + creation. Uses the other differs
516
def __init__(self, differs):
517
self.differs = differs
523
def from_diff_tree(klass, diff_tree):
524
return klass(diff_tree.differs)
526
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
527
"""Perform comparison
529
:param file_id: The file_id of the file to compare
530
:param old_path: Path of the file in the old tree
531
:param new_path: Path of the file in the new tree
532
:param old_kind: Old file-kind of the file
533
:param new_kind: New file-kind of the file
535
if None in (old_kind, new_kind):
536
return DiffPath.CANNOT_DIFF
537
result = DiffPath._diff_many(self.differs, file_id, old_path,
538
new_path, old_kind, None)
539
if result is DiffPath.CANNOT_DIFF:
541
return DiffPath._diff_many(self.differs, file_id, old_path, new_path,
545
class DiffDirectory(DiffPath):
547
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
548
"""Perform comparison between two directories. (dummy)
551
if 'directory' not in (old_kind, new_kind):
552
return self.CANNOT_DIFF
553
if old_kind not in ('directory', None):
554
return self.CANNOT_DIFF
555
if new_kind not in ('directory', None):
556
return self.CANNOT_DIFF
560
class DiffSymlink(DiffPath):
562
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
563
"""Perform comparison between two symlinks
565
:param file_id: The file_id of the file to compare
566
:param old_path: Path of the file in the old tree
567
:param new_path: Path of the file in the new tree
568
:param old_kind: Old file-kind of the file
569
:param new_kind: New file-kind of the file
571
if 'symlink' not in (old_kind, new_kind):
572
return self.CANNOT_DIFF
573
if old_kind == 'symlink':
574
old_target = self.old_tree.get_symlink_target(file_id)
575
elif old_kind is None:
578
return self.CANNOT_DIFF
579
if new_kind == 'symlink':
580
new_target = self.new_tree.get_symlink_target(file_id)
581
elif new_kind is None:
584
return self.CANNOT_DIFF
585
return self.diff_symlink(old_target, new_target)
587
def diff_symlink(self, old_target, new_target):
588
if old_target is None:
589
self.to_file.write('=== target is %r\n' % new_target)
590
elif new_target is None:
591
self.to_file.write('=== target was %r\n' % old_target)
593
self.to_file.write('=== target changed %r => %r\n' %
594
(old_target, new_target))
598
class DiffText(DiffPath):
600
# GNU Patch uses the epoch date to detect files that are being added
601
# or removed in a diff.
602
EPOCH_DATE = '1970-01-01 00:00:00 +0000'
604
def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
605
old_label='', new_label='', text_differ=internal_diff):
606
DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
607
self.text_differ = text_differ
608
self.old_label = old_label
609
self.new_label = new_label
610
self.path_encoding = path_encoding
612
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
613
"""Compare two files in unified diff format
615
:param file_id: The file_id of the file to compare
616
:param old_path: Path of the file in the old tree
617
:param new_path: Path of the file in the new tree
618
:param old_kind: Old file-kind of the file
619
:param new_kind: New file-kind of the file
621
if 'file' not in (old_kind, new_kind):
622
return self.CANNOT_DIFF
623
from_file_id = to_file_id = file_id
624
if old_kind == 'file':
625
old_date = _patch_header_date(self.old_tree, file_id, old_path)
626
elif old_kind is None:
627
old_date = self.EPOCH_DATE
630
return self.CANNOT_DIFF
631
if new_kind == 'file':
632
new_date = _patch_header_date(self.new_tree, file_id, new_path)
633
elif new_kind is None:
634
new_date = self.EPOCH_DATE
637
return self.CANNOT_DIFF
638
from_label = '%s%s\t%s' % (self.old_label, old_path, old_date)
639
to_label = '%s%s\t%s' % (self.new_label, new_path, new_date)
640
return self.diff_text(from_file_id, to_file_id, from_label, to_label)
642
def diff_text(self, from_file_id, to_file_id, from_label, to_label):
643
"""Diff the content of given files in two trees
645
:param from_file_id: The id of the file in the from tree. If None,
646
the file is not present in the from tree.
647
:param to_file_id: The id of the file in the to tree. This may refer
648
to a different file from from_file_id. If None,
649
the file is not present in the to tree.
651
def _get_text(tree, file_id):
652
if file_id is not None:
653
return tree.get_file(file_id).readlines()
657
from_text = _get_text(self.old_tree, from_file_id)
658
to_text = _get_text(self.new_tree, to_file_id)
659
self.text_differ(from_label, from_text, to_label, to_text,
661
except errors.BinaryFile:
663
("Binary files %s and %s differ\n" %
664
(from_label, to_label)).encode(self.path_encoding))
668
class DiffFromTool(DiffPath):
670
def __init__(self, command_template, old_tree, new_tree, to_file,
671
path_encoding='utf-8'):
672
DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
673
self.command_template = command_template
674
self._root = osutils.mkdtemp(prefix='bzr-diff-')
677
def from_string(klass, command_string, old_tree, new_tree, to_file,
678
path_encoding='utf-8'):
679
command_template = commands.shlex_split_unicode(command_string)
680
command_template.extend(['%(old_path)s', '%(new_path)s'])
681
return klass(command_template, old_tree, new_tree, to_file,
685
def make_from_diff_tree(klass, command_string):
686
def from_diff_tree(diff_tree):
687
return klass.from_string(command_string, diff_tree.old_tree,
688
diff_tree.new_tree, diff_tree.to_file)
689
return from_diff_tree
691
def _get_command(self, old_path, new_path):
692
my_map = {'old_path': old_path, 'new_path': new_path}
693
return [t % my_map for t in self.command_template]
695
def _execute(self, old_path, new_path):
696
command = self._get_command(old_path, new_path)
698
proc = subprocess.Popen(command, stdout=subprocess.PIPE,
701
if e.errno == errno.ENOENT:
702
raise errors.ExecutableMissing(command[0])
705
self.to_file.write(proc.stdout.read())
708
def _try_symlink_root(self, tree, prefix):
709
if (getattr(tree, 'abspath', None) is None
710
or not osutils.host_os_dereferences_symlinks()):
713
os.symlink(tree.abspath(''), osutils.pathjoin(self._root, prefix))
715
if e.errno != errno.EEXIST:
719
def _write_file(self, file_id, tree, prefix, relpath):
720
full_path = osutils.pathjoin(self._root, prefix, relpath)
721
if self._try_symlink_root(tree, prefix):
723
parent_dir = osutils.dirname(full_path)
725
os.makedirs(parent_dir)
727
if e.errno != errno.EEXIST:
729
source = tree.get_file(file_id, relpath)
731
target = open(full_path, 'wb')
733
osutils.pumpfile(source, target)
738
osutils.make_readonly(full_path)
739
mtime = tree.get_file_mtime(file_id)
740
os.utime(full_path, (mtime, mtime))
743
def _prepare_files(self, file_id, old_path, new_path):
744
old_disk_path = self._write_file(file_id, self.old_tree, 'old',
746
new_disk_path = self._write_file(file_id, self.new_tree, 'new',
748
return old_disk_path, new_disk_path
751
osutils.rmtree(self._root)
753
def diff(self, file_id, old_path, new_path, old_kind, new_kind):
754
if (old_kind, new_kind) != ('file', 'file'):
755
return DiffPath.CANNOT_DIFF
756
self._prepare_files(file_id, old_path, new_path)
757
self._execute(osutils.pathjoin('old', old_path),
758
osutils.pathjoin('new', new_path))
761
class DiffTree(object):
762
"""Provides textual representations of the difference between two trees.
764
A DiffTree examines two trees and where a file-id has altered
765
between them, generates a textual representation of the difference.
766
DiffTree uses a sequence of DiffPath objects which are each
767
given the opportunity to handle a given altered fileid. The list
768
of DiffPath objects can be extended globally by appending to
769
DiffTree.diff_factories, or for a specific diff operation by
770
supplying the extra_factories option to the appropriate method.
773
# list of factories that can provide instances of DiffPath objects
774
# may be extended by plugins.
775
diff_factories = [DiffSymlink.from_diff_tree,
776
DiffDirectory.from_diff_tree]
778
def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
779
diff_text=None, extra_factories=None):
782
:param old_tree: Tree to show as old in the comparison
783
:param new_tree: Tree to show as new in the comparison
784
:param to_file: File to write comparision to
785
:param path_encoding: Character encoding to write paths in
786
:param diff_text: DiffPath-type object to use as a last resort for
788
:param extra_factories: Factories of DiffPaths to try before any other
790
if diff_text is None:
791
diff_text = DiffText(old_tree, new_tree, to_file, path_encoding,
792
'', '', internal_diff)
793
self.old_tree = old_tree
794
self.new_tree = new_tree
795
self.to_file = to_file
796
self.path_encoding = path_encoding
798
if extra_factories is not None:
799
self.differs.extend(f(self) for f in extra_factories)
800
self.differs.extend(f(self) for f in self.diff_factories)
801
self.differs.extend([diff_text, DiffKindChange.from_diff_tree(self)])
804
def from_trees_options(klass, old_tree, new_tree, to_file,
805
path_encoding, external_diff_options, old_label,
807
"""Factory for producing a DiffTree.
809
Designed to accept options used by show_diff_trees.
810
:param old_tree: The tree to show as old in the comparison
811
:param new_tree: The tree to show as new in the comparison
812
:param to_file: File to write comparisons to
813
:param path_encoding: Character encoding to use for writing paths
814
:param external_diff_options: If supplied, use the installed diff
815
binary to perform file comparison, using supplied options.
816
:param old_label: Prefix to use for old file labels
817
:param new_label: Prefix to use for new file labels
818
:param using: Commandline to use to invoke an external diff tool
820
if using is not None:
821
extra_factories = [DiffFromTool.make_from_diff_tree(using)]
824
if external_diff_options:
825
opts = external_diff_options.split()
826
def diff_file(olab, olines, nlab, nlines, to_file):
827
external_diff(olab, olines, nlab, nlines, to_file, opts)
829
diff_file = internal_diff
830
diff_text = DiffText(old_tree, new_tree, to_file, path_encoding,
831
old_label, new_label, diff_file)
832
return klass(old_tree, new_tree, to_file, path_encoding, diff_text,
835
def show_diff(self, specific_files, extra_trees=None):
836
"""Write tree diff to self.to_file
838
:param sepecific_files: the specific files to compare (recursive)
839
:param extra_trees: extra trees to use for mapping paths to file_ids
842
return self._show_diff(specific_files, extra_trees)
844
for differ in self.differs:
847
def _show_diff(self, specific_files, extra_trees):
848
# TODO: Generation of pseudo-diffs for added/deleted files could
849
# be usefully made into a much faster special case.
850
iterator = self.new_tree.iter_changes(self.old_tree,
851
specific_files=specific_files,
852
extra_trees=extra_trees,
853
require_versioned=True)
855
def changes_key(change):
856
old_path, new_path = change[1]
861
def get_encoded_path(path):
863
return path.encode(self.path_encoding, "replace")
864
for (file_id, paths, changed_content, versioned, parent, name, kind,
865
executable) in sorted(iterator, key=changes_key):
866
# The root does not get diffed, and items with no known kind (that
867
# is, missing) in both trees are skipped as well.
868
if parent == (None, None) or kind == (None, None):
870
oldpath, newpath = paths
871
oldpath_encoded = get_encoded_path(paths[0])
872
newpath_encoded = get_encoded_path(paths[1])
873
old_present = (kind[0] is not None and versioned[0])
874
new_present = (kind[1] is not None and versioned[1])
875
renamed = (parent[0], name[0]) != (parent[1], name[1])
877
properties_changed = []
878
properties_changed.extend(get_executable_change(executable[0], executable[1]))
880
if properties_changed:
881
prop_str = " (properties changed: %s)" % (", ".join(properties_changed),)
885
if (old_present, new_present) == (True, False):
886
self.to_file.write("=== removed %s '%s'\n" %
887
(kind[0], oldpath_encoded))
889
elif (old_present, new_present) == (False, True):
890
self.to_file.write("=== added %s '%s'\n" %
891
(kind[1], newpath_encoded))
894
self.to_file.write("=== renamed %s '%s' => '%s'%s\n" %
895
(kind[0], oldpath_encoded, newpath_encoded, prop_str))
897
# if it was produced by iter_changes, it must be
898
# modified *somehow*, either content or execute bit.
899
self.to_file.write("=== modified %s '%s'%s\n" % (kind[0],
900
newpath_encoded, prop_str))
902
self.diff(file_id, oldpath, newpath)
908
def diff(self, file_id, old_path, new_path):
909
"""Perform a diff of a single file
911
:param file_id: file-id of the file
912
:param old_path: The path of the file in the old tree
913
:param new_path: The path of the file in the new tree
916
old_kind = self.old_tree.kind(file_id)
917
except (errors.NoSuchId, errors.NoSuchFile):
920
new_kind = self.new_tree.kind(file_id)
921
except (errors.NoSuchId, errors.NoSuchFile):
924
result = DiffPath._diff_many(self.differs, file_id, old_path,
925
new_path, old_kind, new_kind)
926
if result is DiffPath.CANNOT_DIFF:
927
error_path = new_path
928
if error_path is None:
929
error_path = old_path
930
raise errors.NoDiffFound(error_path)
added
removed
bzrlib/diff.py
