Mercurial > evolve
changeset 4296:b8cb1bdbc8d7
branching: merge with stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 13 Dec 2018 17:26:26 +0100 |
| parents | db87432df8de (current diff) 09337aae08d4 (diff) |
| children | a98fa6c0d4f3 |
| files | CHANGELOG tests/test-topic-stack.t tests/test-wireproto.t |
| diffstat | 4 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Wed Dec 12 01:19:30 2018 +0800 +++ b/CHANGELOG Thu Dec 13 17:26:26 2018 +0100 @@ -13,7 +13,13 @@ * topics: improve the message around topic changing * stack: introduce a --children flag (see help for details) -8.3.2 --2017-11-27 +8.3.3 - in progress +------------------- + + * test: avoid leaking `hg serve` process + * topic: fix error message for the `ngtip` revset + +8.3.2 -- 2017-11-27 ------------------- * evolve: not longer attempt to translate revision's descriptions (issue6016)
--- a/hgext3rd/topic/revset.py Wed Dec 12 01:19:30 2018 +0800 +++ b/hgext3rd/topic/revset.py Thu Dec 13 17:26:26 2018 +0100 @@ -82,9 +82,9 @@ Name is horrible so that people change it. """ - args = revset.getargs(x, 1, 1, 'topic takes one') + args = revset.getargs(x, 1, 1, 'ngtip takes one argument') # match a specific topic - branch = revset.getstring(args[0], 'ngtip() argument must be a string') + branch = revset.getstring(args[0], 'ngtip requires a string') if branch == '.': branch = repo['.'].branch() return subset & revset.baseset(destination.ngtip(repo, branch)) @@ -95,8 +95,9 @@ This is roughly equivalent to 'topic(.) - obsolete' with a sorting moving unstable changeset after there future parent (as if evolve where already - run).""" - err = 'stack() takes no argument, it works on current topic' + run). + """ + err = 'stack takes no arguments, it works on current topic' revset.getargs(x, 0, 0, err) topic = None branch = None
--- a/tests/test-topic-stack.t Wed Dec 12 01:19:30 2018 +0800 +++ b/tests/test-topic-stack.t Thu Dec 13 17:26:26 2018 +0100 @@ -366,11 +366,11 @@ 5 default {foo} draft c_f $ hg log -r 'stack(foo)' - hg: parse error: stack() takes no argument, it works on current topic + hg: parse error: stack takes no arguments, it works on current topic [255] $ hg log -r 'stack(foobar)' - hg: parse error: stack() takes no argument, it works on current topic + hg: parse error: stack takes no arguments, it works on current topic [255] Case with multiple heads on the topic
--- a/tests/test-wireproto.t Wed Dec 12 01:19:30 2018 +0800 +++ b/tests/test-wireproto.t Thu Dec 13 17:26:26 2018 +0100 @@ -230,6 +230,7 @@ $ $RUNTESTDIR/killdaemons.py $DAEMON_PIDS $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log --config experimental.evolution='!' + $ cat hg.pid >> $DAEMON_PIDS $ hg debugpushkey http://localhost:$HGPORT/ obsolete (do some extra pulling to be sure)