mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
config: allow 'user' in .hgrc ui section (issue3169)
This commit is contained in:
parent
ebe51daf93
commit
023b57a106
@ -437,7 +437,7 @@ class ui(object):
|
||||
"""
|
||||
user = os.environ.get("HGUSER")
|
||||
if user is None:
|
||||
user = self.config("ui", "username")
|
||||
user = self.config("ui", ["username", "user"])
|
||||
if user is not None:
|
||||
user = os.path.expandvars(user)
|
||||
if user is None:
|
||||
|
@ -52,15 +52,34 @@
|
||||
abort: no username supplied
|
||||
(use "hg config --edit" to set your username)
|
||||
[255]
|
||||
|
||||
# test alternate config var
|
||||
|
||||
$ echo 1234 > asdf
|
||||
$ echo "[ui]" > .hg/hgrc
|
||||
$ echo "user = Foo Bar II <foo2@bar.com>" >> .hg/hgrc
|
||||
$ hg commit -m commit-1
|
||||
$ hg tip
|
||||
changeset: 4:6f24bfb4c617
|
||||
tag: tip
|
||||
user: Foo Bar II <foo2@bar.com>
|
||||
date: Thu Jan 01 00:00:00 1970 +0000
|
||||
summary: commit-1
|
||||
|
||||
# test no .hg/hgrc (uses generated non-interactive username)
|
||||
|
||||
$ echo space > asdf
|
||||
$ rm .hg/hgrc
|
||||
$ hg commit -m commit-1 2>&1
|
||||
no username found, using '[^']*' instead (re)
|
||||
|
||||
$ echo space > asdf
|
||||
$ echo space2 > asdf
|
||||
$ hg commit -u ' ' -m commit-1
|
||||
transaction abort!
|
||||
rollback completed
|
||||
abort: empty username!
|
||||
[255]
|
||||
|
||||
# don't add tests here, previous test is unstable
|
||||
|
||||
$ cd ..
|
||||
|
Loading…
Reference in New Issue
Block a user