hgext/rebase.py

29475:fb7fc877ed17

        e = opts.get('extrafn') # internal, used by e.g. hgsubversion
        self.extrafns = [_savegraft]
        if e:
            self.extrafns = [e]

        self.keepf = opts.get('keep', False)
        self.keepbranchesf = opts.get('keepbranches', False)
        # keepopen is not meant for use on the command line, but by
        # other extensions

        rbsrt.currentbookmarks = repo._bookmarks.copy()
        rbsrt.activebookmark = rbsrt.activebookmark or repo._activebookmark
        if rbsrt.activebookmark:
            bookmarks.deactivate(repo)

        extrafn = _makeextrafn(rbsrt.extrafns)

        rbsrt.sortedstate = sorted(rbsrt.state)
        total = len(rbsrt.sortedstate)
        pos = 0
        for rev in rbsrt.sortedstate:

                        ui.setconfig('ui', 'forcemerge', '', 'rebase')
                if not rbsrt.collapsef:
                    merging = p2 != nullrev
                    editform = cmdutil.mergeeditform(merging, 'rebase')
                    editor = cmdutil.getcommiteditor(editform=editform, **opts)
                    newnode = concludenode(repo, rev, p1, p2, extrafn=extrafn,
                                           editor=editor,
                                           keepbranches=rbsrt.keepbranchesf,
                                           date=rbsrt.date)
                else:
                    # Skip commit if we are collapsing

                editopt = True
            editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
            revtoreuse = rbsrt.sortedstate[-1]
            newnode = concludenode(repo, revtoreuse, p1, rbsrt.external,
                                   commitmsg=commitmsg,
                                   extrafn=extrafn, editor=editor,
                                   keepbranches=rbsrt.keepbranchesf,
                                   date=rbsrt.date)
            if newnode is None:
                newrev = rbsrt.target
            else:

29476:48188ceb3c43

        e = opts.get('extrafn') # internal, used by e.g. hgsubversion
        self.extrafns = [_savegraft]
        if e:
            self.extrafns = [e]
        self.extrafn = None

        self.keepf = opts.get('keep', False)
        self.keepbranchesf = opts.get('keepbranches', False)
        # keepopen is not meant for use on the command line, but by
        # other extensions

        rbsrt.currentbookmarks = repo._bookmarks.copy()
        rbsrt.activebookmark = rbsrt.activebookmark or repo._activebookmark
        if rbsrt.activebookmark:
            bookmarks.deactivate(repo)

        rbsrt.extrafn = _makeextrafn(rbsrt.extrafns)

        rbsrt.sortedstate = sorted(rbsrt.state)
        total = len(rbsrt.sortedstate)
        pos = 0
        for rev in rbsrt.sortedstate:

                        ui.setconfig('ui', 'forcemerge', '', 'rebase')
                if not rbsrt.collapsef:
                    merging = p2 != nullrev
                    editform = cmdutil.mergeeditform(merging, 'rebase')
                    editor = cmdutil.getcommiteditor(editform=editform, **opts)
                    newnode = concludenode(repo, rev, p1, p2,
                                           extrafn=rbsrt.extrafn,
                                           editor=editor,
                                           keepbranches=rbsrt.keepbranchesf,
                                           date=rbsrt.date)
                else:
                    # Skip commit if we are collapsing

                editopt = True
            editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
            revtoreuse = rbsrt.sortedstate[-1]
            newnode = concludenode(repo, revtoreuse, p1, rbsrt.external,
                                   commitmsg=commitmsg,
                                   extrafn=rbsrt.extrafn, editor=editor,
                                   keepbranches=rbsrt.keepbranchesf,
                                   date=rbsrt.date)
            if newnode is None:
                newrev = rbsrt.target
            else: