~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

• browse files at revision 5380.3.2
• compare with another revision
• download diff
• download tarball
• view history from revision 5380.3.2

• reverse the comparison (5380.3.2 to 6017.1.2)
• stop comparing with revision 6017.1.2

Show diffs side-by-side

added

removed

bzrlib/diff.py

1

 

# Copyright (C) 2005-2011 Canonical Ltd.

 

1

# Copyright (C) 2005-2010 Canonical Ltd.

2

2

#

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

25

25

import errno

26

26

import subprocess

27

27

import tempfile

 

28

import time

28

29

 

29

30

from bzrlib import (

 

31

    branch as _mod_branch,

30

32

    bzrdir,

31

33

    cmdline,

32

34

    cleanup,

463

465

    """Show in text form the changes from one tree to another.

464

466

 

465

467

    :param to_file: The output stream.

466

 

    :param specific_files: Include only changes to these files - None for all

 

468

    :param specific_files:Include only changes to these files - None for all

467

469

        changes.

468

470

    :param external_diff_options: If set, use an external GNU diff and pass 

469

471

        these options.

734

736

                     path_encoding)

735

737

 

736

738

    @classmethod

737

 

    def make_from_diff_tree(klass, command_string, external_diff_options=None):

 

739

    def make_from_diff_tree(klass, command_string):

738

740

        def from_diff_tree(diff_tree):

739

 

            full_command_string = [command_string]

740

 

            if external_diff_options is not None:

741

 

                full_command_string += ' ' + external_diff_options

742

 

            return klass.from_string(full_command_string, diff_tree.old_tree,

 

741

            return klass.from_string(command_string, diff_tree.old_tree,

743

742

                                     diff_tree.new_tree, diff_tree.to_file)

744

743

        return from_diff_tree

745

744

 

746

745

    def _get_command(self, old_path, new_path):

747

746

        my_map = {'old_path': old_path, 'new_path': new_path}

748

 

        command = [AtTemplate(t).substitute(my_map) for t in

749

 

                   self.command_template]

750

 

        if sys.platform == 'win32': # Popen doesn't accept unicode on win32

751

 

            command_encoded = []

752

 

            for c in command:

753

 

                if isinstance(c, unicode):

754

 

                    command_encoded.append(c.encode('mbcs'))

755

 

                else:

756

 

                    command_encoded.append(c)

757

 

            return command_encoded

758

 

        else:

759

 

            return command

 

747

        return [AtTemplate(t).substitute(my_map) for t in

 

748

                self.command_template]

760

749

 

761

750

    def _execute(self, old_path, new_path):

762

751

        command = self._get_command(old_path, new_path)

782

771

                raise

783

772

        return True

784

773

 

785

 

    @staticmethod

786

 

    def _fenc():

787

 

        """Returns safe encoding for passing file path to diff tool"""

788

 

        if sys.platform == 'win32':

789

 

            return 'mbcs'

790

 

        else:

791

 

            # Don't fallback to 'utf-8' because subprocess may not be able to

792

 

            # handle utf-8 correctly when locale is not utf-8.

793

 

            return sys.getfilesystemencoding() or 'ascii'

794

 

 

795

 

    def _is_safepath(self, path):

796

 

        """Return true if `path` may be able to pass to subprocess."""

797

 

        fenc = self._fenc()

798

 

        try:

799

 

            return path == path.encode(fenc).decode(fenc)

800

 

        except UnicodeError:

801

 

            return False

802

 

 

803

 

    def _safe_filename(self, prefix, relpath):

804

 

        """Replace unsafe character in `relpath` then join `self._root`,

805

 

        `prefix` and `relpath`."""

806

 

        fenc = self._fenc()

807

 

        # encoded_str.replace('?', '_') may break multibyte char.

808

 

        # So we should encode, decode, then replace(u'?', u'_')

809

 

        relpath_tmp = relpath.encode(fenc, 'replace').decode(fenc, 'replace')

810

 

        relpath_tmp = relpath_tmp.replace(u'?', u'_')

811

 

        return osutils.pathjoin(self._root, prefix, relpath_tmp)

812

 

 

813

774

    def _write_file(self, file_id, tree, prefix, relpath, force_temp=False,

814

775

                    allow_write=False):

815

776

        if not force_temp and isinstance(tree, WorkingTree):

816

 

            full_path = tree.abspath(tree.id2path(file_id))

817

 

            if self._is_safepath(full_path):

818

 

                return full_path

819

 

 

820

 

        full_path = self._safe_filename(prefix, relpath)

 

777

            return tree.abspath(tree.id2path(file_id))

 

778

        

 

779

        full_path = osutils.pathjoin(self._root, prefix, relpath)

821

780

        if not force_temp and self._try_symlink_root(tree, prefix):

822

781

            return full_path

823

782

        parent_dir = osutils.dirname(full_path)

880

839

        """

881

840

        old_path = self.old_tree.id2path(file_id)

882

841

        new_path = self.new_tree.id2path(file_id)

883

 

        old_abs_path, new_abs_path = self._prepare_files(

884

 

                                            file_id, old_path, new_path,

885

 

                                            allow_write_new=True,

886

 

                                            force_temp=True)

887

 

        command = self._get_command(old_abs_path, new_abs_path)

 

842

        new_abs_path = self._prepare_files(file_id, old_path, new_path,

 

843

                                           allow_write_new=True,

 

844

                                           force_temp=True)[1]

 

845

        command = self._get_command(osutils.pathjoin('old', old_path),

 

846

                                    osutils.pathjoin('new', new_path))

888

847

        subprocess.call(command, cwd=self._root)

889

 

        new_file = open(new_abs_path, 'rb')

 

848

        new_file = open(new_abs_path, 'r')

890

849

        try:

891

850

            return new_file.read()

892

851

        finally:

942

901

        """Factory for producing a DiffTree.

943

902

 

944

903

        Designed to accept options used by show_diff_trees.

945

 

 

946

904

        :param old_tree: The tree to show as old in the comparison

947

905

        :param new_tree: The tree to show as new in the comparison

948

906

        :param to_file: File to write comparisons to

954

912

        :param using: Commandline to use to invoke an external diff tool

955

913

        """

956

914

        if using is not None:

957

 

            extra_factories = [DiffFromTool.make_from_diff_tree(using, external_diff_options)]

 

915

            extra_factories = [DiffFromTool.make_from_diff_tree(using)]

958

916

        else:

959

917

            extra_factories = []

960

918

        if external_diff_options:

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1