← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-09 22:14:24 UTC
  • mfrom: (5777.4.2 mutableinventorytree)
  • mto: This revision was merged to the branch mainline in revision 5787.
  • Revision ID: jelmer@samba.org-20110409221424-a2air35exbz50hi8
Mergemutableinventorytree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
27
27
import tempfile
28
28
 
29
29
from bzrlib import (
 
30
    bzrdir,
 
31
    cmdline,
30
32
    cleanup,
31
 
    cmdline,
32
 
    controldir,
33
33
    errors,
34
34
    osutils,
35
35
    patiencediff,
39
39
    )
40
40
 
41
41
from bzrlib.workingtree import WorkingTree
42
 
from bzrlib.i18n import gettext
43
42
""")
44
43
 
45
44
from bzrlib.registry import (
46
45
    Registry,
47
46
    )
 
47
from bzrlib.symbol_versioning import (
 
48
    deprecated_function,
 
49
    deprecated_in,
 
50
    )
48
51
from bzrlib.trace import mutter, note, warning
49
52
 
50
53
 
285
288
                        new_abspath, e)
286
289
 
287
290
 
 
291
@deprecated_function(deprecated_in((2, 2, 0)))
 
292
def get_trees_and_branches_to_diff(path_list, revision_specs, old_url, new_url,
 
293
                                   apply_view=True):
 
294
    """Get the trees and specific files to diff given a list of paths.
 
295
 
 
296
    This method works out the trees to be diff'ed and the files of
 
297
    interest within those trees.
 
298
 
 
299
    :param path_list:
 
300
        the list of arguments passed to the diff command
 
301
    :param revision_specs:
 
302
        Zero, one or two RevisionSpecs from the diff command line,
 
303
        saying what revisions to compare.
 
304
    :param old_url:
 
305
        The url of the old branch or tree. If None, the tree to use is
 
306
        taken from the first path, if any, or the current working tree.
 
307
    :param new_url:
 
308
        The url of the new branch or tree. If None, the tree to use is
 
309
        taken from the first path, if any, or the current working tree.
 
310
    :param apply_view:
 
311
        if True and a view is set, apply the view or check that the paths
 
312
        are within it
 
313
    :returns:
 
314
        a tuple of (old_tree, new_tree, old_branch, new_branch,
 
315
        specific_files, extra_trees) where extra_trees is a sequence of
 
316
        additional trees to search in for file-ids.  The trees and branches
 
317
        are not locked.
 
318
    """
 
319
    op = cleanup.OperationWithCleanups(get_trees_and_branches_to_diff_locked)
 
320
    return op.run_simple(path_list, revision_specs, old_url, new_url,
 
321
            op.add_cleanup, apply_view=apply_view)
 
322
    
 
323
 
288
324
def get_trees_and_branches_to_diff_locked(
289
325
    path_list, revision_specs, old_url, new_url, add_cleanup, apply_view=True):
290
326
    """Get the trees and specific files to diff given a list of paths.
356
392
    if old_url is None:
357
393
        old_url = default_location
358
394
    working_tree, branch, relpath = \
359
 
        controldir.ControlDir.open_containing_tree_or_branch(old_url)
 
395
        bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
360
396
    lock_tree_or_branch(working_tree, branch)
361
397
    if consider_relpath and relpath != '':
362
398
        if working_tree is not None and apply_view:
370
406
        new_url = default_location
371
407
    if new_url != old_url:
372
408
        working_tree, branch, relpath = \
373
 
            controldir.ControlDir.open_containing_tree_or_branch(new_url)
 
409
            bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
374
410
        lock_tree_or_branch(working_tree, branch)
375
411
        if consider_relpath and relpath != '':
376
412
            if working_tree is not None and apply_view:
394
430
            if view_files:
395
431
                specific_files = view_files
396
432
                view_str = views.view_display_str(view_files)
397
 
                note(gettext("*** Ignoring files outside view. View is %s") % view_str)
 
433
                note("*** Ignoring files outside view. View is %s" % view_str)
398
434
 
399
435
    # Get extra trees that ought to be searched for file-ids
400
436
    extra_trees = None
401
437
    if working_tree is not None and working_tree not in (old_tree, new_tree):
402
438
        extra_trees = (working_tree,)
403
 
    return (old_tree, new_tree, old_branch, new_branch,
404
 
            specific_files, extra_trees)
 
439
    return old_tree, new_tree, old_branch, new_branch, specific_files, extra_trees
405
440
 
406
441
 
