comparison mercurial/localrepo.py @ 10396:65a90c8e11ee

prepush: add more precise error messages

Part of the patch is from [e-mail]

- indicate the branch name where there are multiple heads
- give better advice when hitting a possible race, where new heads are added
  between discovery and the call to branchmap(). In that case, asking the user
  to merge isn't helpful, since only remote has the changes.

10395:ea52a2d4f42c

        inc = self.findincoming(remote, common, remote_heads, force=force)

        update, updated_heads = self.findoutgoing(remote, common, remote_heads)
        msng_cl, bases, heads = self.changelog.nodesbetween(update, revs)

        def checkbranch(lheads, rheads, updatelb):
            '''
            check whether there are more local heads than remote heads on
            a specific branch.

            lheads: local branch heads

                        newheads.add(r)
                if len(newheads) > len(rheads):
                    warn = 1

            if warn:
                self.ui.warn(_("abort: push creates new remote heads!\n"))
                self.ui.status(_("(did you forget to merge?"
                                 " use push -f to force)\n"))
                return False
            return True

        if not bases:
            self.ui.status(_("no changes found\n"))

                        self.ui.status(_("(use 'hg push -f' to force)\n"))
                        return None, 0
                    for branch, lheads in localbrheads.iteritems():
                        if branch in remotebrheads:
                            rheads = remotebrheads[branch]
                            if not checkbranch(lheads, rheads, update):
                                return None, 0
                else:
                    if not checkbranch(heads, remote_heads, update):
                        return None, 0

10396:65a90c8e11ee

        inc = self.findincoming(remote, common, remote_heads, force=force)

        update, updated_heads = self.findoutgoing(remote, common, remote_heads)
        msng_cl, bases, heads = self.changelog.nodesbetween(update, revs)

        def checkbranch(lheads, rheads, updatelb, branchname=None):
            '''
            check whether there are more local heads than remote heads on
            a specific branch.

            lheads: local branch heads

                        newheads.add(r)
                if len(newheads) > len(rheads):
                    warn = 1

            if warn:
                if branchname is not None:
                    msg = _("abort: push creates new remote heads"
                            " on branch '%s'!\n") % branchname
                else:
                    msg = _("abort: push creates new remote heads!\n")
                self.ui.warn(msg)
                if len(lheads) > len(rheads):
                    self.ui.status(_("(did you forget to merge?"
                                     " use push -f to force)\n"))
                else:
                    self.ui.status(_("(you should pull and merge or"
                                     " use push -f to force)\n"))
                return False
            return True

        if not bases:
            self.ui.status(_("no changes found\n"))

                        self.ui.status(_("(use 'hg push -f' to force)\n"))
                        return None, 0
                    for branch, lheads in localbrheads.iteritems():
                        if branch in remotebrheads:
                            rheads = remotebrheads[branch]
                            if not checkbranch(lheads, rheads, update, branch):
                                return None, 0
                else:
                    if not checkbranch(heads, remote_heads, update):
                        return None, 0