Mercurial > hg-stable

changeset 37031:36c4e25c3ce1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: remove unused default argument values from conclude[memory]node() It's only "commitmsg" that we don't always pass. Differential Revision: https://phab.mercurial-scm.org/D2909
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 20 Mar 2018 17:25:16 -0700
parents 81b35d275a60
children dd2833e4d660
files hgext/rebase.py
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py	Tue Mar 20 17:30:08 2018 -0700
+++ b/hgext/rebase.py	Tue Mar 20 17:25:16 2018 -0700
@@ -1026,9 +1026,8 @@
                      (max(destancestors),
                       ', '.join("%d" % p for p in sorted(parents))))
 
-def concludememorynode(repo, rev, p1, p2, wctx=None,
-                       commitmsg=None, editor=None, extrafn=None,
-                       keepbranches=False, date=None):
+def concludememorynode(repo, rev, p1, p2, wctx, editor, extrafn, keepbranches,
+                       date, commitmsg=None):
     '''Commit the memory changes with parents p1 and p2. Reuse commit info from
     rev but also store useful information in extra.
     Return node of committed revision.'''
@@ -1064,8 +1063,8 @@
         wctx.clean() # Might be reused
         return commitres
 
-def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None,
-                 keepbranches=False, date=None):
+def concludenode(repo, rev, p1, p2, editor, extrafn, keepbranches, date,
+                 commitmsg=None):
     '''Commit the wd changes with parents p1 and p2. Reuse commit info from rev
     but also store useful information in extra.
     Return node of committed revision.'''