5581 brev = rev |
5581 brev = rev |
5582 if rev: |
5582 if rev: |
5583 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
5583 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
5584 ctx = scmutil.revsingle(repo, rev, rev) |
5584 ctx = scmutil.revsingle(repo, rev, rev) |
5585 rev = ctx.rev() |
5585 rev = ctx.rev() |
5586 if ctx.hidden(): |
5586 hidden = ctx.hidden() |
|
5587 repo.ui.setconfig('ui', 'forcemerge', opts.get(r'tool'), 'update') |
|
5588 |
|
5589 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean, |
|
5590 updatecheck=updatecheck) |
|
5591 if hidden: |
5587 ctxstr = ctx.hex()[:12] |
5592 ctxstr = ctx.hex()[:12] |
5588 ui.warn(_("updating to a hidden changeset %s\n") % ctxstr) |
5593 ui.warn(_("updated to hidden changeset %s\n") % ctxstr) |
5589 |
5594 |
5590 if ctx.obsolete(): |
5595 if ctx.obsolete(): |
5591 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx) |
5596 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx) |
5592 ui.warn("(%s)\n" % obsfatemsg) |
5597 ui.warn("(%s)\n" % obsfatemsg) |
5593 |
5598 return ret |
5594 repo.ui.setconfig('ui', 'forcemerge', opts.get(r'tool'), 'update') |
|
5595 |
|
5596 return hg.updatetotally(ui, repo, rev, brev, clean=clean, |
|
5597 updatecheck=updatecheck) |
|
5598 |
5599 |
5599 @command('verify', []) |
5600 @command('verify', []) |
5600 def verify(ui, repo): |
5601 def verify(ui, repo): |
5601 """verify the integrity of the repository |
5602 """verify the integrity of the repository |
5602 |
5603 |