Mercurial > hg

diff hgext/rebase.py @ 34093:15ec3119d500

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: use unfiltered repo when loading state Before this patch, `rebase --abort` may fail to do the cleanup: $ hg rebase --abort rebase aborted (no revision is removed, only broken state is cleared) The added test case makes sure `--abort` works in this case. Differential Revision: https://phab.mercurial-scm.org/D643
author Jun Wu <quark@fb.com>
date Wed, 06 Sep 2017 15:23:19 -0700
parents 8a8e7a94ba07
children 5d45a997d11d
line wrap: on
line diff
--- a/hgext/rebase.py	Wed Sep 06 12:40:00 2017 -0700
+++ b/hgext/rebase.py	Wed Sep 06 15:23:19 2017 -0700
@@ -198,7 +198,7 @@
 
     def restorestatus(self):
         """Restore a previously stored status"""
-        repo = self.repo
+        repo = self.repo.unfiltered()
         keepbranches = None
         legacydest = None
         collapse = False