Mercurial > hg
comparison hgext/rebase.py @ 34093:15ec3119d500
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 |
comparison
equal
deleted
inserted
replaced
34092:8a8e7a94ba07 | 34093:15ec3119d500 |
---|---|
196 f.write("%s:%s:%s\n" % (oldrev, newrev, destnode)) | 196 f.write("%s:%s:%s\n" % (oldrev, newrev, destnode)) |
197 repo.ui.debug('rebase status stored\n') | 197 repo.ui.debug('rebase status stored\n') |
198 | 198 |
199 def restorestatus(self): | 199 def restorestatus(self): |
200 """Restore a previously stored status""" | 200 """Restore a previously stored status""" |
201 repo = self.repo | 201 repo = self.repo.unfiltered() |
202 keepbranches = None | 202 keepbranches = None |
203 legacydest = None | 203 legacydest = None |
204 collapse = False | 204 collapse = False |
205 external = nullrev | 205 external = nullrev |
206 activebookmark = None | 206 activebookmark = None |