/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 breezy/textmerge.py

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:22:34 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7306.
  • Revision ID: jelmer@jelmer.uk-20190529032234-mt3fuws8gq03tapi
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/textmerge.py
21
21
 
22
22
from .lazy_import import lazy_import
23
23
lazy_import(globals(), """
24
 
from breezy import patiencediff
 
24
import patiencediff
25
25
""")
26
26
 
27
27
 
44
44
    A_MARKER = b'<<<<<<< \n'
45
45
    B_MARKER = b'>>>>>>> \n'
46
46
    SPLIT_MARKER = b'=======\n'
 
47
 
47
48
    def __init__(self, a_marker=A_MARKER, b_marker=B_MARKER,
48
49
                 split_marker=SPLIT_MARKER):
49
50
        self.a_marker = a_marker
143
144
            # non-matching lines
144
145
            yield(self.lines_a[pos_a:ai], self.lines_b[pos_b:bi])
145
146
            # matching lines
146
 
            yield(self.lines_a[ai:ai+l],)
 
147
            yield(self.lines_a[ai:ai + l],)
147
148
            pos_a = ai + l
148
149
            pos_b = bi + l
149
150
        # final non-matching lines