comparison hgext/rebase.py @ 27746:f0e9f38d250f

rebase: prevent creating divergence

Before this patch rebase would create divergence when you were rebasing obsolete
changesets on a destination not containing one of its successors.
This patch introduces rebase.allowdivergence to explicitly allow
divergence creation with rebase.

27745:d3a128e8604a

                                      if repo[r].obsolete())
                obsoletenotrebased = _computeobsoletenotrebased(repo,
                                                                rebaseobsrevs,
                                                                dest)
                rebaseobsskipped = set(obsoletenotrebased)

                # - plain prune (no successor) changesets are rebased
                # - split changesets are not rebased if at least one of the
                # changeset resulting from the split is an ancestor of dest
                rebaseset = rebasesetrevs - rebaseobsskipped

27746:f0e9f38d250f

                                      if repo[r].obsolete())
                obsoletenotrebased = _computeobsoletenotrebased(repo,
                                                                rebaseobsrevs,
                                                                dest)
                rebaseobsskipped = set(obsoletenotrebased)

                # Obsolete node with successors not in dest leads to divergence
                divergenceok = ui.configbool('rebase',
                                             'allowdivergence')
                divergencebasecandidates = rebaseobsrevs - rebaseobsskipped

                if divergencebasecandidates and not divergenceok:
                    msg = _("this rebase will cause divergence")
                    h = _("to force the rebase please set "
                          "rebase.allowdivergence=True")
                    raise error.Abort(msg, hint=h)

                # - plain prune (no successor) changesets are rebased
                # - split changesets are not rebased if at least one of the
                # changeset resulting from the split is an ancestor of dest
                rebaseset = rebasesetrevs - rebaseobsskipped