comparison mercurial/localrepo.py @ 10353:36b6b5ef7820

prepush: rename variables, refactor

10352:66d954e76ffb

            #
            # New named branches cannot be created without --force.

            if remote_heads != [nullid]:
                if remote.capable('branchmap'):
                    localhds = {}
                    if not revs:
                        localhds = self.branchmap()
                    else:
                        for n in heads:
                            branch = self[n].branch()
                            if branch in localhds:
                                localhds[branch].append(n)
                            else:
                                localhds[branch] = [n]

                    remotehds = remote.branchmap()

                    for lh in localhds:
                        if lh in remotehds:
                            rheads = remotehds[lh]
                        else:
                            rheads = []
                        lheads = localhds[lh]
                        if not checkbranch(lheads, rheads, update):
                            return None, 0
                else:
                    if not checkbranch(heads, remote_heads, update):
                        return None, 0

10353:36b6b5ef7820

            #
            # New named branches cannot be created without --force.

            if remote_heads != [nullid]:
                if remote.capable('branchmap'):
                    remotebrheads = remote.branchmap()

                    if not revs:
                        localbrheads = self.branchmap()
                    else:
                        localbrheads = {}
                        for n in heads:
                            branch = self[n].branch()
                            localbrheads.setdefault(branch, []).append(n)

                    for branch, lheads in localbrheads.iteritems():
                        rheads = remotebrheads.get(branch, [])
                        if not checkbranch(lheads, rheads, update):
                            return None, 0
                else:
                    if not checkbranch(heads, remote_heads, update):
                        return None, 0