D2922: rebase: look up default date outside of conclude[memory]node()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Mar 21 19:48:50 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG0b1230a5a958: rebase: look up default date outside of conclude[memory]node() (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2922?vs=7185&id=7214
REVISION DETAIL
https://phab.mercurial-scm.org/D2922
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
@@ -446,6 +446,9 @@
ctx = repo[rev]
if commitmsg is None:
commitmsg = ctx.description()
+ date = self.date
+ if date is None:
+ date = ctx.date()
extra = {'rebase_source': ctx.hex()}
for c in self.extrafns:
c(ctx, extra)
@@ -461,14 +464,14 @@
extra=extra,
commitmsg=commitmsg,
editor=editor,
- date=self.date)
+ date=date)
mergemod.mergestate.clean(repo)
else:
newnode = concludenode(repo, ctx, p1, p2,
extra=extra,
commitmsg=commitmsg,
editor=editor,
- date=self.date)
+ date=date)
if newnode is None:
# If it ended up being a no-op commit, then the normal
@@ -1035,9 +1038,6 @@
if wctx.isempty() and not repo.ui.configbool('ui', 'allowemptycommit'):
return None
- if date is None:
- date = ctx.date()
-
# By convention, ``extra['branch']`` (set by extrafn) clobbers
# ``branch`` (used when passing ``--keepbranches``).
branch = repo[p1].branch()
@@ -1060,8 +1060,6 @@
repo.setparents(repo[p1].node(), repo[p2].node())
# Commit might fail if unresolved files exist
- if date is None:
- date = ctx.date()
newnode = repo.commit(text=commitmsg, user=ctx.user(),
date=date, extra=extra, editor=editor)
To: martinvonz, phillco, #hg-reviewers, indygreg
Cc: indygreg, mercurial-devel
More information about the Mercurial-devel
mailing list