|
a/Allura/allura/lib/patience.py |
|
b/Allura/allura/lib/patience.py |
|
... |
|
... |
| 191 |
# sys.stdout.write(''.join(a))
|
191 |
# sys.stdout.write(''.join(a))
|
| 192 |
# print '====', fn_b
|
192 |
# print '====', fn_b
|
| 193 |
# sys.stdout.write(''.join(b))
|
193 |
# sys.stdout.write(''.join(b))
|
| 194 |
sm = SequenceMatcher(None, a, b)
|
194 |
sm = SequenceMatcher(None, a, b)
|
| 195 |
# print 'Patience opcodes:', sm.get_opcodes()
|
195 |
# print 'Patience opcodes:', sm.get_opcodes()
|
| 196 |
print ''.join(unified_diff(a, b))
|
196 |
print ''.join(unified_diff(a, b)) #pragma:printok
|
| 197 |
# for prefix, line in diff_gen(a, b, sm.get_opcodes()):
|
197 |
# for prefix, line in diff_gen(a, b, sm.get_opcodes()):
|
| 198 |
# sys.stdout.write(''.join((prefix, line)))
|
198 |
# sys.stdout.write(''.join((prefix, line)))
|
| 199 |
# sm = difflib.SequenceMatcher(None, a, b)
|
199 |
# sm = difflib.SequenceMatcher(None, a, b)
|
| 200 |
# print 'Difflib opcodes:', sm.get_opcodes()
|
200 |
# print 'Difflib opcodes:', sm.get_opcodes()
|
| 201 |
# for prefix, line in diff_gen(a, b, sm.get_opcodes()):
|
201 |
# for prefix, line in diff_gen(a, b, sm.get_opcodes()):
|