equal
deleted
inserted
replaced
454 |
454 |
455 def _nothingtoshelvemessaging(ui, repo, pats, opts): |
455 def _nothingtoshelvemessaging(ui, repo, pats, opts): |
456 stat = repo.status(match=scmutil.match(repo[None], pats, opts)) |
456 stat = repo.status(match=scmutil.match(repo[None], pats, opts)) |
457 if stat.deleted: |
457 if stat.deleted: |
458 ui.status( |
458 ui.status( |
459 _(b"nothing changed (%d missing files, see " b"'hg status')\n") |
459 _(b"nothing changed (%d missing files, see 'hg status')\n") |
460 % len(stat.deleted) |
460 % len(stat.deleted) |
461 ) |
461 ) |
462 else: |
462 else: |
463 ui.status(_(b"nothing changed\n")) |
463 ui.status(_(b"nothing changed\n")) |
464 |
464 |
705 |
705 |
706 def checkparents(repo, state): |
706 def checkparents(repo, state): |
707 """check parent while resuming an unshelve""" |
707 """check parent while resuming an unshelve""" |
708 if state.parents != repo.dirstate.parents(): |
708 if state.parents != repo.dirstate.parents(): |
709 raise error.Abort( |
709 raise error.Abort( |
710 _(b'working directory parents do not match unshelve ' b'state') |
710 _(b'working directory parents do not match unshelve state') |
711 ) |
711 ) |
712 |
712 |
713 |
713 |
714 def _loadshelvedstate(ui, repo, opts): |
714 def _loadshelvedstate(ui, repo, opts): |
715 try: |
715 try: |