comparison mercurial/localrepo.py @ 10875:a9702c47a19f stable

partial backout of 1e819576e926 and add tests (issue2131)

The tests are due to Peter Arrenbrecht

10874:4f11978ae45d

            warn = 0

            if len(lheads) > len(rheads):
                warn = 1
            else:
                # add heads we don't have or that are not involved in the push
                newheads = set(lheads)
                for r in rheads:
                    if r in self.changelog.nodemap:
                        desc = self.changelog.heads(r, heads)
                        l = [h for h in heads if h in desc]
                        if not l:

10875:a9702c47a19f

            warn = 0

            if len(lheads) > len(rheads):
                warn = 1
            else:
                # add local heads involved in the push
                updatelheads = [self.changelog.heads(x, lheads)
                                for x in update]
                newheads = set(sum(updatelheads, [])) & set(lheads)

                if not newheads:
                    return True

                # add heads we don't have or that are not involved in the push
                for r in rheads:
                    if r in self.changelog.nodemap:
                        desc = self.changelog.heads(r, heads)
                        l = [h for h in heads if h in desc]
                        if not l: