← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Andrew Starr-Bochicchio
  • Date: 2014-03-30 17:59:29 UTC
  • mto: This revision was merged to the branch mainline in revision 6592.
  • Revision ID: a.starr.b@gmail.com-20140330175929-rd97jstcbau2j1gy
https://launchpad.net/bugs/1030521
Use LooseVersion from distutils to check Cython version in order to handle non-integers in the version string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
import difflib
18
20
import os
19
21
import re
27
29
import tempfile
28
30
 
29
31
from bzrlib import (
30
 
    bzrdir,
 
32
    cleanup,
31
33
    cmdline,
32
 
    cleanup,
 
34
    controldir,
33
35
    errors,
34
36
    osutils,
35
37
    patiencediff,
39
41
    )
40
42
 
41
43
from bzrlib.workingtree import WorkingTree
 
44
from bzrlib.i18n import gettext
42
45
""")
43
46
 
44
47
from bzrlib.registry import (
46
49
    )
47
50
from bzrlib.trace import mutter, note, warning
48
51
 
 
52
DEFAULT_CONTEXT_AMOUNT = 3
49
53
 
50
54
class AtTemplate(string.Template):
51
55
    """Templating class that uses @ instead of $."""
69
73
 
70
74
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file,
71
75
                  allow_binary=False, sequence_matcher=None,
72
 
                  path_encoding='utf8'):
 
76
                  path_encoding='utf8', context_lines=DEFAULT_CONTEXT_AMOUNT):
73
77
    # FIXME: difflib is wrong if there is no trailing newline.
74
78
    # The syntax used by patch seems to be "\ No newline at
75
79
    # end of file" following the last diff line from that
95
99
    ud = patiencediff.unified_diff(oldlines, newlines,
96
100
                      fromfile=old_filename.encode(path_encoding, 'replace'),
97
101
                      tofile=new_filename.encode(path_encoding, 'replace'),
98
 
                      sequencematcher=sequence_matcher)
 
102
                      n=context_lines, sequencematcher=sequence_matcher)
99
103
 
100
104
    ud = list(ud)
101
105
    if len(ud) == 0: # Identical contents, nothing to do
355
359
    if old_url is None:
356
360
        old_url = default_location
357
361
    working_tree, branch, relpath = \
358
 
        bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
 
362
        controldir.ControlDir.open_containing_tree_or_branch(old_url)
359
363
    lock_tree_or_branch(working_tree, branch)
360
364
    if consider_relpath and relpath != '':
361
365
        if working_tree is not None and apply_view:
369
373
        new_url = default_location
370
374
    if new_url != old_url:
371
375
        working_tree, branch, relpath = \
372
 
            bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
 
376
            controldir.ControlDir.open_containing_tree_or_branch(new_url)
373
377
        lock_tree_or_branch(working_tree, branch)
374
378
        if consider_relpath and relpath != '':
375
379
            if working_tree is not None and apply_view:
393
397
            if view_files:
394
398
                specific_files = view_files
395
399
                view_str = views.view_display_str(view_files)
396
 
                note("*** Ignoring files outside view. View is %s" % view_str)
 
400
                note(gettext("*** Ignoring files outside view. View is %s") % view_str)
397
401
 
398
402
    # Get extra trees that ought to be searched for file-ids
399
403
    extra_trees = None
423
427
                    extra_trees=None,
424
428
                    path_encoding='utf8',
425
429
                    using=None,
426
 
                    format_cls=None):
 
430
                    format_cls=None,
 
431
                    context=DEFAULT_CONTEXT_AMOUNT):
427
432
    """Show in text form the changes from one tree to another.
428
433
 
429
434
    :param to_file: The output stream.
436
441
        otherwise is supposed to be utf8
437
442
    :param format_cls: Formatter class (DiffTree subclass)
438
443
    """
 
444
    if context is None:
 
445
        context = DEFAULT_CONTEXT_AMOUNT
439
446
    if format_cls is None:
440
447
        format_cls = DiffTree
441
448
    old_tree.lock_read()
448
455
            differ = format_cls.from_trees_options(old_tree, new_tree, to_file,
449
456
                                                   path_encoding,
450
457
                                                   external_diff_options,
451
 
                                                   old_label, new_label, using)
 
458
                                                   old_label, new_label, using,
 
459
                                                   context_lines=context)
452
460
            return differ.show_diff(specific_files, extra_trees)
453
461
        finally:
454
462
            new_tree.unlock()
612
620
    # or removed in a diff.
613
621
    EPOCH_DATE = '1970-01-01 00:00:00 +0000'
614
622
 
615
 
    def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8',
616
 
                 old_label='', new_label='', text_differ=internal_diff):
 
623
    def __init__(self, old_tree, new_tree, to_file, path_encoding='utf-8', 
 
624
                 old_label='', new_label='', text_differ=internal_diff, 
 
625
                 context_lines=DEFAULT_CONTEXT_AMOUNT):
617
626
        DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
618
627
        self.text_differ = text_differ
619
628
        self.old_label = old_label
620
629
        self.new_label = new_label
621
630
        self.path_encoding = path_encoding
 
631
        self.context_lines = context_lines
622
632
 
623
633
    def diff(self, file_id, old_path, new_path, old_kind, new_kind):
624
634
        """Compare two files in unified diff format
672
682
            from_text = _get_text(self.old_tree, from_file_id, from_path)
673
683
            to_text = _get_text(self.new_tree, to_file_id, to_path)
674
684
            self.text_differ(from_label, from_text, to_label, to_text,
675
 
                             self.to_file, path_encoding=self.path_encoding)
 
685
                             self.to_file, path_encoding=self.path_encoding,
 
686
                             context_lines=self.context_lines)
676
687
        except errors.BinaryFile:
677
688
            self.to_file.write(
678
689
                  ("Binary files %s and %s differ\n" %
902
913
    @classmethod
903
914
    def from_trees_options(klass, old_tree, new_tree, to_file,
904
915
                           path_encoding, external_diff_options, old_label,
905
 
                           new_label, using):
 
916
                           new_label, using, context_lines):
906
917
        """Factory for producing a DiffTree.
907
918
 
908
919
        Designed to accept options used by show_diff_trees.
923
934
            extra_factories = []
924
935
        if external_diff_options:
925
936
            opts = external_diff_options.split()
926
 
            def diff_file(olab, olines, nlab, nlines, to_file, path_encoding=None):
 
937
            def diff_file(olab, olines, nlab, nlines, to_file, path_encoding=None, context_lines=None):
927
938
                """:param path_encoding: not used but required
928
939
                        to match the signature of internal_diff.
929
940
                """
931
942
        else:
932
943
            diff_file = internal_diff
933
944
        diff_text = DiffText(old_tree, new_tree, to_file, path_encoding,
934
 
                             old_label, new_label, diff_file)
 
945
                             old_label, new_label, diff_file, context_lines=context_lines)
935
946
        return klass(old_tree, new_tree, to_file, path_encoding, diff_text,
936
947
                     extra_factories)
937
948