Mercurial > hg
comparison mercurial/mdiff.py @ 15657:d976b1ef6760
util: don't mess with builtins to emulate buffer()
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 15 Dec 2011 15:27:11 -0600 |
| parents | eeac5e179243 |
| children | 2e8f4b82c551 |
comparison
equal
deleted
inserted
replaced
| 15656:4f5a78fa4917 | 15657:d976b1ef6760 |
|---|---|
| 316 return "".join(t) | 316 return "".join(t) |
| 317 | 317 |
| 318 def patch(a, bin): | 318 def patch(a, bin): |
| 319 if len(a) == 0: | 319 if len(a) == 0: |
| 320 # skip over trivial delta header | 320 # skip over trivial delta header |
| 321 return buffer(bin, 12) | 321 return util.buffer(bin, 12) |
| 322 return mpatch.patches(a, [bin]) | 322 return mpatch.patches(a, [bin]) |
| 323 | 323 |
| 324 # similar to difflib.SequenceMatcher.get_matching_blocks | 324 # similar to difflib.SequenceMatcher.get_matching_blocks |
| 325 def get_matching_blocks(a, b): | 325 def get_matching_blocks(a, b): |
| 326 return [(d[0], d[2], d[1] - d[0]) for d in bdiff.blocks(a, b)] | 326 return [(d[0], d[2], d[1] - d[0]) for d in bdiff.blocks(a, b)] |