diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -895,6 +895,7 @@ class localrepository(object): return 0 parents = self.dirstate.parents() + self.destroying() transaction.rollback(self.sopener, self.sjoin('undo'), ui.warn) if os.path.exists(self.join('undo.bookmarks')): util.rename(self.join('undo.bookmarks'), @@ -1379,6 +1380,20 @@ class localrepository(object): lock.release() @unfilteredmethod + def destroying(self): + '''Inform the repository that nodes are about to be destroyed. + Intended for use by strip and rollback, so there's a common + place for anything that has to be done before destroying history. + + This is mostly useful for saving state that is in memory and waiting + to be flushed when the current lock is released. Because a call to + destroyed is imminent, the repo will be invalidated causing those + changes to stay in memory (waiting for the next unlock), or vanish + completely. + ''' + pass + + @unfilteredmethod def destroyed(self, newheadnodes=None): '''Inform the repository that nodes have been destroyed. Intended for use by strip and rollback, so there's a common diff --git a/mercurial/repair.py b/mercurial/repair.py --- a/mercurial/repair.py +++ b/mercurial/repair.py @@ -61,6 +61,7 @@ def strip(ui, repo, nodelist, backup="al # have to consider the effect of the stripped revisions and not revisions # missing because the cache is out-of-date. branchmap.updatecache(repo) + repo.destroying() cl = repo.changelog # TODO handle undo of merge sets