equal
deleted
inserted
replaced
5526 if date: |
5526 if date: |
5527 rev = cmdutil.finddate(ui, repo, date) |
5527 rev = cmdutil.finddate(ui, repo, date) |
5528 |
5528 |
5529 # if we defined a bookmark, we have to remember the original name |
5529 # if we defined a bookmark, we have to remember the original name |
5530 brev = rev |
5530 brev = rev |
5531 rev = scmutil.revsingle(repo, rev, rev).rev() |
5531 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
5532 ctx = scmutil.revsingle(repo, rev, rev) |
|
5533 rev = ctx.rev() |
|
5534 if ctx.hidden(): |
|
5535 ui.warn(_("updating to a hidden changeset %s\n") % ctx.hex()[:12]) |
5532 |
5536 |
5533 repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
5537 repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
5534 |
5538 |
5535 return hg.updatetotally(ui, repo, rev, brev, clean=clean, |
5539 return hg.updatetotally(ui, repo, rev, brev, clean=clean, |
5536 updatecheck=updatecheck) |
5540 updatecheck=updatecheck) |