comparison mercurial/subrepo.py @ 13150:8617b8b74fae

subrepo: use low-level git-for-each-ref command in branchmap

This command's output doesn't change across versions, and it also
disambiguates cases where there are slashes in local branch names.

13149:735dd8e8a208

        p.wait()

        if p.returncode != 0 and p.returncode != 1:
            # there are certain error codes that are ok
            command = commands[0]
            if command == 'cat-file':
                return retdata, p.returncode
            # for all others, abort
            raise util.Abort('git %s error %d in %s' %
                             (command, p.returncode, self._relpath))

        the current branch,
        a map from git branch to revision
        a map from revision to branches'''
        branch2rev = {}
        rev2branch = {}
        current = None
        out = self._gitcommand(['branch', '-a', '--no-color',
                                '--verbose', '--no-abbrev'])
        for line in out.split('\n'):
            if line[2:].startswith('(no branch)'):
                continue
            branch, revision = line[2:].split()[:2]
            if revision == '->' or branch.endswith('/HEAD'):
                continue # ignore remote/HEAD redirects
            if '/' in branch and not branch.startswith('remotes/'):
                # old git compatability
                branch = 'remotes/' + branch
            if line[0] == '*':
                current = branch
            branch2rev[branch] = revision
            rev2branch.setdefault(revision, []).append(branch)
        return current, branch2rev, rev2branch

    def _gittracking(self, branches):
        'return map of remote branch to local tracking branch'
        # assumes no more than one local tracking branch for each remote
        tracking = {}
        for b in branches:
            if b.startswith('remotes/'):
                continue
            remote = self._gitcommand(['config', 'branch.%s.remote' % b])
            if remote:
                ref = self._gitcommand(['config', 'branch.%s.merge' % b])
                tracking['remotes/%s/%s' % (remote, ref.split('/')[-1])] = b
        return tracking

    def _fetch(self, source, revision):
        if not os.path.exists('%s/.git' % self._path):
            self._ui.status(_('cloning subrepo %s\n') % self._relpath)

            rawcheckout()
            return
        branches = rev2branch[revision]
        firstlocalbranch = None
        for b in branches:
            if b == 'master':
                # master trumps all other branches
                self._gitcommand(['checkout', 'master'])
                return
            if not firstlocalbranch and not b.startswith('remotes/'):
                firstlocalbranch = b
        if firstlocalbranch:
            self._gitcommand(['checkout', firstlocalbranch])
            return

                    remote = b
                    break

        if remote not in tracking:
            # create a new local tracking branch
            local = remote.split('/')[-1]
            self._gitcommand(['checkout', '-b', local, remote])
        elif self._gitisancestor(branch2rev[tracking[remote]], remote):
            # When updating to a tracked remote branch,
            # if the local tracking branch is downstream of it,
            # a normal `git pull` would have performed a "fast-forward merge"

    def push(self, force):
        # if a branch in origin contains the revision, nothing to do
        current, branch2rev, rev2branch = self._gitbranchmap()
        if self._state[1] in rev2branch:
            for b in rev2branch[self._state[1]]:
                if b.startswith('remotes/origin/'):
                    return True
        for b, revision in branch2rev.iteritems():
            if b.startswith('remotes/origin/'):
                if self._gitisancestor(self._state[1], revision):
                    return True
        # otherwise, try to push the currently checked out branch
        cmd = ['push']
        if force:

            if not self._gitisancestor(self._state[1], current):
                self._ui.warn(_('unrelated git branch checked out '
                                'in subrepo %s\n') % self._relpath)
                return False
            self._ui.status(_('pushing branch %s of subrepo %s\n') %
                            (current, self._relpath))
            self._gitcommand(cmd + ['origin', current])
            return True
        else:
            self._ui.warn(_('no branch checked out in subrepo %s\n'
                            'cannot push revision %s') %

13150:8617b8b74fae

        p.wait()

        if p.returncode != 0 and p.returncode != 1:
            # there are certain error codes that are ok
            command = commands[0]
            if command in ('cat-file', 'symbolic-ref'):
                return retdata, p.returncode
            # for all others, abort
            raise util.Abort('git %s error %d in %s' %
                             (command, p.returncode, self._relpath))

        the current branch,
        a map from git branch to revision
        a map from revision to branches'''
        branch2rev = {}
        rev2branch = {}
        current, err = self._gitdir(['symbolic-ref', 'HEAD', '--quiet'])
        if err:
            current = None

        out = self._gitcommand(['for-each-ref', '--format',
                                '%(objectname) %(refname)'])
        for line in out.split('\n'):
            revision, ref = line.split(' ')
            if ref.startswith('refs/tags/'):
                continue
            if ref.startswith('refs/remotes/') and ref.endswith('/HEAD'):
                continue # ignore remote/HEAD redirects
            branch2rev[ref] = revision
            rev2branch.setdefault(revision, []).append(ref)
        return current, branch2rev, rev2branch

    def _gittracking(self, branches):
        'return map of remote branch to local tracking branch'
        # assumes no more than one local tracking branch for each remote
        tracking = {}
        for b in branches:
            if b.startswith('refs/remotes/'):
                continue
            remote = self._gitcommand(['config', 'branch.%s.remote' % b])
            if remote:
                ref = self._gitcommand(['config', 'branch.%s.merge' % b])
                tracking['refs/remotes/%s/%s' %
                         (remote, ref.split('/', 2)[2])] = b
        return tracking

    def _fetch(self, source, revision):
        if not os.path.exists('%s/.git' % self._path):
            self._ui.status(_('cloning subrepo %s\n') % self._relpath)

            rawcheckout()
            return
        branches = rev2branch[revision]
        firstlocalbranch = None
        for b in branches:
            if b == 'refs/heads/master':
                # master trumps all other branches
                self._gitcommand(['checkout', 'refs/heads/master'])
                return
            if not firstlocalbranch and not b.startswith('refs/remotes/'):
                firstlocalbranch = b
        if firstlocalbranch:
            self._gitcommand(['checkout', firstlocalbranch])
            return

                    remote = b
                    break

        if remote not in tracking:
            # create a new local tracking branch
            local = remote.split('/', 2)[2]
            self._gitcommand(['checkout', '-b', local, remote])
        elif self._gitisancestor(branch2rev[tracking[remote]], remote):
            # When updating to a tracked remote branch,
            # if the local tracking branch is downstream of it,
            # a normal `git pull` would have performed a "fast-forward merge"

    def push(self, force):
        # if a branch in origin contains the revision, nothing to do
        current, branch2rev, rev2branch = self._gitbranchmap()
        if self._state[1] in rev2branch:
            for b in rev2branch[self._state[1]]:
                if b.startswith('refs/remotes/origin/'):
                    return True
        for b, revision in branch2rev.iteritems():
            if b.startswith('refs/remotes/origin/'):
                if self._gitisancestor(self._state[1], revision):
                    return True
        # otherwise, try to push the currently checked out branch
        cmd = ['push']
        if force:

            if not self._gitisancestor(self._state[1], current):
                self._ui.warn(_('unrelated git branch checked out '
                                'in subrepo %s\n') % self._relpath)
                return False
            self._ui.status(_('pushing branch %s of subrepo %s\n') %
                            (current.split('/', 2)[2], self._relpath))
            self._gitcommand(cmd + ['origin', current])
            return True
        else:
            self._ui.warn(_('no branch checked out in subrepo %s\n'
                            'cannot push revision %s') %