##// END OF EJS Templates
rebase: remove unused argument "state" from rebasenode()...
Martin von Zweigbergk -
r36790:0f3116c0 default
parent child Browse files
Show More
@@ -485,8 +485,8 b' class rebaseruntime(object):'
485 try:
485 try:
486 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
486 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
487 'rebase')
487 'rebase')
488 stats = rebasenode(repo, rev, p1, base, self.state,
488 stats = rebasenode(repo, rev, p1, base, self.collapsef,
489 self.collapsef, dest, wctx=self.wctx)
489 dest, wctx=self.wctx)
490 if stats and stats[3] > 0:
490 if stats and stats[3] > 0:
491 if self.wctx.isinmemory():
491 if self.wctx.isinmemory():
492 raise error.InMemoryMergeConflictsError()
492 raise error.InMemoryMergeConflictsError()
@@ -1108,7 +1108,7 b' def concludenode(repo, rev, p1, p2, comm'
1108 repo.dirstate.setbranch(repo[newnode].branch())
1108 repo.dirstate.setbranch(repo[newnode].branch())
1109 return newnode
1109 return newnode
1110
1110
1111 def rebasenode(repo, rev, p1, base, state, collapse, dest, wctx):
1111 def rebasenode(repo, rev, p1, base, collapse, dest, wctx):
1112 'Rebase a single revision rev on top of p1 using base as merge ancestor'
1112 'Rebase a single revision rev on top of p1 using base as merge ancestor'
1113 # Merge phase
1113 # Merge phase
1114 # Update to destination and merge it with local
1114 # Update to destination and merge it with local
General Comments 0
You need to be logged in to leave comments. Login now