comparison mercurial/hg.py @ 17867:c9339efed653 stable

clone: make sure to use "@" as bookmark and "default" as branch (issue3677)

Before this change a bookmark named "default" or a branch named "@" would
cause the wrong changeset to be checked out.

The change in output of test-hardlinks.t is due to the fact that no unneeded
tag lookups for the tags "@" or "default" happen, therefore the cache file is
not created.

17866:75b43843eb4d

            destrepo.ui.setconfig('paths', 'default', defaulturl)

            if update:
                if update is not True:
                    checkout = srcpeer.lookup(update)
                for test in (checkout, '@', 'default', 'tip'):
                    if test is None:
                        continue
                    try:
                        uprev = destrepo.lookup(test)
                        break
                    except error.RepoLookupError:
                        continue
                bn = destrepo[uprev].branch()
                destrepo.ui.status(_("updating to branch %s\n") % bn)
                _update(destrepo, uprev)
                if update in destrepo._bookmarks:
                    bookmarks.setcurrent(destrepo, update)

17867:c9339efed653

            destrepo.ui.setconfig('paths', 'default', defaulturl)

            if update:
                if update is not True:
                    checkout = srcpeer.lookup(update)
                uprev = None
                if checkout is not None:
                    try:
                        uprev = destrepo.lookup(checkout)
                    except error.RepoLookupError:
                        pass
                if uprev is None:
                    try:
                        uprev = destrepo._bookmarks['@']
                    except KeyError:
                        try:
                            uprev = destrepo.branchtip('default')
                        except error.RepoLookupError:
                            uprev = destrepo.lookup('tip')
                bn = destrepo[uprev].branch()
                destrepo.ui.status(_("updating to branch %s\n") % bn)
                _update(destrepo, uprev)
                if update in destrepo._bookmarks:
                    bookmarks.setcurrent(destrepo, update)