1
# Copyright (C) 2005-2011 Canonical Ltd.
1
# Copyright (C) 2005-2010 Canonical Ltd.
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
93
99
if sequence_matcher is None:
94
100
sequence_matcher = patiencediff.PatienceSequenceMatcher
95
101
ud = patiencediff.unified_diff(oldlines, newlines,
96
fromfile=old_filename.encode(path_encoding, 'replace'),
97
tofile=new_filename.encode(path_encoding, 'replace'),
102
fromfile=old_filename.encode(path_encoding),
103
tofile=new_filename.encode(path_encoding),
98
104
sequencematcher=sequence_matcher)
293
@deprecated_function(deprecated_in((2, 2, 0)))
294
def get_trees_and_branches_to_diff(path_list, revision_specs, old_url, new_url,
296
"""Get the trees and specific files to diff given a list of paths.
298
This method works out the trees to be diff'ed and the files of
299
interest within those trees.
302
the list of arguments passed to the diff command
303
:param revision_specs:
304
Zero, one or two RevisionSpecs from the diff command line,
305
saying what revisions to compare.
307
The url of the old branch or tree. If None, the tree to use is
308
taken from the first path, if any, or the current working tree.
310
The url of the new branch or tree. If None, the tree to use is
311
taken from the first path, if any, or the current working tree.
313
if True and a view is set, apply the view or check that the paths
316
a tuple of (old_tree, new_tree, old_branch, new_branch,
317
specific_files, extra_trees) where extra_trees is a sequence of
318
additional trees to search in for file-ids. The trees and branches
321
op = cleanup.OperationWithCleanups(get_trees_and_branches_to_diff_locked)
322
return op.run_simple(path_list, revision_specs, old_url, new_url,
323
op.add_cleanup, apply_view=apply_view)
287
326
def get_trees_and_branches_to_diff_locked(
288
327
path_list, revision_specs, old_url, new_url, add_cleanup, apply_view=True):
289
328
"""Get the trees and specific files to diff given a list of paths.
382
421
# Get the specific files (all files is None, no files is [])
383
422
if make_paths_wt_relative and working_tree is not None:
384
other_paths = working_tree.safe_relpath_files(
424
from bzrlib.builtins import safe_relpath_files
425
other_paths = safe_relpath_files(working_tree, other_paths,
386
426
apply_view=apply_view)
427
except errors.FileInWrongBranch:
428
raise errors.BzrCommandError("Files are in different branches")
387
429
specific_files.extend(other_paths)
388
430
if len(specific_files) == 0:
389
431
specific_files = None
399
441
extra_trees = None
400
442
if working_tree is not None and working_tree not in (old_tree, new_tree):
401
443
extra_trees = (working_tree,)
402
return (old_tree, new_tree, old_branch, new_branch,
403
specific_files, extra_trees)
444
return old_tree, new_tree, old_branch, new_branch, specific_files, extra_trees
406
447
def _get_tree_to_diff(spec, tree=None, branch=None, basis_is_default=True):
427
468
"""Show in text form the changes from one tree to another.
429
470
:param to_file: The output stream.
430
:param specific_files: Include only changes to these files - None for all
471
:param specific_files:Include only changes to these files - None for all
432
473
:param external_diff_options: If set, use an external GNU diff and pass
666
707
def _get_text(tree, file_id, path):
667
708
if file_id is not None:
668
return tree.get_file_lines(file_id, path)
709
return tree.get_file(file_id, path).readlines()
672
713
from_text = _get_text(self.old_tree, from_file_id, from_path)
673
714
to_text = _get_text(self.new_tree, to_file_id, to_path)
674
715
self.text_differ(from_label, from_text, to_label, to_text,
675
self.to_file, path_encoding=self.path_encoding)
676
717
except errors.BinaryFile:
677
718
self.to_file.write(
678
719
("Binary files %s and %s differ\n" %
679
(from_label, to_label)).encode(self.path_encoding,'replace'))
720
(from_label, to_label)).encode(self.path_encoding))
680
721
return self.CHANGED
701
def make_from_diff_tree(klass, command_string, external_diff_options=None):
742
def make_from_diff_tree(klass, command_string):
702
743
def from_diff_tree(diff_tree):
703
full_command_string = [command_string]
704
if external_diff_options is not None:
705
full_command_string += ' ' + external_diff_options
706
return klass.from_string(full_command_string, diff_tree.old_tree,
744
return klass.from_string(command_string, diff_tree.old_tree,
707
745
diff_tree.new_tree, diff_tree.to_file)
708
746
return from_diff_tree
710
748
def _get_command(self, old_path, new_path):
711
749
my_map = {'old_path': old_path, 'new_path': new_path}
712
command = [AtTemplate(t).substitute(my_map) for t in
713
self.command_template]
714
if sys.platform == 'win32': # Popen doesn't accept unicode on win32
717
if isinstance(c, unicode):
718
command_encoded.append(c.encode('mbcs'))
720
command_encoded.append(c)
721
return command_encoded
750
return [AtTemplate(t).substitute(my_map) for t in
751
self.command_template]
725
753
def _execute(self, old_path, new_path):
726
754
command = self._get_command(old_path, new_path)
751
"""Returns safe encoding for passing file path to diff tool"""
752
if sys.platform == 'win32':
755
# Don't fallback to 'utf-8' because subprocess may not be able to
756
# handle utf-8 correctly when locale is not utf-8.
757
return sys.getfilesystemencoding() or 'ascii'
759
def _is_safepath(self, path):
760
"""Return true if `path` may be able to pass to subprocess."""
763
return path == path.encode(fenc).decode(fenc)
767
def _safe_filename(self, prefix, relpath):
768
"""Replace unsafe character in `relpath` then join `self._root`,
769
`prefix` and `relpath`."""
771
# encoded_str.replace('?', '_') may break multibyte char.
772
# So we should encode, decode, then replace(u'?', u'_')
773
relpath_tmp = relpath.encode(fenc, 'replace').decode(fenc, 'replace')
774
relpath_tmp = relpath_tmp.replace(u'?', u'_')
775
return osutils.pathjoin(self._root, prefix, relpath_tmp)
777
777
def _write_file(self, file_id, tree, prefix, relpath, force_temp=False,
778
778
allow_write=False):
779
779
if not force_temp and isinstance(tree, WorkingTree):
780
full_path = tree.abspath(tree.id2path(file_id))
781
if self._is_safepath(full_path):
784
full_path = self._safe_filename(prefix, relpath)
780
return tree.abspath(tree.id2path(file_id))
782
full_path = osutils.pathjoin(self._root, prefix, relpath)
785
783
if not force_temp and self._try_symlink_root(tree, prefix):
787
785
parent_dir = osutils.dirname(full_path)
845
843
old_path = self.old_tree.id2path(file_id)
846
844
new_path = self.new_tree.id2path(file_id)
847
old_abs_path, new_abs_path = self._prepare_files(
848
file_id, old_path, new_path,
849
allow_write_new=True,
851
command = self._get_command(old_abs_path, new_abs_path)
845
new_abs_path = self._prepare_files(file_id, old_path, new_path,
846
allow_write_new=True,
848
command = self._get_command(osutils.pathjoin('old', old_path),
849
osutils.pathjoin('new', new_path))
852
850
subprocess.call(command, cwd=self._root)
853
new_file = open(new_abs_path, 'rb')
851
new_file = open(new_abs_path, 'r')
855
853
return new_file.read()
906
904
"""Factory for producing a DiffTree.
908
906
Designed to accept options used by show_diff_trees.
910
907
:param old_tree: The tree to show as old in the comparison
911
908
:param new_tree: The tree to show as new in the comparison
912
909
:param to_file: File to write comparisons to
918
915
:param using: Commandline to use to invoke an external diff tool
920
917
if using is not None:
921
extra_factories = [DiffFromTool.make_from_diff_tree(using, external_diff_options)]
918
extra_factories = [DiffFromTool.make_from_diff_tree(using)]
923
920
extra_factories = []
924
921
if external_diff_options:
925
922
opts = external_diff_options.split()
926
def diff_file(olab, olines, nlab, nlines, to_file, path_encoding=None):
927
""":param path_encoding: not used but required
928
to match the signature of internal_diff.
923
def diff_file(olab, olines, nlab, nlines, to_file):
930
924
external_diff(olab, olines, nlab, nlines, to_file, opts)
932
926
diff_file = internal_diff
added
removed
bzrlib/diff.py
