merge with crew-stable

hgext/notify.py

@@ -240,7 +240,9 b' class notifier(object):'
         difflines = self.ui.popbuffer().splitlines(1)
         if self.ui.configbool('notify', 'diffstat', True):
             s = patch.diffstat(difflines)
-            self.ui.write('\ndiffstat:\n\n' + s)
+            # s may be nil, don't include the header if it is
+            if s:
+                self.ui.write('\ndiffstat:\n\n%s' % s)
         if maxdiff > 0 and len(difflines) > maxdiff:
             self.ui.write(_('\ndiffs (truncated from %d to %d lines):\n\n') %
                           (len(difflines), maxdiff))

mercurial/commands.py

@@ -2298,11 +2298,12 b' def serve(ui, repo, **opts):'
         s = sshserver.sshserver(ui, repo)
         s.serve_forever()
 
+    parentui = ui.parentui or ui
     optlist = ("name templates style address port ipv6"
                " accesslog errorlog webdir_conf")
     for o in optlist.split():
         if opts[o]:
-            ui.setconfig("web", o, str(opts[o]))
+            parentui.setconfig("web", o, str(opts[o]))
 
     if repo is None and not ui.config("web", "webdir_conf"):
         raise hg.RepoError(_("There is no Mercurial repository here"
@@ -2318,7 +2319,7 b' def serve(ui, repo, **opts):'
         os.read(rfd, 1)
         os._exit(0)
 
-    httpd = hgweb.server.create_server(ui, repo)
+    httpd = hgweb.server.create_server(parentui, repo)
 
     if ui.verbose:
         if httpd.port != 80:

mercurial/dirstate.py

@@ -389,7 +389,7 b' class dirstate(object):'
 
         # self.root may end with a path separator when self.root == '/'
         common_prefix_len = len(self.root)
-        if not self.root.endswith('/'):
+        if not self.root.endswith(os.sep):
             common_prefix_len += 1
         # recursion free walker, faster than os.walk.
         def findfiles(s):

mercurial/hg.py

@@ -55,6 +55,7 b' repo_setup_hooks = []'
 def repository(ui, path='', create=False):
     """return a repository object for the specified path"""
     repo = _lookup(path).instance(ui, path, create)
+    ui = getattr(repo, "ui", ui)
     for hook in repo_setup_hooks:
         hook(ui, repo)
     return repo

mercurial/hgweb/hgwebdir_mod.py

@@ -15,12 +15,13 b' from hgweb_mod import hgweb'
 
 # This is a stopgap
 class hgwebdir(object):
-    def __init__(self, config):
+    def __init__(self, config, parentui=None):
         def cleannames(items):
             return [(name.strip(os.sep), path) for name, path in items]
 
-        self.motd = ""
-        self.style = ""
+        self.parentui = parentui
+        self.motd = None
+        self.style = None
         self.repos_sorted = ('name', False)
         if isinstance(config, (list, tuple)):
             self.repos = cleannames(config)
@@ -73,13 +74,23 b' class hgwebdir(object):'
             yield tmpl("footer", **map)
 
         def motd(**map):
-            yield self.motd
+            if self.motd is not None:
+                yield self.motd
+            else:
+                yield config('web', 'motd', '')
+
+        parentui = self.parentui or ui.ui(report_untrusted=False)
+
+        def config(section, name, default=None, untrusted=True):
+            return parentui.config(section, name, default, untrusted)
 
         url = req.env['REQUEST_URI'].split('?')[0]
         if not url.endswith('/'):
             url += '/'
 
         style = self.style
+        if style is None:
+            style = config('web', 'style', '')
         if req.form.has_key('style'):
             style = req.form['style'][0]
         mapfile = style_map(templater.templatepath(), style)
@@ -113,7 +124,7 b' class hgwebdir(object):'
             rows = []
             parity = 0
             for name, path in self.repos:
-                u = ui.ui(report_untrusted=False)
+                u = ui.ui(parentui=parentui)
                 try:
                     u.readconfig(os.path.join(path, '.hg', 'hgrc'))
                 except IOError:
@@ -181,7 +192,8 b' class hgwebdir(object):'
             if real:
                 req.env['REPO_NAME'] = virtual
                 try:
-                    hgweb(real).run_wsgi(req)
+                    repo = hg.repository(parentui, real)
+                    hgweb(repo).run_wsgi(req)
                 except IOError, inst:
                     req.write(tmpl("error", error=inst.strerror))
                 except hg.RepoError, inst:

mercurial/hgweb/server.py

@@ -220,7 +220,7 b' def create_server(ui, repo):'
 
         def make_handler(self):
             if self.webdir_conf:
-                hgwebobj = self.webdirmaker(self.webdir_conf)
+                hgwebobj = self.webdirmaker(self.webdir_conf, ui)
             elif self.repo is not None:
                 hgwebobj = self.repoviewmaker(repo.__class__(repo.ui,
                                                              repo.origroot))

mercurial/hgweb/wsgicgi.py

@@ -9,8 +9,10 b''
 # http://www.python.org/dev/peps/pep-0333/#the-server-gateway-side
 
 import os, sys
+from mercurial import util
 
 def launch(application):
+    util.set_binary(sys.stdout)
 
     environ = dict(os.environ.items())
     environ['wsgi.input'] = sys.stdin

tests/test-extension

@@ -7,9 +7,12 b' from mercurial import commands'
 
 def uisetup(ui):
     ui.write("uisetup called\\n")
+    ui.write("ui.parentui is%s None\\n" % (ui.parentui is not None
+                                           and "not" or ""))
 
 def reposetup(ui, repo):
     ui.write("reposetup called for %s\\n" % os.path.basename(repo.root))
+    ui.write("ui %s= repo.ui\\n" % (ui == repo.ui and "=" or "!"))
 
 def foo(ui, *args, **kwargs):
     ui.write("Foo\\n")

tests/test-extension.out

@@ -1,9 +1,15 b''
 uisetup called
+ui.parentui is None
 reposetup called for a
+ui == repo.ui
 Foo
 uisetup called
+ui.parentui is None
 reposetup called for a
+ui == repo.ui
 reposetup called for b
+ui == repo.ui
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 uisetup called
+ui.parentui is None
 Bar