##// END OF EJS Templates
fetch: do not count inactive branches when inferring a merge...
fetch: do not count inactive branches when inferring a merge The fetch extension would erroneously consider inactive branches when inferring which branches to merge. It now considers only active branches.

File last commit:

r7471:94ecd492 default
r7854:423b4482 default
Show More
test-bdiff
54 lines | 1.2 KiB | text/plain | TextLexer
mpm@selenic.com
Add a fast binary diff extension (not yet used)...
r400 #!/usr/bin/env python
Benoit Boissinot
bdiff: normalize the diff (issue1295)...
r7104 import sys, struct
mpm@selenic.com
Add a fast binary diff extension (not yet used)...
r400 from mercurial import bdiff, mpatch
def test1(a, b):
d = bdiff.bdiff(a, b)
c = a
if d:
c = mpatch.patches(a, [d])
if c != b:
Benoit Boissinot
use repr() instead of backticks
r7471 print "***", repr(a), repr(b)
mpm@selenic.com
Add a fast binary diff extension (not yet used)...
r400 print "bad:"
Benoit Boissinot
use repr() instead of backticks
r7471 print repr(c)[:200]
print repr(d)
mpm@selenic.com
Add a fast binary diff extension (not yet used)...
r400
def test(a, b):
Benoit Boissinot
use repr() instead of backticks
r7471 print "***", repr(a), repr(b)
mpm@selenic.com
Add a fast binary diff extension (not yet used)...
r400 test1(a, b)
test1(b, a)
test("a\nc\n\n\n\n", "a\nb\n\n\n")
test("a\nb\nc\n", "a\nc\n")
test("", "")
test("a\nb\nc", "a\nb\nc")
test("a\nb\nc\nd\n", "a\nd\n")
test("a\nb\nc\nd\n", "a\nc\ne\n")
test("a\nb\nc\n", "a\nc\n")
test("a\n", "c\na\nb\n")
test("a\n", "")
test("a\n", "b\nc\n")
test("a\n", "c\na\n")
test("", "adjfkjdjksdhfksj")
test("", "ab")
test("", "abc")
test("a", "a")
test("ab", "ab")
test("abc", "abc")
test("a\n", "a\n")
test("a\nb", "a\nb")
Benoit Boissinot
bdiff: normalize the diff (issue1295)...
r7104 #issue1295
def showdiff(a, b):
bin = bdiff.bdiff(a, b)
pos = 0
while pos < len(bin):
p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12])
pos += 12
print p1, p2, repr(bin[pos:pos + l])
pos += l
showdiff("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\nx\n\nz\n")
showdiff("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\ny\n\nx\n\nz\n")
mpm@selenic.com
Add a fast binary diff extension (not yet used)...
r400 print "done"