This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9638

clone: update to active bookmark, if set
ClosedPublic

Authored by danchr on Dec 20 2020, 1:34 PM.

Details

Reviewers
pulkit
marmoute
Group Reviewers
hg-reviewers
Commits
rHG72007a9ac064: clone: update to active bookmark, if set
Summary

This cannot happen during a normal Mercurial clone, but is useful for extensions like hg-git where we know what to check out — the Git HEAD — but do not wish to track it later on using the @ bookmark.

Test Plan

I have not included an explicit test, as this is much more easily tested within the hg-git test suite.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

danchr created this revision.Dec 20 2020, 1:34 PM
danchr edited the summary of this revision. (Show Details)Dec 22 2020, 7:29 AM
danchr edited the test plan for this revision. (Show Details)
danchr edited the summary of this revision. (Show Details)
pulkit accepted this revision.Jan 2 2021, 11:19 AM
This revision is now accepted and ready to land.Jan 2 2021, 11:19 AM
marmoute accepted this revision.Jan 7 2021, 6:24 PM
marmoute added a subscriber: marmoute.

This looks good to me.

Revision Contents
Changeset List

PathPackages
Mmercurial/hg.py (14 lines)

Diff 24687

mercurial/hg.py

else: else:
if update is not True: if update is not True:
try: try:
uprev = destrepo.lookup(update) uprev = destrepo.lookup(update)
except error.RepoLookupError: except error.RepoLookupError:
pass pass
if uprev is None: if uprev is None:
try: try:
if destrepo._activebookmark:
uprev = destrepo.lookup(destrepo._activebookmark)
update = destrepo._activebookmark
else:
uprev = destrepo._bookmarks[b'@'] uprev = destrepo._bookmarks[b'@']
update = b'@' update = b'@'
bn = destrepo[uprev].branch() bn = destrepo[uprev].branch()
if bn == b'default': if bn == b'default':
status = _(b"updating to bookmark @\n") status = _(b"updating to bookmark %s\n" % update)
else: else:
status = ( status = (
_(b"updating to bookmark @ on branch %s\n") % bn _(b"updating to bookmark %s on branch %s\n")
) ) % (update, bn)
except KeyError: except KeyError:
try: try:
uprev = destrepo.branchtip(b'default') uprev = destrepo.branchtip(b'default')
except error.RepoLookupError: except error.RepoLookupError:
uprev = destrepo.lookup(b'tip') uprev = destrepo.lookup(b'tip')
if not status: if not status:
bn = destrepo[uprev].branch() bn = destrepo[uprev].branch()
status = _(b"updating to branch %s\n") % bn status = _(b"updating to branch %s\n") % bn