/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/textmerge.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/textmerge.py
1
 
# Copyright (C) 2006, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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
17
17
# Author: Martin Pool <mbp@canonical.com>
18
18
#         Aaron Bentley <aaron.bentley@utoronto.ca>
19
19
 
20
 
from __future__ import absolute_import
21
20
 
22
 
from .lazy_import import lazy_import
23
 
lazy_import(globals(), """
24
 
import patiencediff
25
 
""")
 
21
import bzrlib.patiencediff
26
22
 
27
23
 
28
24
class TextMerge(object):
41
37
    """
42
38
    # TODO: Show some version information (e.g. author, date) on conflicted
43
39
    # regions.
44
 
    A_MARKER = b'<<<<<<< \n'
45
 
    B_MARKER = b'>>>>>>> \n'
46
 
    SPLIT_MARKER = b'=======\n'
47
 
 
 
40
    A_MARKER = '<<<<<<< \n'
 
41
    B_MARKER = '>>>>>>> \n'
 
42
    SPLIT_MARKER = '=======\n'
48
43
    def __init__(self, a_marker=A_MARKER, b_marker=B_MARKER,
49
44
                 split_marker=SPLIT_MARKER):
50
45
        self.a_marker = a_marker
136
131
        """Return structured merge info.
137
132
        See TextMerge docstring.
138
133
        """
139
 
        sm = patiencediff.PatienceSequenceMatcher(
140
 
            None, self.lines_a, self.lines_b)
 
134
        sm = bzrlib.patiencediff.PatienceSequenceMatcher(None, self.lines_a, self.lines_b)
141
135
        pos_a = 0
142
136
        pos_b = 0
143
137
        for ai, bi, l in sm.get_matching_blocks():
144
138
            # non-matching lines
145
139
            yield(self.lines_a[pos_a:ai], self.lines_b[pos_b:bi])
146
140
            # matching lines
147
 
            yield(self.lines_a[ai:ai + l],)
 
141
            yield(self.lines_a[ai:ai+l],)
148
142
            pos_a = ai + l
149
143
            pos_b = bi + l
150
144
        # final non-matching lines