equal
deleted
inserted
replaced
4586 if not opts.get('rev') and p2 != nullid: |
4586 if not opts.get('rev') and p2 != nullid: |
4587 # revert after merge is a trap for new users (issue2915) |
4587 # revert after merge is a trap for new users (issue2915) |
4588 raise error.Abort(_('uncommitted merge with no revision specified'), |
4588 raise error.Abort(_('uncommitted merge with no revision specified'), |
4589 hint=_("use 'hg update' or see 'hg help revert'")) |
4589 hint=_("use 'hg update' or see 'hg help revert'")) |
4590 |
4590 |
4591 ctx = scmutil.revsingle(repo, opts.get('rev')) |
4591 rev = opts.get('rev') |
|
4592 if rev: |
|
4593 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
4594 ctx = scmutil.revsingle(repo, rev) |
4592 |
4595 |
4593 if (not (pats or opts.get('include') or opts.get('exclude') or |
4596 if (not (pats or opts.get('include') or opts.get('exclude') or |
4594 opts.get('all') or opts.get('interactive'))): |
4597 opts.get('all') or opts.get('interactive'))): |
4595 msg = _("no files or directories specified") |
4598 msg = _("no files or directories specified") |
4596 if p2 != nullid: |
4599 if p2 != nullid: |