| hg-reviewers |
This changes the message type of Corruptedstate error in case of hg unshelve --abort
to error.Abort from warning message. This is done so as to avoid the return statement
after the warning.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/shelve.py (8 lines) | |||
| M | tests/test-shelve2.t (4 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| ba466d113981 | cad3dde7a573 | Taapas Agrawal | Jul 10 2019, 1:41 PM |
| except error.CorruptedState as err: | except error.CorruptedState as err: | ||||
| ui.debug(pycompat.bytestr(err) + '\n') | ui.debug(pycompat.bytestr(err) + '\n') | ||||
| if continuef: | if continuef: | ||||
| msg = _('corrupted shelved state file') | msg = _('corrupted shelved state file') | ||||
| hint = _('please run hg unshelve --abort to abort unshelve ' | hint = _('please run hg unshelve --abort to abort unshelve ' | ||||
| 'operation') | 'operation') | ||||
| raise error.Abort(msg, hint=hint) | raise error.Abort(msg, hint=hint) | ||||
| elif abortf: | elif abortf: | ||||
| msg = _('could not read shelved state file, your working copy ' | |||||
| 'may be in an unexpected state\nplease update to some ' | |||||
| 'commit\n') | |||||
| ui.warn(msg) | |||||
| shelvedstate.clear(repo) | shelvedstate.clear(repo) | ||||
| return | 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')) | |||||
| if abortf: | if abortf: | ||||
| return unshelveabort(ui, repo, state, opts) | return unshelveabort(ui, repo, state, opts) | ||||
| elif continuef: | elif continuef: | ||||
| return unshelvecontinue(ui, repo, state, opts) | return unshelvecontinue(ui, repo, state, opts) | ||||
| elif len(shelved) > 1: | elif len(shelved) > 1: | ||||
| raise error.Abort(_('can only unshelve one change at a time')) | raise error.Abort(_('can only unshelve one change at a time')) | ||||
| elif not shelved: | elif not shelved: | ||||
| Unshelve --continue fails with appropriate message if shelvedstate is corrupted | Unshelve --continue fails with appropriate message if shelvedstate is corrupted | ||||
| $ hg unshelve --continue | $ hg unshelve --continue | ||||
| abort: corrupted shelved state file | abort: corrupted shelved state file | ||||
| (please run hg unshelve --abort to abort unshelve operation) | (please run hg unshelve --abort to abort unshelve operation) | ||||
| [255] | [255] | ||||
| Unshelve --abort works with a corrupted shelvedstate | Unshelve --abort works with a corrupted shelvedstate | ||||
| $ hg unshelve --abort | $ hg unshelve --abort | ||||
| could not read shelved state file, your working copy may be in an unexpected state | abort: could not read shelved state file, your working copy may be in an unexpected state | ||||
| please update to some commit | please update to some commit | ||||
| [255] | |||||
| Unshelve --abort fails with appropriate message if there's no unshelve in | Unshelve --abort fails with appropriate message if there's no unshelve in | ||||
| progress | progress | ||||
| $ hg unshelve --abort | $ hg unshelve --abort | ||||
| abort: no unshelve in progress | abort: no unshelve in progress | ||||
| [255] | [255] | ||||
| $ cd .. | $ cd .. | ||||
| Unshelve respects --keep even if user intervention is needed | Unshelve respects --keep even if user intervention is needed | ||||