Mercurial > hg
comparison hgext/shelve.py @ 28124:983365382465
shelve: suggest the correct tool to continue (not unshelve)
Suggest committing (or whatever the current activity is), via
wrongtooltocontinue which uses howtocontinue.
author | timeless <timeless@mozdev.org> |
---|---|
date | Thu, 04 Feb 2016 03:47:38 +0000 |
parents | 1289a122cf3f |
children | 96a7368a79b6 |
comparison
equal
deleted
inserted
replaced
28123:6c1b7f80f90f | 28124:983365382465 |
---|---|
626 try: | 626 try: |
627 state = shelvedstate.load(repo) | 627 state = shelvedstate.load(repo) |
628 except IOError as err: | 628 except IOError as err: |
629 if err.errno != errno.ENOENT: | 629 if err.errno != errno.ENOENT: |
630 raise | 630 raise |
631 raise error.Abort(_('no unshelve operation underway')) | 631 cmdutil.wrongtooltocontinue(repo, _('unshelve')) |
632 | 632 |
633 if abortf: | 633 if abortf: |
634 return unshelveabort(ui, repo, state, opts) | 634 return unshelveabort(ui, repo, state, opts) |
635 elif continuef: | 635 elif continuef: |
636 return unshelvecontinue(ui, repo, state, opts) | 636 return unshelvecontinue(ui, repo, state, opts) |