equal
deleted
inserted
replaced
4876 dirty = any(repo.status()) |
4876 dirty = any(repo.status()) |
4877 node = ctx.node() |
4877 node = ctx.node() |
4878 if node != parent: |
4878 if node != parent: |
4879 if dirty: |
4879 if dirty: |
4880 hint = _("uncommitted changes, use --all to discard all" |
4880 hint = _("uncommitted changes, use --all to discard all" |
4881 " changes, or 'hg update %s' to update") % ctx.rev() |
4881 " changes, or 'hg update %d' to update") % ctx.rev() |
4882 else: |
4882 else: |
4883 hint = _("use --all to revert all files," |
4883 hint = _("use --all to revert all files," |
4884 " or 'hg update %s' to update") % ctx.rev() |
4884 " or 'hg update %d' to update") % ctx.rev() |
4885 elif dirty: |
4885 elif dirty: |
4886 hint = _("uncommitted changes, use --all to discard all changes") |
4886 hint = _("uncommitted changes, use --all to discard all changes") |
4887 else: |
4887 else: |
4888 hint = _("use --all to revert all files") |
4888 hint = _("use --all to revert all files") |
4889 raise error.Abort(msg, hint=hint) |
4889 raise error.Abort(msg, hint=hint) |