equal
deleted
inserted
replaced
6036 |
6036 |
6037 # if we defined a bookmark, we have to remember the original name |
6037 # if we defined a bookmark, we have to remember the original name |
6038 brev = rev |
6038 brev = rev |
6039 if rev: |
6039 if rev: |
6040 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
6040 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
6041 ctx = scmutil.revsingle(repo, rev, rev) |
6041 ctx = scmutil.revsingle(repo, rev, default=None) |
6042 rev = ctx.rev() |
6042 rev = ctx.rev() |
6043 hidden = ctx.hidden() |
6043 hidden = ctx.hidden() |
6044 overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')} |
6044 overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')} |
6045 with ui.configoverride(overrides, 'update'): |
6045 with ui.configoverride(overrides, 'update'): |
6046 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean, |
6046 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean, |