Mercurial > public > mercurial-scm > hg-stable
diff mercurial/shelve.py @ 42599:3fb0493812c0
abort: added support for unshelve
This patch adds the support for shelve in `hg abort` plan.
For this the logic to load a `shelvedstate` and the error
handling for it had been shifted to a seperate function
`_loadunshelvedstate()`. This returns a tuple with `state` file
and `opts.`
`hgabortunshelve()` has been created for independent calls.
In case abortion of `unshelve` is called via `hg abort` the
`shelvedstate` needs to be loaded seperately. This has been
ensured by `_loadunshelvedstate()`
`hgabortunshelve()` is then registered as `abortfunc` for state
detection API.
Results are shown as tests.
Differential Revision: https://phab.mercurial-scm.org/D6579
| author | Taapas Agrawal <taapas2897@gmail.com> |
|---|---|
| date | Wed, 26 Jun 2019 22:15:07 +0530 |
| parents | 8ddfdcce4bd6 |
| children | 117437f3f541 |
line wrap: on
line diff
--- a/mercurial/shelve.py Wed Jul 10 23:11:55 2019 +0530 +++ b/mercurial/shelve.py Wed Jun 26 22:15:07 2019 +0530 @@ -624,7 +624,30 @@ raise error.Abort(_('working directory parents do not match unshelve ' 'state')) -def unshelveabort(ui, repo, state, opts): +def _loadshelvedstate(ui, repo, opts): + try: + state = shelvedstate.load(repo) + if opts.get('keep') is None: + opts['keep'] = state.keep + except IOError as err: + if err.errno != errno.ENOENT: + raise + cmdutil.wrongtooltocontinue(repo, _('unshelve')) + except error.CorruptedState as err: + ui.debug(pycompat.bytestr(err) + '\n') + if opts.get('continue'): + msg = _('corrupted shelved state file') + hint = _('please run hg unshelve --abort to abort unshelve ' + 'operation') + raise error.Abort(msg, hint=hint) + elif opts.get('abort'): + shelvedstate.clear(repo) + raise error.Abort(_('could not read shelved state file, your ' + 'working copy may be in an unexpected state\n' + 'please update to some commit\n')) + return state + +def unshelveabort(ui, repo, state): """subcommand that abort an in-progress unshelve""" with repo.lock(): try: @@ -642,6 +665,12 @@ shelvedstate.clear(repo) ui.warn(_("unshelve of '%s' aborted\n") % state.name) +def hgabortunshelve(ui, repo): + """logic to abort unshelve using 'hg abort""" + with repo.wlock(): + state = _loadshelvedstate(ui, repo, {'abort' : True}) + return unshelveabort(ui, repo, state) + def mergefiles(ui, repo, wctx, shelvectx): """updates to wctx and merges the changes from shelvectx into the dirstate.""" @@ -665,7 +694,6 @@ if shfile.exists(): shfile.movetobackup() cleanupoldbackups(repo) - def unshelvecontinue(ui, repo, state, opts): """subcommand to continue an in-progress unshelve""" # We're finishing off a merge. First parent is our original @@ -864,29 +892,9 @@ if abortf and opts.get('tool', False): ui.warn(_('tool option will be ignored\n')) - try: - state = shelvedstate.load(repo) - if opts.get('keep') is None: - opts['keep'] = state.keep - except IOError as err: - if err.errno != errno.ENOENT: - raise - cmdutil.wrongtooltocontinue(repo, _('unshelve')) - except error.CorruptedState as err: - ui.debug(pycompat.bytestr(err) + '\n') - if continuef: - msg = _('corrupted shelved state file') - hint = _('please run hg unshelve --abort to abort unshelve ' - 'operation') - raise error.Abort(msg, hint=hint) - elif abortf: - shelvedstate.clear(repo) - raise error.Abort(_('could not read shelved state file, your ' - 'working copy may be in an unexpected state\n' - 'please update to some commit\n')) - + state = _loadshelvedstate(ui, repo, opts) if abortf: - return unshelveabort(ui, repo, state, opts) + return unshelveabort(ui, repo, state) elif continuef: return unshelvecontinue(ui, repo, state, opts) elif len(shelved) > 1: