--- a/mercurial/revlog.py Tue Jan 17 11:29:32 2012 +0100
+++ b/mercurial/revlog.py Thu Jan 19 14:34:32 2012 -0600
@@ -403,13 +403,10 @@
def findcommonmissing(self, common=None, heads=None):
"""Return a tuple of the ancestors of common and the ancestors of heads
- that are not ancestors of common.
+ that are not ancestors of common. In revset terminology, we return the
+ tuple:
- More specifically, the second element is a list of nodes N such that
- every N satisfies the following constraints:
-
- 1. N is an ancestor of some node in 'heads'
- 2. N is not an ancestor of any node in 'common'
+ ::common, (::heads) - (::common)
The list is sorted by revision number, meaning it is
topologically sorted.
@@ -1134,6 +1131,7 @@
"""
# track the base of the current delta log
+ content = []
node = None
r = len(self)
@@ -1164,6 +1162,8 @@
deltabase = chunkdata['deltabase']
delta = chunkdata['delta']
+ content.append(node)
+
link = linkmapper(cs)
if node in self.nodemap:
# this can happen if two branches make the same change
@@ -1193,7 +1193,7 @@
dfh.close()
ifh.close()
- return node
+ return content
def strip(self, minlink, transaction):
"""truncate the revlog on the first revision with a linkrev >= minlink
@@ -1207,7 +1207,7 @@
So we truncate the revlog on the first of these revisions, and
trust that the caller has saved the revisions that shouldn't be
- removed and that it'll readd them after this truncation.
+ removed and that it'll re-add them after this truncation.
"""
if len(self) == 0:
return