407
442
def _get_tree_to_diff(spec, tree=None, branch=None, basis_is_default=True):
428
463
    """Show in text form the changes from one tree to another.
429
464
 
430
465
    :param to_file: The output stream.
431
 
    :param specific_files: Include only changes to these files - None for all
 
466
    :param specific_files:Include only changes to these files - None for all
432
467
        changes.
433
468
    :param external_diff_options: If set, use an external GNU diff and pass 
434
469
        these options.
710
745
 
711
746
    def _get_command(self, old_path, new_path):
712
747
        my_map = {'old_path': old_path, 'new_path': new_path}
713
 
        command = [AtTemplate(t).substitute(my_map) for t in
714
 
                   self.command_template]
715
 
        if sys.platform == 'win32': # Popen doesn't accept unicode on win32
716
 
            command_encoded = []
717
 
            for c in command:
718
 
                if isinstance(c, unicode):
719
 
                    command_encoded.append(c.encode('mbcs'))
720
 
                else:
721
 
                    command_encoded.append(c)
722
 
            return command_encoded
723
 
        else:
724
 
            return command
 
748
        return [AtTemplate(t).substitute(my_map) for t in
 
749
                self.command_template]
725
750
 
726
751
    def _execute(self, old_path, new_path):
727
752
        command = self._get_command(old_path, new_path)
747
772
                raise
748
773
        return True
749
774
 
750
 
    @staticmethod
751
 
    def _fenc():
752
 
        """Returns safe encoding for passing file path to diff tool"""
753
 
        if sys.platform == 'win32':
754
 
            return 'mbcs'
755
 
        else:
756
 
            # Don't fallback to 'utf-8' because subprocess may not be able to
757
 
            # handle utf-8 correctly when locale is not utf-8.
758
 
            return sys.getfilesystemencoding() or 'ascii'
759
 
 
760
 
    def _is_safepath(self, path):
761
 
        """Return true if `path` may be able to pass to subprocess."""
762
 
        fenc = self._fenc()
763
 
        try:
764
 
            return path == path.encode(fenc).decode(fenc)
765
 
        except UnicodeError:
766
 
            return False
767
 
 
768
 
    def _safe_filename(self, prefix, relpath):
769
 
        """Replace unsafe character in `relpath` then join `self._root`,
770
 
        `prefix` and `relpath`."""
771
 
        fenc = self._fenc()
772
 
        # encoded_str.replace('?', '_') may break multibyte char.
773
 
        # So we should encode, decode, then replace(u'?', u'_')
774
 
        relpath_tmp = relpath.encode(fenc, 'replace').decode(fenc, 'replace')
775
 
        relpath_tmp = relpath_tmp.replace(u'?', u'_')
776
 
        return osutils.pathjoin(self._root, prefix, relpath_tmp)
777
 
 
778
775
    def _write_file(self, file_id, tree, prefix, relpath, force_temp=False,
779
776
                    allow_write=False):
780
777
        if not force_temp and isinstance(tree, WorkingTree):
781
 
            full_path = tree.abspath(tree.id2path(file_id))
782
 
            if self._is_safepath(full_path):
783
 
                return full_path
784
 
 
785
 
        full_path = self._safe_filename(prefix, relpath)
 
778
            return tree.abspath(tree.id2path(file_id))
 
779
        
 
780
        full_path = osutils.pathjoin(self._root, prefix, relpath)
786
781
        if not force_temp and self._try_symlink_root(tree, prefix):
787
782
            return full_path
788
783
        parent_dir = osutils.dirname(full_path)
845
840
        """
846
841
        old_path = self.old_tree.id2path(file_id)
847
842
        new_path = self.new_tree.id2path(file_id)
848
 
        old_abs_path, new_abs_path = self._prepare_files(
849
 
                                            file_id, old_path, new_path,
850
 
                                            allow_write_new=True,
851
 
                                            force_temp=True)
852
 
        command = self._get_command(old_abs_path, new_abs_path)
 
843
        new_abs_path = self._prepare_files(file_id, old_path, new_path,
 
844
                                           allow_write_new=True,
 
845
                                           force_temp=True)[1]
 
846
        command = self._get_command(osutils.pathjoin('old', old_path),
 
847
                                    osutils.pathjoin('new', new_path))
853
848
        subprocess.call(command, cwd=self._root)
854
 
        new_file = open(new_abs_path, 'rb')
 
849
        new_file = open(new_abs_path, 'r')
855
850
        try:
856
851
            return new_file.read()
857
852
        finally:
907
902
        """Factory for producing a DiffTree.
908
903
 
909
904
        Designed to accept options used by show_diff_trees.
910
 
 
911
905
        :param old_tree: The tree to show as old in the comparison
912
906
        :param new_tree: The tree to show as new in the comparison
913
907
        :param to_file: File to write comparisons to