merge: fix a copy detection bug (issue672)
When merging rev1 and rev2, we want to search for copies that happened
in rev1 but not in rev2 and vice-versa. We were starting the search at
rev1/rev2 and then going back, stopping as soon as we reached the revno
of the ancestor, but that can miss some cases (see the new
test-issue672).
Now we calculate the revisions that are ancestors of rev1 or rev2 (but
not both) and make sure the search doesn't stop too early.
Simplified test provided by mpm, based on a test case provided by
Edward Lee.
#!/bin/sh
#
# revlog.parseindex must be able to parse the index file even if
# an index entry is split between two 64k blocks. The ideal test
# would be to create an index file with inline data where
# 64k < size < 64k + 64 (64k is the size of the read buffer, 64 is
# the size of an index entry) and with an index entry starting right
# before the 64k block boundary, and try to read it.
#
# We approximate that by reducing the read buffer to 1 byte.
#
hg init a
cd a
echo abc > foo
hg add foo
hg commit -m 'add foo' -d '1000000 0'
echo >> foo
hg commit -m 'change foo' -d '1000001 0'
hg log -r 0:
cat >> test.py << EOF
from mercurial import changelog, util
from mercurial.node import *
class singlebyteread(object):
def __init__(self, real):
self.real = real
def read(self, size=-1):
if size == 65536:
size = 1
return self.real.read(size)
def __getattr__(self, key):
return getattr(self.real, key)
def opener(*args):
o = util.opener(*args)
def wrapper(*a):
f = o(*a)
return singlebyteread(f)
return wrapper
cl = changelog.changelog(opener('.hg/store'))
print cl.count(), 'revisions:'
for r in xrange(cl.count()):
print short(cl.node(r))
EOF
python test.py