[PATCH 1 of 3] rebase: add date parameter to concludenode function
Stanislau Hlebik
stash at fb.com
Tue Nov 3 18:52:14 UTC 2015
# HG changeset patch
# User Stanislau Hlebik <stash at fb.com>
# Date 1445851346 25200
# Mon Oct 26 02:22:26 2015 -0700
# Node ID bb57790670b9c756e8559250fd9c782b8eaa7df5
# Parent cbd04ce641b943ee40b2355b81fc910a7c7a4a88
rebase: add date parameter to concludenode function
This parameter will allow us to set the date of rebased commits
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -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,8 +608,10 @@
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(),
- date=ctx.date(), extra=extra, editor=editor)
+ date=date, extra=extra, editor=editor)
finally:
repo.ui.restoreconfig(backup)
More information about the Mercurial-devel
mailing list