Patchwork D1124: test-hgweb-annotate-whitespace: make test compatible with chg

login
register
mail settings
Submitter phabricator
Date Oct. 16, 2017, 8:07 p.m.
Message ID <differential-rev-PHID-DREV-7j6ln4cn6g7vr7oxdqcp-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/25035/
State Superseded
Headers show

Comments

phabricator - Oct. 16, 2017, 8:07 p.m.
singhsrb created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  https://phab.mercurial-scm.org/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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1124

AFFECTED FILES
  tests/test-hgweb-annotate-whitespace.t

CHANGE DETAILS




To: singhsrb, #hg-reviewers
Cc: mercurial-devel
phabricator - Oct. 17, 2017, 1:34 a.m.
durin42 added a comment.


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

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1124

To: singhsrb, #hg-reviewers, quark
Cc: durin42, mercurial-devel
phabricator - Oct. 17, 2017, 1:45 a.m.
singhsrb added a comment.


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

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1124

To: singhsrb, #hg-reviewers, quark, durin42
Cc: durin42, mercurial-devel
phabricator - Oct. 17, 2017, 12:47 p.m.
yuja added a comment.


  In https://phab.mercurial-scm.org/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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1124

To: singhsrb, #hg-reviewers, quark, durin42
Cc: yuja, durin42, mercurial-devel

Patch

diff --git a/tests/test-hgweb-annotate-whitespace.t b/tests/test-hgweb-annotate-whitespace.t
--- a/tests/test-hgweb-annotate-whitespace.t
+++ b/tests/test-hgweb-annotate-whitespace.t
@@ -76,7 +76,7 @@ 
 
   $ hg serve -p $HGPORT -d --pid-file hg.pid
   $ 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
   $ cd ..