5655 if rev: |
5655 if rev: |
5656 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
5656 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
5657 ctx = scmutil.revsingle(repo, rev, rev) |
5657 ctx = scmutil.revsingle(repo, rev, rev) |
5658 rev = ctx.rev() |
5658 rev = ctx.rev() |
5659 hidden = ctx.hidden() |
5659 hidden = ctx.hidden() |
5660 repo.ui.setconfig('ui', 'forcemerge', opts.get(r'tool'), 'update') |
5660 overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')} |
5661 |
5661 with ui.configoverride(overrides, 'update'): |
5662 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean, |
5662 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean, |
5663 updatecheck=updatecheck) |
5663 updatecheck=updatecheck) |
5664 if hidden: |
5664 if hidden: |
5665 ctxstr = ctx.hex()[:12] |
5665 ctxstr = ctx.hex()[:12] |
5666 ui.warn(_("updated to hidden changeset %s\n") % ctxstr) |
5666 ui.warn(_("updated to hidden changeset %s\n") % ctxstr) |
5667 |
5667 |
5668 if ctx.obsolete(): |
5668 if ctx.obsolete(): |