Mercurial > hg
changeset 22088:a82c5975095d
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 10 Aug 2014 14:30:30 -0500 |
| parents | 1aca2abbe13c (current diff) af62f0280a76 (diff) |
| children | 711b5cfddb1b |
| files | |
| diffstat | 3 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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
--- 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'])