This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6636

unshelve: changed Corruptedstate error msg from ui.warn to error.Abort
ClosedPublic

Authored by taapas1128 on Jul 10 2019, 2:20 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8ddfdcce4bd6: unshelve: changed Corruptedstate error msg from ui.warn to error.Abort
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

taapas1128 created this revision.Jul 10 2019, 2:20 PM
pulkit accepted this revision.Jul 10 2019, 2:47 PM
This revision is now accepted and ready to land.Jul 10 2019, 2:47 PM
pulkit added a comment.Jul 10 2019, 2:51 PM

This is fone so as to avoid the return statement

s/fone/done in flight

mercurial/shelve.py
884–886

will fix this indentation in flight.

taapas1128 edited the summary of this revision. (Show Details)Jul 10 2019, 3:35 PM
taapas1128 added a child revision: D6579: abort: added support for unshelve.
taapas1128 updated this revision to Diff 15865.
taapas1128 added a comment.Jul 10 2019, 3:41 PM

Fixed the message.

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (8 lines)
Mtests/test-shelve2.t (4 lines)

Diff 15865

mercurial/shelve.py

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'))
pulkitUnsubmitted
Not Done

will fix this indentation in flight.

pulkit: will fix this indentation in flight.
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:

tests/test-shelve2.t

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