--- a/hgext/record.py Fri Dec 13 17:23:02 2013 -0600
+++ b/hgext/record.py Mon Dec 16 12:59:32 2013 -0600
@@ -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.
--- a/mercurial/help/templates.txt Fri Dec 13 17:23:02 2013 -0600
+++ b/mercurial/help/templates.txt Mon Dec 16 12:59:32 2013 -0600
@@ -105,4 +105,4 @@
- Display the contents of the 'extra' field, one per line::
- $ hg log -r 0 --template "{join(extras, '\n')}\n"
+ $ hg log -r 0 --template "{join(extras, '\n')}\n"
--- a/tests/test-module-imports.t Fri Dec 13 17:23:02 2013 -0600
+++ b/tests/test-module-imports.t Mon Dec 16 12:59:32 2013 -0600
@@ -2,6 +2,13 @@
this test on anything earlier.
$ python -c 'import sys ; assert sys.version_info >= (2, 6)' || exit 80
+Virtualenv has a habit of leaving BaseHTTPServer and other modules in
+a place where the import checker is confused about their nature as
+part of the stdlib. Skip the test if BaseHTTPServer's path isn't a
+subpath of sys.prefix.
+
+ $ python -c 'import sys, BaseHTTPServer; assert BaseHTTPServer.__file__.startswith(sys.prefix)' || exit 80
+
$ import_checker="$TESTDIR"/../contrib/import-checker.py
Run the doctests from the import checker, and make sure
it's working correctly.
--- a/tests/test-record.t Fri Dec 13 17:23:02 2013 -0600
+++ b/tests/test-record.t Mon Dec 16 12:59:32 2013 -0600
@@ -1277,5 +1277,25 @@
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}\n' -l 1
+ xyz
+ $ HGUSER="test"
+ $ export HGUSER
$ cd ..