This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1124

test-hgweb-annotate-whitespace: make test compatible with chg
ClosedPublic

Authored by singhsrb on Oct 16 2017, 4:07 PM.

Details

Reviewers
quark
durin42
Group Reviewers
hg-reviewers
Commits
rHG3b4b38130689: test-hgweb-annotate-whitespace: make test compatible with chg
rHG96fea7580ac4: test-hgweb-annotate-whitespace: make test compatible with chg
Summary

D946 fixed a bunch of tests which had the same root cause. Please see
that for details. This seems to be one of the newer tests which fails because
of the same reason.

Test Plan

Ran the test 'test-hgweb-annotate-whitespace.t' with and without the
'--chg' option.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

singhsrb created this revision.Oct 16 2017, 4:07 PM
quark accepted this revision.Oct 16 2017, 7:56 PM
durin42 added a subscriber: durin42.Oct 16 2017, 9:34 PM

I'm a bit worried that chg can't handle the typical argument pattern here...

durin42 accepted this revision.Oct 16 2017, 9:35 PM
This revision is now accepted and ready to land.Oct 16 2017, 9:35 PM
singhsrb added a comment.Oct 16 2017, 9:45 PM

@durin42: That's a valid concern and I am planning to look at the pattern handling code at some point.

Closed by commit rHG96fea7580ac4: test-hgweb-annotate-whitespace: make test compatible with chg (authored by singhsrb). · Explain WhyOct 16 2017, 9:47 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Oct 17 2017, 8:47 AM
In D1124#18881, @singhsrb wrote:

@durin42: That's a valid concern and I am planning to look at the pattern handling code at some point.

Maybe we should instead make hg serve --daemon work under commandserver.
Argument parsing in chg.c is merely a hack to get around Mercurial bugs.

Revision Contents
Changeset List

Diff 2872

tests/test-hgweb-annotate-whitespace.t

| |
o 1:23e1e37387dc commit 1 o 1:23e1e37387dc commit 1
| |
o 0:b9c578134d72 commit 0 o 0:b9c578134d72 commit 0
$ hg serve -p $HGPORT -d --pid-file hg.pid $ hg serve -p $HGPORT -d --pid-file hg.pid
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
$ hg --config annotate.ignorews=true serve -p $HGPORT1 -d --pid-file hg.pid $ hg serve --config annotate.ignorews=true -p $HGPORT1 -d --pid-file hg.pid
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
$ cd .. $ cd ..
Annotate works Annotate works
$ get-with-headers.py --json $LOCALIP:$HGPORT 'json-annotate/9d1b2c7db017/foo' $ get-with-headers.py --json $LOCALIP:$HGPORT 'json-annotate/9d1b2c7db017/foo'
200 Script output follows 200 Script output follows