equal
deleted
inserted
replaced
41 help, |
41 help, |
42 hg, |
42 hg, |
43 lock as lockmod, |
43 lock as lockmod, |
44 merge as mergemod, |
44 merge as mergemod, |
45 obsolete, |
45 obsolete, |
|
46 obsutil, |
46 patch, |
47 patch, |
47 phases, |
48 phases, |
48 pycompat, |
49 pycompat, |
49 rcutil, |
50 rcutil, |
50 registrar, |
51 registrar, |
5536 if rev: |
5537 if rev: |
5537 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
5538 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
5538 ctx = scmutil.revsingle(repo, rev, rev) |
5539 ctx = scmutil.revsingle(repo, rev, rev) |
5539 rev = ctx.rev() |
5540 rev = ctx.rev() |
5540 if ctx.hidden(): |
5541 if ctx.hidden(): |
5541 ui.warn(_("updating to a hidden changeset %s\n") % ctx.hex()[:12]) |
5542 ctxstr = ctx.hex()[:12] |
|
5543 ui.warn(_("updating to a hidden changeset %s\n") % ctxstr) |
|
5544 |
|
5545 if ctx.obsolete(): |
|
5546 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx) |
|
5547 ui.warn("(%s)\n" % obsfatemsg) |
5542 |
5548 |
5543 repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
5549 repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
5544 |
5550 |
5545 return hg.updatetotally(ui, repo, rev, brev, clean=clean, |
5551 return hg.updatetotally(ui, repo, rev, brev, clean=clean, |
5546 updatecheck=updatecheck) |
5552 updatecheck=updatecheck) |