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

  • Committer: Martin
  • Date: 2018-11-16 19:09:31 UTC
  • mfrom: (7175 work)
  • mto: This revision was merged to the branch mainline in revision 7177.
  • Revision ID: gzlist@googlemail.com-20181116190931-rmh7pk2an1zuecby
Merge trunk to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/patiencediff.py
89
89
            yield '+++ %s%s%s' % (tofile, tofiledate, lineterm)
90
90
            started = True
91
91
        i1, i2, j1, j2 = group[0][1], group[-1][2], group[0][3], group[-1][4]
92
 
        yield "@@ -%d,%d +%d,%d @@%s" % (i1+1, i2-i1, j1+1, j2-j1, lineterm)
 
92
        yield "@@ -%d,%d +%d,%d @@%s" % (i1 + 1, i2 - i1, j1 + 1, j2 - j1, lineterm)
93
93
        for tag, i1, i2, j1, j2 in group:
94
94
            if tag == 'equal':
95
95
                for line in a[i1:i2]:
147
147
        sequencematcher = difflib.SequenceMatcher
148
148
 
149
149
    if fromfiledate:
150
 
        fromfiledate = b'\t' + byes(fromfiledate)
 
150
        fromfiledate = b'\t' + bytes(fromfiledate)
151
151
    if tofiledate:
152
152
        tofiledate = b'\t' + bytes(tofiledate)
153
153
 
158
158
            yield b'+++ %s%s%s' % (tofile, tofiledate, lineterm)
159
159
            started = True
160
160
        i1, i2, j1, j2 = group[0][1], group[-1][2], group[0][3], group[-1][4]
161
 
        yield b"@@ -%d,%d +%d,%d @@%s" % (i1+1, i2-i1, j1+1, j2-j1, lineterm)
 
161
        yield b"@@ -%d,%d +%d,%d @@%s" % (i1 + 1, i2 - i1, j1 + 1, j2 - j1, lineterm)
162
162
        for tag, i1, i2, j1, j2 in group:
163
163
            if tag == 'equal':
164
164
                for line in a[i1:i2]:
194
194
 
195
195
    # TODO: Include fromfiledate and tofiledate
196
196
    return unified_diff_bytes(file_a.readlines(), file_b.readlines(),
197
 
                        fromfile=a, tofile=b,
198
 
                        sequencematcher=sequencematcher)
 
197
                              fromfile=a, tofile=b,
 
198
                              sequencematcher=sequencematcher)
199
199
 
200
200
 
201
201
try:
221
221
    p.add_option('--difflib', dest='matcher', action='store_const', const='difflib',
222
222
                 default='patience', help='Use python\'s difflib algorithm')
223
223
 
224
 
    algorithms = {'patience':PatienceSequenceMatcher, 'difflib':difflib.SequenceMatcher}
 
224
    algorithms = {'patience': PatienceSequenceMatcher,
 
225
                  'difflib': difflib.SequenceMatcher}
225
226
 
226
227
    (opts, args) = p.parse_args(args)
227
228
    matcher = algorithms[opts.matcher]