Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/revlog.py @ 6647:602f7c1ab954
drop superfluous param from revlog.addgroup()
author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
---|---|
date | Thu, 05 Jun 2008 16:25:11 +0200 |
parents | ac0bcd951c2c |
children | 9080f7031f69 |
comparison
equal
deleted
inserted
replaced
6645:37eedb1a1848 | 6647:602f7c1ab954 |
---|---|
1131 else: | 1131 else: |
1132 yield d | 1132 yield d |
1133 | 1133 |
1134 yield changegroup.closechunk() | 1134 yield changegroup.closechunk() |
1135 | 1135 |
1136 def addgroup(self, revs, linkmapper, transaction, unique=0): | 1136 def addgroup(self, revs, linkmapper, transaction): |
1137 """ | 1137 """ |
1138 add a delta group | 1138 add a delta group |
1139 | 1139 |
1140 given a set of deltas, add them to the revision log. the | 1140 given a set of deltas, add them to the revision log. the |
1141 first delta is against its parent, which should be in our | 1141 first delta is against its parent, which should be in our |
1168 for chunk in revs: | 1168 for chunk in revs: |
1169 node, p1, p2, cs = struct.unpack("20s20s20s20s", chunk[:80]) | 1169 node, p1, p2, cs = struct.unpack("20s20s20s20s", chunk[:80]) |
1170 link = linkmapper(cs) | 1170 link = linkmapper(cs) |
1171 if node in self.nodemap: | 1171 if node in self.nodemap: |
1172 # this can happen if two branches make the same change | 1172 # this can happen if two branches make the same change |
1173 # if unique: | |
1174 # raise RevlogError(_("already have %s") % hex(node[:4])) | |
1175 chain = node | 1173 chain = node |
1176 continue | 1174 continue |
1177 delta = buffer(chunk, 80) | 1175 delta = buffer(chunk, 80) |
1178 del chunk | 1176 del chunk |
1179 | 1177 |