comparison hgext/rebase.py @ 15272:2889d4574726

rebase: simplify check for orphaned descendants

15271:84d4a4ce45fd

            rebaseset = [c.rev() for c in revgen]

            if not rebaseset:
                repo.ui.debug('base is ancestor of destination')
                result = None
            if not result:
                # Empty state built, nothing to rebase
                ui.status(_('nothing to rebase\n'))
                return 1
            else:

15272:2889d4574726

            rebaseset = [c.rev() for c in revgen]

            if not rebaseset:
                repo.ui.debug('base is ancestor of destination')
                result = None
            elif not keepf and list(repo.set('first(children(%ld) - %ld)',
                                            rebaseset, rebaseset)):
                raise util.Abort(
                    _("can't remove original changesets with"
                      " unrebased descendants"),
                    hint=_('use --keep to keep original changesets'))
            else:
                result = buildstate(repo, dest, rebaseset, detachf)

            if not result:
                # Empty state built, nothing to rebase
                ui.status(_('nothing to rebase\n'))
                return 1
            else: