##// END OF EJS Templates
rebase: remove unused default argument values from conclude[memory]node()...
Martin von Zweigbergk -
r37046:36c4e25c default
parent child Browse files
Show More
@@ -1026,9 +1026,8 b' def externalparent(repo, state, destance'
1026 (max(destancestors),
1026 (max(destancestors),
1027 ', '.join("%d" % p for p in sorted(parents))))
1027 ', '.join("%d" % p for p in sorted(parents))))
1028
1028
1029 def concludememorynode(repo, rev, p1, p2, wctx=None,
1029 def concludememorynode(repo, rev, p1, p2, wctx, editor, extrafn, keepbranches,
1030 commitmsg=None, editor=None, extrafn=None,
1030 date, commitmsg=None):
1031 keepbranches=False, date=None):
1032 '''Commit the memory changes with parents p1 and p2. Reuse commit info from
1031 '''Commit the memory changes with parents p1 and p2. Reuse commit info from
1033 rev but also store useful information in extra.
1032 rev but also store useful information in extra.
1034 Return node of committed revision.'''
1033 Return node of committed revision.'''
@@ -1064,8 +1063,8 b' def concludememorynode(repo, rev, p1, p2'
1064 wctx.clean() # Might be reused
1063 wctx.clean() # Might be reused
1065 return commitres
1064 return commitres
1066
1065
1067 def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None,
1066 def concludenode(repo, rev, p1, p2, editor, extrafn, keepbranches, date,
1068 keepbranches=False, date=None):
1067 commitmsg=None):
1069 '''Commit the wd changes with parents p1 and p2. Reuse commit info from rev
1068 '''Commit the wd changes with parents p1 and p2. Reuse commit info from rev
1070 but also store useful information in extra.
1069 but also store useful information in extra.
1071 Return node of committed revision.'''
1070 Return node of committed revision.'''
General Comments 0
You need to be logged in to leave comments. Login now