# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1407699030 18000
# Node ID a82c5975095dcff308a267062c4626cec20ad665
# Parent  1aca2abbe13c015d9c33348c4f98086a803ad5c3# Parent  af62f0280a76d15a1bbc7c07817b73952b23117c
merge with stable

diff -r 1aca2abbe13c -r a82c5975095d mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py	Sat Aug 09 16:06:01 2014 -0500
+++ b/mercurial/hgweb/hgweb_mod.py	Sun Aug 10 14:30:30 2014 -0500
@@ -61,6 +61,7 @@
                 u = ui.ui()
             r = hg.repository(u, repo)
         else:
+            # we trust caller to give us a private copy
             r = repo
 
         r = self._getview(r)
diff -r 1aca2abbe13c -r a82c5975095d mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py	Sat Aug 09 16:06:01 2014 -0500
+++ b/mercurial/hgweb/hgwebdir_mod.py	Sun Aug 10 14:30:30 2014 -0500
@@ -214,7 +214,8 @@
                     if real:
                         req.env['REPO_NAME'] = virtualrepo
                         try:
-                            repo = hg.repository(self.ui, real)
+                            # ensure caller gets private copy of ui
+                            repo = hg.repository(self.ui.copy(), real)
                             return hgweb(repo).run_wsgi(req)
                         except IOError, inst:
                             msg = inst.strerror
diff -r 1aca2abbe13c -r a82c5975095d tests/test-commandserver.py
--- a/tests/test-commandserver.py	Sat Aug 09 16:06:01 2014 -0500
+++ b/tests/test-commandserver.py	Sun Aug 10 14:30:30 2014 -0500
@@ -155,7 +155,7 @@
 
     # the cached repo local hgrc contains ui.foo=bar, so showconfig should
     # show it
-    runcommand(server, ['showconfig'])
+    runcommand(server, ['showconfig'], outfilter=sep)
 
     # but not for this repo
     runcommand(server, ['init', 'foo'])