|
a/Allura/allura/lib/patience.py |
|
b/Allura/allura/lib/patience.py |
|
... |
|
... |
176 |
matching_blocks = list(match_core(self.a, self.b))
|
176 |
matching_blocks = list(match_core(self.a, self.b))
|
177 |
matching_blocks.append((len(self.a), len(self.b), 0))
|
177 |
matching_blocks.append((len(self.a), len(self.b), 0))
|
178 |
self.matching_blocks = sorted(matching_blocks)
|
178 |
self.matching_blocks = sorted(matching_blocks)
|
179 |
return self.matching_blocks
|
179 |
return self.matching_blocks
|
180 |
|
180 |
|
181 |
def test():
|
181 |
def test(): # pragma no cover
|
182 |
if len(sys.argv) == 3:
|
182 |
if len(sys.argv) == 3:
|
183 |
fn_a = sys.argv[1]
|
183 |
fn_a = sys.argv[1]
|
184 |
fn_b = sys.argv[2]
|
184 |
fn_b = sys.argv[2]
|
185 |
else:
|
185 |
else:
|
186 |
fn_a = 'a.c'
|
186 |
fn_a = 'a.c'
|
|
... |
|
... |
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()):
|
202 |
# sys.stdout.write(''.join((prefix, line)))
|
202 |
# sys.stdout.write(''.join((prefix, line)))
|
203 |
|
203 |
|
204 |
if __name__ == '__main__':
|
204 |
if __name__ == '__main__': # pragma no cover
|
205 |
test()
|
205 |
test()
|