/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: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/textmerge.py
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
 
21
from bzrlib.lazy_import import lazy_import
23
22
lazy_import(globals(), """
24
 
import patiencediff
 
23
from bzrlib import patiencediff
25
24
""")
26
25
 
27
26
 
41
40
    """
42
41
    # TODO: Show some version information (e.g. author, date) on conflicted
43
42
    # regions.
44
 
    A_MARKER = b'<<<<<<< \n'
45
 
    B_MARKER = b'>>>>>>> \n'
46
 
    SPLIT_MARKER = b'=======\n'
47
 
 
 
43
    A_MARKER = '<<<<<<< \n'
 
44
    B_MARKER = '>>>>>>> \n'
 
45
    SPLIT_MARKER = '=======\n'
48
46
    def __init__(self, a_marker=A_MARKER, b_marker=B_MARKER,
49
47
                 split_marker=SPLIT_MARKER):
50
48
        self.a_marker = a_marker
144
142
            # non-matching lines
145
143
            yield(self.lines_a[pos_a:ai], self.lines_b[pos_b:bi])
146
144
            # matching lines
147
 
            yield(self.lines_a[ai:ai + l],)
 
145
            yield(self.lines_a[ai:ai+l],)
148
146
            pos_a = ai + l
149
147
            pos_b = bi + l
150
148
        # final non-matching lines