/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/merge3.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 10:56:06 UTC
  • mto: This revision was merged to the branch mainline in revision 7030.
  • Revision ID: jelmer@jelmer.uk-20180708105606-d53hkks89qq88twu
Use separate .as_bytes method rather than __bytes__.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge3.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
17
18
 
18
19
# mbp: "you know that thing where cvs gives you conflict markers?"
19
20
# s: "i hate that."
20
21
 
21
 
from bzrlib import (
 
22
from . import (
22
23
    errors,
23
24
    patiencediff,
24
25
    textfile,
52
53
    """
53
54
    if (aend-astart) != (bend-bstart):
54
55
        return False
55
 
    for ia, ib in zip(xrange(astart, aend), xrange(bstart, bend)):
 
56
    for ia, ib in zip(range(astart, aend), range(bstart, bend)):
56
57
        if a[ia] != b[ib]:
57
58
            return False
58
59
    else:
94
95
                    name_a=None,
95
96
                    name_b=None,
96
97
                    name_base=None,
97
 
                    start_marker='<<<<<<<',
98
 
                    mid_marker='=======',
99
 
                    end_marker='>>>>>>>',
 
98
                    start_marker=b'<<<<<<<',
 
99
                    mid_marker=b'=======',
 
100
                    end_marker=b'>>>>>>>',
100
101
                    base_marker=None,
101
102
                    reprocess=False):
102
103
        """Return merge in cvs-like form.
103
104
        """
104
 
        newline = '\n'
 
105
        newline = b'\n'
105
106
        if len(self.a) > 0:
106
 
            if self.a[0].endswith('\r\n'):
107
 
                newline = '\r\n'
108
 
            elif self.a[0].endswith('\r'):
109
 
                newline = '\r'
 
107
            if self.a[0].endswith(b'\r\n'):
 
108
                newline = b'\r\n'
 
109
            elif self.a[0].endswith(b'\r'):
 
110
                newline = b'\r'
110
111
        if base_marker and reprocess:
111
112
            raise errors.CantReprocessAndShowBase()
112
113
        if name_a:
113
 
            start_marker = start_marker + ' ' + name_a
 
114
            start_marker = start_marker + b' ' + name_a
114
115
        if name_b:
115
 
            end_marker = end_marker + ' ' + name_b
 
116
            end_marker = end_marker + b' ' + name_b
116
117
        if name_base and base_marker:
117
 
            base_marker = base_marker + ' ' + name_base
 
118
            base_marker = base_marker + b' ' + name_base
118
119
        merge_regions = self.merge_regions()
119
120
        if reprocess is True:
120
121
            merge_regions = self.reprocess_merge_regions(merge_regions)
463
464
 
464
465
def main(argv):
465
466
    # as for diff3 and meld the syntax is "MINE BASE OTHER"
466
 
    a = file(argv[1], 'rt').readlines()
467
 
    base = file(argv[2], 'rt').readlines()
468
 
    b = file(argv[3], 'rt').readlines()
 
467
    with open(argv[1], 'rt') as f:
 
468
        a = f.readlines()
 
469
    with open(argv[2], 'rt') as f:
 
470
        base = f.readlines()
 
471
    with open(argv[3], 'rt') as f:
 
472
        b = f.readlines()
469
473
 
470
474
    m3 = Merge3(base, a, b)
471
475