Skip to content
Snippets Groups Projects
Commit a2aa39a725a1 authored by Stanislau Hlebik's avatar Stanislau Hlebik
Browse files

rebase: add date parameter to concludenode function

This parameter will allow us to set the date of rebased commits
parent ad443e8d9334
No related branches found
No related tags found
No related merge requests found
......@@ -586,7 +586,7 @@
', '.join(str(p) for p in sorted(parents))))
def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None,
keepbranches=False):
keepbranches=False, date=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.'''
......@@ -608,4 +608,6 @@
if keepbranch:
repo.ui.setconfig('ui', 'allowemptycommit', True)
# Commit might fail if unresolved files exist
if date is None:
date = ctx.date()
newnode = repo.commit(text=commitmsg, user=ctx.user(),
......@@ -611,5 +613,5 @@
newnode = repo.commit(text=commitmsg, user=ctx.user(),
date=ctx.date(), extra=extra, editor=editor)
date=date, extra=extra, editor=editor)
finally:
repo.ui.restoreconfig(backup)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment