split: fix the --user option
The option ended up being ignored.
--- a/hgext3rd/evolve/evocommands.py Sun Jul 23 07:33:36 2017 +0200
+++ b/hgext3rd/evolve/evocommands.py Sun Jul 23 17:06:27 2017 +0200
@@ -812,7 +812,8 @@
msg += ctx.description()
opts['message'] = msg
opts['edit'] = True
- opts['user'] = ctx.user()
+ if not opts['user']:
+ opts['user'] = ctx.user()
while haschanges():
pats = ()
cmdutil.dorecord(ui, repo, commands.commit, 'commit', False,
--- a/tests/test-split.t Sun Jul 23 07:33:36 2017 +0200
+++ b/tests/test-split.t Sun Jul 23 17:06:27 2017 +0200
@@ -270,7 +270,7 @@
~ date: Thu Jan 01 00:00:00 1970 +0000
summary: split1
- $ hg split <<EOF
+ $ hg split --user victor <<EOF
> y
> y
> n
@@ -297,17 +297,17 @@
created new head
Done splitting? [yN] y
$ hg glog -r "14::"
- @ changeset: 19:60ea019b0f8d
+ @ changeset: 19:452a26648478
| bookmark: bookA
| bookmark: bookB
| tag: tip
- | user: test
+ | user: victor
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: split6
|
- o changeset: 18:2c7a2e53f23b
+ o changeset: 18:1315679b77dc
| parent: 14:3f134f739075
- | user: test
+ | user: victor
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: split5
|
@@ -317,8 +317,8 @@
summary: split1
$ hg book
- bookA 19:60ea019b0f8d
- * bookB 19:60ea019b0f8d
+ bookA 19:452a26648478
+ * bookB 19:452a26648478
Lastest revision is selected if multiple are given to -r
$ hg split -r "desc(_a)::"
@@ -401,7 +401,7 @@
$ hg add babar celeste
$ hg commit -m "Works on mytopic" babar celeste
$ hg summary
- parent: 21:615c369f47f0 tip
+ parent: 21:0a160c9fe1dd tip
Works on mytopic
branch: new-branch
commit: 2 unknown (clean)
@@ -448,15 +448,15 @@
Check that the topic is still here
$ hg log -r "tip~1::"
- changeset: 22:f879ab83f991
+ changeset: 22:addcf498f19e
branch: new-branch
topic: mytopic
- parent: 20:89e64a2c68b3
+ parent: 20:fdb403258632
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: split7
- changeset: 23:db75dbc1a3a6
+ changeset: 23:2532b288af61
branch: new-branch
tag: tip
topic: mytopic