D2709: rebase: remove unused argument "state" from rebasenode()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Mar 7 16:15:50 EST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG0f3116c08e65: rebase: remove unused argument "state" from rebasenode() (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2709?vs=6697&id=6704
REVISION DETAIL
https://phab.mercurial-scm.org/D2709
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -485,8 +485,8 @@
try:
ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
'rebase')
- stats = rebasenode(repo, rev, p1, base, self.state,
- self.collapsef, dest, wctx=self.wctx)
+ stats = rebasenode(repo, rev, p1, base, self.collapsef,
+ dest, wctx=self.wctx)
if stats and stats[3] > 0:
if self.wctx.isinmemory():
raise error.InMemoryMergeConflictsError()
@@ -1108,7 +1108,7 @@
repo.dirstate.setbranch(repo[newnode].branch())
return newnode
-def rebasenode(repo, rev, p1, base, state, collapse, dest, wctx):
+def rebasenode(repo, rev, p1, base, collapse, dest, wctx):
'Rebase a single revision rev on top of p1 using base as merge ancestor'
# Merge phase
# Update to destination and merge it with local
To: martinvonz, #hg-reviewers, indygreg
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list