[PATCH 20 of 23 v3] rebase: move local variable 'extrafn' to the RRS class

[Kostia Balytskyi]

# HG changeset patch
# User Kostia Balytskyi <ikostia at fb.com>
# Date 1464872513 -3600
#      Thu Jun 02 14:01:53 2016 +0100
# Node ID f40fbb5cd6db44eea0cc46153e6c5c08792593dd
# Parent  40f1a9d56e1b7456a3dc0c353bb498b42bd53e0a
rebase: move local variable 'extrafn' to the RRS class

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -158,6 +158,7 @@
         self.extrafns = [_savegraft]
         if e:
             self.extrafns = [e]
+        self.extrafn = None
 
         self.keepf = opts.get('keep', False)
         self.keepbranchesf = opts.get('keepbranches', False)
@@ -502,7 +503,7 @@
         if rtstate.activebookmark:
             bookmarks.deactivate(repo)
 
-        extrafn = _makeextrafn(rtstate.extrafns)
+        rtstate.extrafn = _makeextrafn(rtstate.extrafns)
 
         rtstate.sortedstate = sorted(rtstate.state)
         total = len(rtstate.sortedstate)
@@ -546,7 +547,8 @@
                     merging = p2 != nullrev
                     editform = cmdutil.mergeeditform(merging, 'rebase')
                     editor = cmdutil.getcommiteditor(editform=editform, **opts)
-                    newnode = concludenode(repo, rev, p1, p2, extrafn=extrafn,
+                    newnode = concludenode(repo, rev, p1, p2,
+                                           extrafn=rtstate.extrafn,
                                            editor=editor,
                                            keepbranches=rtstate.keepbranchesf,
                                            date=rtstate.date)
@@ -607,7 +609,7 @@
             revtoreuse = rtstate.sortedstate[-1]
             newnode = concludenode(repo, revtoreuse, p1, rtstate.external,
                                    commitmsg=commitmsg,
-                                   extrafn=extrafn, editor=editor,
+                                   extrafn=rtstate.extrafn, editor=editor,
                                    keepbranches=rtstate.keepbranchesf,
                                    date=rtstate.date)
             if newnode is None: