# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 2014-10-29 03:05:19
# Node ID b564330d4b1f7cb55f17a6528acaba4bee17099f
# Parent  ac494b087febf0e00a84ff2a699c0690be2c453c

amend: abort early if no username is configured with evolve enabled (issue4211)

Amend will reuse the original username if a new one is not provided
with -U, but obsolete.createmarkers() only considers ui.username() for
the obsolete marker's metadata. Allowing the metadata field to be
spoofed seems to defeat the point of the field in the first place.
This covers 'evolve amend' and 'ci --amend' with evolve enabled.

Without this, the transaction aborts but the parent changeset is set to -1.  The
corresponding test will be added to evolve separately.

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -2121,6 +2121,11 @@ def commit(ui, repo, commitfunc, pats, o
                       scmutil.match(repo[None], pats, opts), opts)
 
 def amend(ui, repo, commitfunc, old, extra, pats, opts):
+    # amend will reuse the existing user if not specified, but the obsolete
+    # marker creation requires that the current user's name is specified.
+    if obsolete._enabled:
+        ui.username() # raise exception if username not set
+
     ui.note(_('amending changeset %s\n') % old)
     base = old.p1()