Mercurial > public > mercurial-scm > hg
comparison mercurial/state.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 | 5171937ad0f9 |
children | 3bc400ccbf99 |
comparison
equal
deleted
inserted
replaced
42598:8ddfdcce4bd6 | 42599:3fb0493812c0 |
---|---|
192 _unfinishedstates.append(statecheckobj) | 192 _unfinishedstates.append(statecheckobj) |
193 else: | 193 else: |
194 _unfinishedstates.insert(0, statecheckobj) | 194 _unfinishedstates.insert(0, statecheckobj) |
195 | 195 |
196 addunfinished( | 196 addunfinished( |
197 'unshelve', fname='shelvedstate', continueflag=True, | |
198 cmdmsg=_('unshelve already in progress') | |
199 ) | |
200 addunfinished( | |
201 'update', fname='updatestate', clearable=True, | 197 'update', fname='updatestate', clearable=True, |
202 cmdmsg=_('last update was interrupted'), | 198 cmdmsg=_('last update was interrupted'), |
203 cmdhint=_("use 'hg update' to get a consistent checkout"), | 199 cmdhint=_("use 'hg update' to get a consistent checkout"), |
204 statushint=_("To continue: hg update") | 200 statushint=_("To continue: hg update") |
205 ) | 201 ) |