Show More
@@ -127,7 +127,7 b' class bundlerevlog(revlog.revlog):' | |||
|
127 | 127 | |
|
128 | 128 | def addrevision(self, text, transaction, link, p1=None, p2=None, d=None): |
|
129 | 129 | raise NotImplementedError |
|
130 |
def addgroup(self, revs, linkmapper, transaction |
|
|
130 | def addgroup(self, revs, linkmapper, transaction): | |
|
131 | 131 | raise NotImplementedError |
|
132 | 132 | def strip(self, rev, minlink): |
|
133 | 133 | raise NotImplementedError |
@@ -1985,7 +1985,7 b' class localrepository(repo.repository):' | |||
|
1985 | 1985 | self.ui.status(_("adding changesets\n")) |
|
1986 | 1986 | cor = cl.count() - 1 |
|
1987 | 1987 | chunkiter = changegroup.chunkiter(source) |
|
1988 |
if cl.addgroup(chunkiter, csmap, trp |
|
|
1988 | if cl.addgroup(chunkiter, csmap, trp) is None and not emptyok: | |
|
1989 | 1989 | raise util.Abort(_("received changelog group is empty")) |
|
1990 | 1990 | cnr = cl.count() - 1 |
|
1991 | 1991 | changesets = cnr - cor |
@@ -1133,7 +1133,7 b' class revlog(object):' | |||
|
1133 | 1133 | |
|
1134 | 1134 | yield changegroup.closechunk() |
|
1135 | 1135 | |
|
1136 |
def addgroup(self, revs, linkmapper, transaction |
|
|
1136 | def addgroup(self, revs, linkmapper, transaction): | |
|
1137 | 1137 | """ |
|
1138 | 1138 | add a delta group |
|
1139 | 1139 | |
@@ -1170,8 +1170,6 b' class revlog(object):' | |||
|
1170 | 1170 | link = linkmapper(cs) |
|
1171 | 1171 | if node in self.nodemap: |
|
1172 | 1172 | # this can happen if two branches make the same change |
|
1173 | # if unique: | |
|
1174 | # raise RevlogError(_("already have %s") % hex(node[:4])) | |
|
1175 | 1173 | chain = node |
|
1176 | 1174 | continue |
|
1177 | 1175 | delta = buffer(chunk, 80) |
General Comments 0
You need to be logged in to leave comments.
Login now