comparison mercurial/revlog.py @ 5909:f45f7390c1c5

strip: calculate list of extra nodes to save and pass it to changegroupsubset When we remove revision N from the repository, all revisions >= N are affected: either it's a descendant from N and will also be removed, or it's not a descendant of N and will be renumbered. As a consequence, we have to (at least temporarily) remove all filelog and manifest revisions that have a linkrev >= N, readding some of them later. Unfortunately, it's possible to have a revlog with two revisions r1 and r2 such that r1 < r2, but linkrev(r1) > linkrev(r2). If we try to strip revision linkrev(r1) from the repository, we'll also lose revision r2 when we truncate this revlog. We already use changegroupsubset to create a temporary changegroup containing the revisions that have to be restored, but that function is unable to detect that we also wanted to save the r2 in the case above. So we manually calculate these extra nodes and pass it to changegroupsubset. This should fix issue764.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 19 Jan 2008 18:01:16 -0200
parents 3da652f2039c
children b9a830fa10f6
comparison
equal deleted inserted replaced
5908:afa1e6122be7 5909:f45f7390c1c5
1236 end = self.end(t) 1236 end = self.end(t)
1237 1237
1238 return node 1238 return node
1239 1239
1240 def strip(self, rev, minlink): 1240 def strip(self, rev, minlink):
1241 if self.count() == 0 or rev >= self.count(): 1241 if self.count() == 0:
1242 return 1242 return
1243 1243
1244 if isinstance(self.index, lazyindex): 1244 if isinstance(self.index, lazyindex):
1245 self._loadindexmap() 1245 self._loadindexmap()
1246 1246
1247 # When stripping away a revision, we need to make sure it 1247 for rev in xrange(0, self.count()):
1248 # does not actually belong to an older changeset. 1248 if self.index[rev][4] >= minlink:
1249 # The minlink parameter defines the oldest revision 1249 break
1250 # we're allowed to strip away. 1250 else:
1251 while minlink > self.index[rev][4]: 1251 return
1252 rev += 1
1253 if rev >= self.count():
1254 return
1255 1252
1256 # first truncate the files on disk 1253 # first truncate the files on disk
1257 end = self.start(rev) 1254 end = self.start(rev)
1258 if not self._inline: 1255 if not self._inline:
1259 df = self.opener(self.datafile, "a") 1256 df = self.opener(self.datafile, "a")