| durham |
| hg-reviewers |
Now we have a clear centric place to control whether rbsrt.repo is
unfiltered or not, we can drop unfiltered() in other places.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/rebase.py (16 lines) |
| if tr: | if tr: | ||||
| tr.addfilegenerator('rebasestate', ('rebasestate',), | tr.addfilegenerator('rebasestate', ('rebasestate',), | ||||
| self._writestatus, location='plain') | self._writestatus, location='plain') | ||||
| else: | else: | ||||
| with self.repo.vfs("rebasestate", "w") as f: | with self.repo.vfs("rebasestate", "w") as f: | ||||
| self._writestatus(f) | self._writestatus(f) | ||||
| def _writestatus(self, f): | def _writestatus(self, f): | ||||
| repo = self.repo.unfiltered() | repo = self.repo | ||||
| assert repo.filtername is None | |||||
| f.write(repo[self.originalwd].hex() + '\n') | f.write(repo[self.originalwd].hex() + '\n') | ||||
| # was "dest". we now write dest per src root below. | # was "dest". we now write dest per src root below. | ||||
| f.write('\n') | f.write('\n') | ||||
| f.write(repo[self.external].hex() + '\n') | f.write(repo[self.external].hex() + '\n') | ||||
| f.write('%d\n' % int(self.collapsef)) | f.write('%d\n' % int(self.collapsef)) | ||||
| f.write('%d\n' % int(self.keepf)) | f.write('%d\n' % int(self.keepf)) | ||||
| f.write('%d\n' % int(self.keepbranchesf)) | f.write('%d\n' % int(self.keepbranchesf)) | ||||
| f.write('%s\n' % (self.activebookmark or '')) | f.write('%s\n' % (self.activebookmark or '')) | ||||
| destmap = self.destmap | destmap = self.destmap | ||||
| for d, v in self.state.iteritems(): | for d, v in self.state.iteritems(): | ||||
| oldrev = repo[d].hex() | oldrev = repo[d].hex() | ||||
| if v >= 0: | if v >= 0: | ||||
| newrev = repo[v].hex() | newrev = repo[v].hex() | ||||
| else: | else: | ||||
| newrev = v | newrev = v | ||||
| destnode = repo[destmap[d]].hex() | destnode = repo[destmap[d]].hex() | ||||
| f.write("%s:%s:%s\n" % (oldrev, newrev, destnode)) | f.write("%s:%s:%s\n" % (oldrev, newrev, destnode)) | ||||
| repo.ui.debug('rebase status stored\n') | repo.ui.debug('rebase status stored\n') | ||||
| def restorestatus(self): | def restorestatus(self): | ||||
| """Restore a previously stored status""" | """Restore a previously stored status""" | ||||
| self.prepared = True | self.prepared = True | ||||
| repo = self.repo.unfiltered() | repo = self.repo | ||||
| assert repo.filtername is None | |||||
| keepbranches = None | keepbranches = None | ||||
| legacydest = None | legacydest = None | ||||
| collapse = False | collapse = False | ||||
| external = nullrev | external = nullrev | ||||
| activebookmark = None | activebookmark = None | ||||
| state = {} | state = {} | ||||
| destmap = {} | destmap = {} | ||||
| divhashes = (str(repo[r]) | divhashes = (str(repo[r]) | ||||
| for r in divergencebasecandidates) | for r in divergencebasecandidates) | ||||
| msg = _("this rebase will cause " | msg = _("this rebase will cause " | ||||
| "divergences from: %s") | "divergences from: %s") | ||||
| h = _("to force the rebase please set " | h = _("to force the rebase please set " | ||||
| "experimental.allowdivergence=True") | "experimental.allowdivergence=True") | ||||
| raise error.Abort(msg % (",".join(divhashes),), hint=h) | raise error.Abort(msg % (",".join(divhashes),), hint=h) | ||||
| def successorrevs(repo, rev): | def successorrevs(unfi, rev): | ||||
| """yield revision numbers for successors of rev""" | """yield revision numbers for successors of rev""" | ||||
| unfi = repo.unfiltered() | assert unfi.filtername is None | ||||
| nodemap = unfi.changelog.nodemap | nodemap = unfi.changelog.nodemap | ||||
| for s in obsutil.allsuccessors(unfi.obsstore, [unfi[rev].node()]): | for s in obsutil.allsuccessors(unfi.obsstore, [unfi[rev].node()]): | ||||
| if s in nodemap: | if s in nodemap: | ||||
| yield nodemap[s] | yield nodemap[s] | ||||
| def defineparents(repo, rev, destmap, state, skipped, obsskipped): | def defineparents(repo, rev, destmap, state, skipped, obsskipped): | ||||
| """Return new parents and optionally a merge base for rev being rebased | """Return new parents and optionally a merge base for rev being rebased | ||||
| The destination specified by "dest" cannot always be used directly because | The destination specified by "dest" cannot always be used directly because | ||||
| previously rebase result could affect destination. For example, | previously rebase result could affect destination. For example, | ||||
| D E rebase -r C+D+E -d B | D E rebase -r C+D+E -d B | ||||
| |/ C will be rebased to C' | |/ C will be rebased to C' | ||||
| B C D's new destination will be C' instead of B | B C D's new destination will be C' instead of B | ||||
| |/ E's new destination will be C' instead of B | |/ E's new destination will be C' instead of B | ||||
| A | A | ||||
| The new parents of a merge is slightly more complicated. See the comment | The new parents of a merge is slightly more complicated. See the comment | ||||
| block below. | block below. | ||||
| """ | """ | ||||
| # use unfiltered changelog since successorrevs may return filtered nodes | # use unfiltered changelog since successorrevs may return filtered nodes | ||||
| cl = repo.unfiltered().changelog | assert repo.filtername is None | ||||
| cl = repo.changelog | |||||
| def isancestor(a, b): | def isancestor(a, b): | ||||
| # take revision numbers instead of nodes | # take revision numbers instead of nodes | ||||
| if a == b: | if a == b: | ||||
| return True | return True | ||||
| elif a > b: | elif a > b: | ||||
| return False | return False | ||||
| return cl.isancestor(cl.node(a), cl.node(b)) | return cl.isancestor(cl.node(a), cl.node(b)) | ||||
| def _computeobsoletenotrebased(repo, rebaseobsrevs, destmap): | def _computeobsoletenotrebased(repo, rebaseobsrevs, destmap): | ||||
| """return a mapping obsolete => successor for all obsolete nodes to be | """return a mapping obsolete => successor for all obsolete nodes to be | ||||
| rebased that have a successors in the destination | rebased that have a successors in the destination | ||||
| obsolete => None entries in the mapping indicate nodes with no successor""" | obsolete => None entries in the mapping indicate nodes with no successor""" | ||||
| obsoletenotrebased = {} | obsoletenotrebased = {} | ||||
| cl = repo.unfiltered().changelog | assert repo.filtername is None | ||||
| cl = repo.changelog | |||||
| nodemap = cl.nodemap | nodemap = cl.nodemap | ||||
| for srcrev in rebaseobsrevs: | for srcrev in rebaseobsrevs: | ||||
| srcnode = cl.node(srcrev) | srcnode = cl.node(srcrev) | ||||
| destnode = cl.node(destmap[srcrev]) | destnode = cl.node(destmap[srcrev]) | ||||
| # XXX: more advanced APIs are required to handle split correctly | # XXX: more advanced APIs are required to handle split correctly | ||||
| successors = list(obsutil.allsuccessors(repo.obsstore, [srcnode])) | successors = list(obsutil.allsuccessors(repo.obsstore, [srcnode])) | ||||
| if len(successors) == 1: | if len(successors) == 1: | ||||
| # obsutil.allsuccessors includes node itself. When the list only | # obsutil.allsuccessors includes node itself. When the list only | ||||