Show More
@@ -87,17 +87,6 b' def _savegraft(ctx, extra):' | |||
|
87 | 87 | def _savebranch(ctx, extra): |
|
88 | 88 | extra['branch'] = ctx.branch() |
|
89 | 89 | |
|
90 | def _makeextrafn(copiers): | |
|
91 | """make an extrafn out of the given copy-functions. | |
|
92 | ||
|
93 | A copy function takes a context and an extra dict, and mutates the | |
|
94 | extra dict as needed based on the given context. | |
|
95 | """ | |
|
96 | def extrafn(ctx, extra): | |
|
97 | for c in copiers: | |
|
98 | c(ctx, extra) | |
|
99 | return extrafn | |
|
100 | ||
|
101 | 90 | def _destrebase(repo, sourceset, destspace=None): |
|
102 | 91 | """small wrapper around destmerge to pass the right extra args |
|
103 | 92 | |
@@ -457,10 +446,9 b' class rebaseruntime(object):' | |||
|
457 | 446 | ctx = repo[rev] |
|
458 | 447 | if commitmsg is None: |
|
459 | 448 | commitmsg = ctx.description() |
|
460 | extrafn = _makeextrafn(self.extrafns) | |
|
461 | 449 | extra = {'rebase_source': ctx.hex()} |
|
462 |
|
|
|
463 |
|
|
|
450 | for c in self.extrafns: | |
|
451 | c(ctx, extra) | |
|
464 | 452 | if self.inmemory: |
|
465 | 453 | newnode = concludememorynode(repo, ctx, p1, p2, |
|
466 | 454 | wctx=self.wctx, |
General Comments 0
You need to be logged in to leave comments.
Login now