equal
deleted
inserted
replaced
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) |