--- a/mercurial/bundlerepo.py Tue Jun 03 09:34:14 2008 +0200
+++ b/mercurial/bundlerepo.py Thu Jun 05 16:25:11 2008 +0200
@@ -127,7 +127,7 @@
def addrevision(self, text, transaction, link, p1=None, p2=None, d=None):
raise NotImplementedError
- def addgroup(self, revs, linkmapper, transaction, unique=0):
+ def addgroup(self, revs, linkmapper, transaction):
raise NotImplementedError
def strip(self, rev, minlink):
raise NotImplementedError
--- a/mercurial/localrepo.py Tue Jun 03 09:34:14 2008 +0200
+++ b/mercurial/localrepo.py Thu Jun 05 16:25:11 2008 +0200
@@ -1985,7 +1985,7 @@
self.ui.status(_("adding changesets\n"))
cor = cl.count() - 1
chunkiter = changegroup.chunkiter(source)
- if cl.addgroup(chunkiter, csmap, trp, 1) is None and not emptyok:
+ if cl.addgroup(chunkiter, csmap, trp) is None and not emptyok:
raise util.Abort(_("received changelog group is empty"))
cnr = cl.count() - 1
changesets = cnr - cor
--- a/mercurial/revlog.py Tue Jun 03 09:34:14 2008 +0200
+++ b/mercurial/revlog.py Thu Jun 05 16:25:11 2008 +0200
@@ -1133,7 +1133,7 @@
yield changegroup.closechunk()
- def addgroup(self, revs, linkmapper, transaction, unique=0):
+ def addgroup(self, revs, linkmapper, transaction):
"""
add a delta group
@@ -1170,8 +1170,6 @@
link = linkmapper(cs)
if node in self.nodemap:
# this can happen if two branches make the same change
- # if unique:
- # raise RevlogError(_("already have %s") % hex(node[:4]))
chain = node
continue
delta = buffer(chunk, 80)