From patchwork Thu Dec 12 07:26:09 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: record: --user/-u now works with record when ui.username not set
 (issue3857)
From: Prasoon Shukla <prasoon92.iitr@gmail.com>
X-Patchwork-Id: 3213
Message-Id: <CA+c5VvNHNdLzpbnRpq+o50ueM3BKaSXxUFN-K3ZRzkMfTSVbvQ@mail.gmail.com>
To: Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Cc: mercurial-devel@selenic.com
Date: Thu, 12 Dec 2013 12:56:09 +0530

# HG changeset patch
# User Prasoon Shukla <prasoon92.iitr@gmail.com>
# Date 1386831356 -19800
#      Thu Dec 12 12:25:56 2013 +0530
# Node ID 4dd9140ab488f45a5ddc832f26f1f482eebc6cba
# Parent  1c92524c37cdd251c1a36b2da0fb4148b0e6ba09
Collapsed revision
* record: --user/-u now works with record when ui.username not set (issue3857)

The -u flag didn't work when ui.username was not set and resulted in an
abort message. This was fixed.
* merge: updated the patch to not overwrite config, changed the test

The previous version of the patch relied on overwriting the config to
set the username. That was changed. Also, an error with the test was
fixed and another test was added that explicitly checks the username of
the last commit.

diff -r 1c92524c37cd -r 4dd9140ab488 hgext/record.py
--- a/hgext/record.py	Sun Dec 01 21:24:48 2013 -0600
+++ b/hgext/record.py	Thu Dec 12 12:25:56 2013 +0530
@@ -502,7 +502,8 @@
                          cmdsuggest)

     # make sure username is set before going interactive
-    ui.username()
+    if not opts.get('user'):
+        ui.username() # raise exception, username not provided

     def recordfunc(ui, repo, message, match, opts):
         """This is generic record driver.
diff -r 1c92524c37cd -r 4dd9140ab488 tests/test-record.t
--- a/tests/test-record.t	Sun Dec 01 21:24:48 2013 -0600
+++ b/tests/test-record.t	Thu Dec 12 12:25:56 2013 +0530
@@ -1277,5 +1277,23 @@
    c
   +d

+Test --user when ui.username not set
+  $ unset HGUSER
+  $ echo e >> subdir/f1
+  $ hg record  --config ui.username= -d '8 0' --user xyz -m "user flag" <<EOF
+  > y
+  > y
+  > EOF
+  diff --git a/subdir/f1 b/subdir/f1
+  1 hunks, 1 lines changed
+  examine changes to 'subdir/f1'? [Ynesfdaq?]
+  @@ -4,3 +4,4 @@
+   b
+   c
+   d
+  +e
+  record this change to 'subdir/f1'? [Ynesfdaq?]
+  $ hg log --template '{author|user}\n' -l 1
+  xyz

   $ cd ..