Mercurial > hg-stable
comparison mercurial/commands.py @ 41130:074c72a38423
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 07 Jan 2019 19:03:23 -0500 |
| parents | 5967995c32bb fbd5e2f0bba7 |
| children | 08dd462ea782 |
comparison
equal
deleted
inserted
replaced
| 41129:d8f5c615e811 | 41130:074c72a38423 |
|---|---|
| 6096 | 6096 |
| 6097 # if we defined a bookmark, we have to remember the original name | 6097 # if we defined a bookmark, we have to remember the original name |
| 6098 brev = rev | 6098 brev = rev |
| 6099 if rev: | 6099 if rev: |
| 6100 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') | 6100 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
| 6101 ctx = scmutil.revsingle(repo, rev, rev) | 6101 ctx = scmutil.revsingle(repo, rev, default=None) |
| 6102 rev = ctx.rev() | 6102 rev = ctx.rev() |
| 6103 hidden = ctx.hidden() | 6103 hidden = ctx.hidden() |
| 6104 overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')} | 6104 overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')} |
| 6105 with ui.configoverride(overrides, 'update'): | 6105 with ui.configoverride(overrides, 'update'): |
| 6106 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean, | 6106 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean, |