##// END OF EJS Templates
revlog: make addgroup returns a list of node contained in the added source...
Pierre-Yves David -
r15890:e234eda2 default
parent child Browse files
Show More
@@ -2015,8 +2015,8 b' class localrepository(repo.repository):'
2015 source.callback = pr
2015 source.callback = pr
2016
2016
2017 source.changelogheader()
2017 source.changelogheader()
2018 if (cl.addgroup(source, csmap, trp) is None
2018 srccontent = cl.addgroup(source, csmap, trp)
2019 and not emptyok):
2019 if not (srccontent or emptyok):
2020 raise util.Abort(_("received changelog group is empty"))
2020 raise util.Abort(_("received changelog group is empty"))
2021 clend = len(cl)
2021 clend = len(cl)
2022 changesets = clend - clstart
2022 changesets = clend - clstart
@@ -2064,7 +2064,7 b' class localrepository(repo.repository):'
2064 pr()
2064 pr()
2065 fl = self.file(f)
2065 fl = self.file(f)
2066 o = len(fl)
2066 o = len(fl)
2067 if fl.addgroup(source, revmap, trp) is None:
2067 if not fl.addgroup(source, revmap, trp):
2068 raise util.Abort(_("received file revlog group is empty"))
2068 raise util.Abort(_("received file revlog group is empty"))
2069 revisions += len(fl) - o
2069 revisions += len(fl) - o
2070 files += 1
2070 files += 1
@@ -1131,6 +1131,7 b' class revlog(object):'
1131 """
1131 """
1132
1132
1133 # track the base of the current delta log
1133 # track the base of the current delta log
1134 content = []
1134 node = None
1135 node = None
1135
1136
1136 r = len(self)
1137 r = len(self)
@@ -1161,6 +1162,8 b' class revlog(object):'
1161 deltabase = chunkdata['deltabase']
1162 deltabase = chunkdata['deltabase']
1162 delta = chunkdata['delta']
1163 delta = chunkdata['delta']
1163
1164
1165 content.append(node)
1166
1164 link = linkmapper(cs)
1167 link = linkmapper(cs)
1165 if node in self.nodemap:
1168 if node in self.nodemap:
1166 # this can happen if two branches make the same change
1169 # this can happen if two branches make the same change
@@ -1190,7 +1193,7 b' class revlog(object):'
1190 dfh.close()
1193 dfh.close()
1191 ifh.close()
1194 ifh.close()
1192
1195
1193 return node
1196 return content
1194
1197
1195 def strip(self, minlink, transaction):
1198 def strip(self, minlink, transaction):
1196 """truncate the revlog on the first revision with a linkrev >= minlink
1199 """truncate the revlog on the first revision with a linkrev >= minlink
General Comments 0
You need to be logged in to leave comments. Login now