Show More
@@ -148,7 +148,6 b' class rebaseruntime(object):' | |||
|
148 | 148 | self.extrafns = [_savegraft] |
|
149 | 149 | if e: |
|
150 | 150 | self.extrafns = [e] |
|
151 | self.extrafn = None | |
|
152 | 151 | |
|
153 | 152 | self.keepf = opts.get('keep', False) |
|
154 | 153 | self.keepbranchesf = opts.get('keepbranches', False) |
@@ -336,8 +335,6 b' class rebaseruntime(object):' | |||
|
336 | 335 | if self.activebookmark: |
|
337 | 336 | bookmarks.deactivate(repo) |
|
338 | 337 | |
|
339 | self.extrafn = _makeextrafn(self.extrafns) | |
|
340 | ||
|
341 | 338 | self.sortedstate = sorted(self.state) |
|
342 | 339 | total = len(self.sortedstate) |
|
343 | 340 | pos = 0 |
@@ -381,7 +378,7 b' class rebaseruntime(object):' | |||
|
381 | 378 | editform = cmdutil.mergeeditform(merging, 'rebase') |
|
382 | 379 | editor = cmdutil.getcommiteditor(editform=editform, **opts) |
|
383 | 380 | newnode = concludenode(repo, rev, p1, p2, |
|
384 | extrafn=self.extrafn, | |
|
381 | extrafn=_makeextrafn(self.extrafns), | |
|
385 | 382 | editor=editor, |
|
386 | 383 | keepbranches=self.keepbranchesf, |
|
387 | 384 | date=self.date) |
@@ -444,7 +441,8 b' class rebaseruntime(object):' | |||
|
444 | 441 | revtoreuse = self.sortedstate[-1] |
|
445 | 442 | newnode = concludenode(repo, revtoreuse, p1, self.external, |
|
446 | 443 | commitmsg=commitmsg, |
|
447 |
extrafn=self.extrafn |
|
|
444 | extrafn=_makeextrafn(self.extrafns), | |
|
445 | editor=editor, | |
|
448 | 446 | keepbranches=self.keepbranchesf, |
|
449 | 447 | date=self.date) |
|
450 | 448 | if newnode is None: |
General Comments 0
You need to be logged in to leave comments.
Login now