hgext/rebase.py

28685:6c4d23fe611c

                    hint = _('use "hg rebase --abort" to clear broken state')
                    raise error.Abort(msg, hint=hint)
            if abortf:
                return abort(repo, originalwd, target, state,
                             activebookmark=activebookmark)
        else:
            dest, rebaseset = _definesets(ui, repo, destf, srcf, basef, revf)
            if dest is None:
                return _nothingtorebase()

28686:b212e01fead0

                    hint = _('use "hg rebase --abort" to clear broken state')
                    raise error.Abort(msg, hint=hint)
            if abortf:
                return abort(repo, originalwd, target, state,
                             activebookmark=activebookmark)

            obsoletenotrebased = {}
            if ui.configbool('experimental', 'rebaseskipobsolete',
                             default=True):
                rebaseobsrevs = set([r for r, status in state.items()
                                     if status == revprecursor])
                rebasesetrevs = set(state.keys())
                obsoletenotrebased = _computeobsoletenotrebased(repo,
                                                                rebaseobsrevs,
                                                                target)
                rebaseobsskipped = set(obsoletenotrebased)
                _checkobsrebase(repo, ui, rebaseobsrevs, rebasesetrevs,
                                rebaseobsskipped)
        else:
            dest, rebaseset = _definesets(ui, repo, destf, srcf, basef, revf)
            if dest is None:
                return _nothingtorebase()