Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorAugie Fackler <augie@google.com>
Thu, 13 Dec 2018 14:44:54 -0500
changeset 40936 e06719b7544d
parent 40935 4591c9791a82 (current diff)
parent 40926 21f5810df848 (diff)
child 40941 db6cace18765
merge with stable
mercurial/configitems.py file | annotate | diff | comparison | revisions
mercurial/hgweb/webcommands.py file | annotate | diff | comparison | revisions
tests/test-http-bad-server.t file | annotate | diff | comparison | revisions 
--- a/mercurial/configitems.py	Wed Dec 12 22:45:02 2018 +0900
+++ b/mercurial/configitems.py	Thu Dec 13 14:44:54 2018 -0500
@@ -1307,6 +1307,9 @@
 coreconfigitem('web', 'cache',
     default=True,
 )
+coreconfigitem('web', 'comparisoncontext',
+    default=5,
+)
 coreconfigitem('web', 'contact',
     default=None,
 )
--- a/mercurial/hgweb/webcommands.py	Wed Dec 12 22:45:02 2018 +0900
+++ b/mercurial/hgweb/webcommands.py	Thu Dec 13 14:44:54 2018 -0500
@@ -858,7 +858,7 @@
     if 'context' in web.req.qsparams:
         context = parsecontext(web.req.qsparams['context'])
     else:
-        context = parsecontext(web.config('web', 'comparisoncontext', '5'))
+        context = parsecontext(web.config('web', 'comparisoncontext'))
 
     def filelines(f):
         if f.isbinary():
--- a/tests/test-http-bad-server.t	Wed Dec 12 22:45:02 2018 +0900
+++ b/tests/test-http-bad-server.t	Thu Dec 13 14:44:54 2018 -0500
@@ -72,7 +72,7 @@
   $ cat hg.pid > $DAEMON_PIDS
 
   $ hg clone http://localhost:$HGPORT/ clone
-  abort: error: bad HTTP status line: ''
+  abort: error: bad HTTP status line: * (glob)
   [255]
 
   $ killdaemons.py $DAEMON_PIDS
@@ -88,7 +88,7 @@
   $ hg serve --config badserver.closeafterrecvbytes=40 -p $HGPORT -d --pid-file=hg.pid -E error.log
   $ cat hg.pid > $DAEMON_PIDS
   $ hg clone http://localhost:$HGPORT/ clone
-  abort: error: bad HTTP status line: ''
+  abort: error: bad HTTP status line: * (glob)
   [255]
 
   $ killdaemons.py $DAEMON_PIDS
@@ -105,7 +105,7 @@
   $ hg serve --config badserver.closeafterrecvbytes=210,223 -p $HGPORT -d --pid-file=hg.pid -E error.log
   $ cat hg.pid > $DAEMON_PIDS
   $ hg clone http://localhost:$HGPORT/ clone
-  abort: error: bad HTTP status line: ''
+  abort: error: bad HTTP status line: * (glob)
   [255]
 
   $ killdaemons.py $DAEMON_PIDS
@@ -144,7 +144,7 @@
   $ cat hg.pid > $DAEMON_PIDS
   $ hg clone http://localhost:$HGPORT/ clone
   requesting all changes
-  abort: error: bad HTTP status line: ''
+  abort: error: bad HTTP status line: * (glob)
   [255]
 
   $ killdaemons.py $DAEMON_PIDS
@@ -203,7 +203,7 @@
   $ cat hg.pid > $DAEMON_PIDS
 
   $ hg clone http://localhost:$HGPORT/ clone
-  abort: error: bad HTTP status line: ''
+  abort: error: bad HTTP status line: * (glob)
   [255]
 
   $ killdaemons.py $DAEMON_PIDS
mercurial