# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1544730294 18000
# Node ID e06719b7544dd5cf93a53e23ad3b3872b6acbe87
# Parent  4591c9791a829e927388ba92a64971ae9ab301ec# Parent  21f5810df84864ec01ca69ec1f36ddb54b6749fe
merge with stable

diff -r 4591c9791a82 -r e06719b7544d mercurial/configitems.py
--- 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,
 )
diff -r 4591c9791a82 -r e06719b7544d mercurial/hgweb/webcommands.py
--- 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():
diff -r 4591c9791a82 -r e06719b7544d tests/test-http-bad-server.t
--- 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