[PATCH 2 of 4] amend: refactor commit date handling
Yuya Nishihara
yuya at tcha.org
Mon Jan 7 08:33:11 EST 2019
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1546864198 -32400
# Mon Jan 07 21:29:58 2019 +0900
# Node ID 224a7e7feb44b205dcb3900e1a0e003287278640
# Parent 37086867ab18484c093a188851c3847d695c8629
amend: refactor commit date handling
There's no need to parse a date tuple. Just do it for user option.
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -2441,16 +2441,13 @@ def amend(ui, repo, old, extra, pats, op
extra.update(wctx.extra())
user = opts.get('user') or old.user()
- date = opts.get('date') or old.date()
-
- if ui.configbool('rewrite', 'update-timestamp'):
- if opts.get('date'):
- pass
- else:
- date = dateutil.makedate()
-
- # Parse the date to allow comparison between date and old.date()
- date = dateutil.parsedate(date)
+
+ if opts.get('date'):
+ date = dateutil.parsedate(opts.get('date'))
+ elif ui.configbool('rewrite', 'update-timestamp'):
+ date = dateutil.makedate()
+ else:
+ date = old.date()
if len(old.parents()) > 1:
# ctx.files() isn't reliable for merges, so fall back to the
More information about the Mercurial-devel
mailing list