--- a/mercurial/hgweb/hgweb_mod.py	Mon Mar 24 18:18:39 2008 +0100
+++ b/mercurial/hgweb/hgweb_mod.py	Fri Mar 28 19:37:28 2008 +0100
@@ -15,7 +15,7 @@
 from common import ErrorResponse
 from common import HTTP_OK, HTTP_BAD_REQUEST, HTTP_NOT_FOUND, HTTP_SERVER_ERROR
 from request import wsgirequest
-import webcommands, protocol
+import webcommands, protocol, webutil
 
 shortcuts = {
     'cl': [('cmd', ['changelog']), ('rev', None)],
@@ -340,54 +340,6 @@
         if len(files) > self.maxfiles:
             yield tmpl("fileellipses")
 
-    def siblings(self, siblings=[], hiderev=None, **args):
-        siblings = [s for s in siblings if s.node() != nullid]
-        if len(siblings) == 1 and siblings[0].rev() == hiderev:
-            return
-        for s in siblings:
-            d = {'node': hex(s.node()), 'rev': s.rev()}
-            if hasattr(s, 'path'):
-                d['file'] = s.path()
-            d.update(args)
-            yield d
-
-    def renamelink(self, fl, node):
-        r = fl.renamed(node)
-        if r:
-            return [dict(file=r[0], node=hex(r[1]))]
-        return []
-
-    def nodetagsdict(self, node):
-        return [{"name": i} for i in self.repo.nodetags(node)]
-
-    def nodebranchdict(self, ctx):
-        branches = []
-        branch = ctx.branch()
-        # If this is an empty repo, ctx.node() == nullid,
-        # ctx.branch() == 'default', but branchtags() is
-        # an empty dict. Using dict.get avoids a traceback.
-        if self.repo.branchtags().get(branch) == ctx.node():
-            branches.append({"name": branch})
-        return branches
-
-    def nodeinbranch(self, ctx):
-        branches = []
-        branch = ctx.branch()
-        if branch != 'default' and self.repo.branchtags().get(branch) != ctx.node():
-            branches.append({"name": branch})
-        return branches
-
-    def nodebranchnodefault(self, ctx):
-        branches = []
-        branch = ctx.branch()
-        if branch != 'default':
-            branches.append({"name": branch})
-        return branches
-
-    def showtag(self, tmpl, t1, node=nullid, **args):
-        for t in self.repo.nodetags(node):
-            yield tmpl(t1, tag=t, **args)
-
     def diff(self, tmpl, node1, node2, files):
         def filterfiles(filters, files):
             l = [x for x in files if x in filters]
@@ -462,21 +414,22 @@
             for i in xrange(start, end):
                 ctx = self.repo.changectx(i)
                 n = ctx.node()
-                showtags = self.showtag(tmpl, 'changelogtag', n)
+                showtags = webutil.showtag(self.repo, tmpl, 'changelogtag', n)
 
                 l.insert(0, {"parity": parity.next(),
                              "author": ctx.user(),
-                             "parent": self.siblings(ctx.parents(), i - 1),
-                             "child": self.siblings(ctx.children(), i + 1),
+                             "parent": webutil.siblings(ctx.parents(), i - 1),
+                             "child": webutil.siblings(ctx.children(), i + 1),
                              "changelogtag": showtags,
                              "desc": ctx.description(),
                              "date": ctx.date(),
                              "files": self.listfilediffs(tmpl, ctx.files(), n),
                              "rev": i,
                              "node": hex(n),
-                             "tags": self.nodetagsdict(n),
-                             "inbranch": self.nodeinbranch(ctx),
-                             "branches": self.nodebranchdict(ctx)})
+                             "tags": webutil.nodetagsdict(self.repo, n),
+                             "inbranch": webutil.nodeinbranch(self.repo, ctx),
+                             "branches": webutil.nodebranchdict(self.repo, ctx)
+                            })
 
             if limit > 0:
                 l = l[:limit]
@@ -533,22 +486,22 @@
 
                 count += 1
                 n = ctx.node()
-                showtags = self.showtag(tmpl, 'changelogtag', n)
+                showtags = webutil.showtag(self.repo, tmpl, 'changelogtag', n)
 
                 yield tmpl('searchentry',
                            parity=parity.next(),
                            author=ctx.user(),
-                           parent=self.siblings(ctx.parents()),
-                           child=self.siblings(ctx.children()),
+                           parent=webutil.siblings(ctx.parents()),
+                           child=webutil.siblings(ctx.children()),
                            changelogtag=showtags,
                            desc=ctx.description(),
                            date=ctx.date(),
                            files=self.listfilediffs(tmpl, ctx.files(), n),
                            rev=ctx.rev(),
                            node=hex(n),
-                           tags=self.nodetagsdict(n),
-                           inbranch=self.nodeinbranch(ctx),
-                           branches=self.nodebranchdict(ctx))
+                           tags=webutil.nodetagsdict(self.repo, n),
+                           inbranch=webutil.nodeinbranch(self.repo, ctx),
+                           branches=webutil.nodebranchdict(self.repo, ctx))
 
                 if count >= self.maxchanges:
                     break
@@ -564,7 +517,7 @@
 
     def changeset(self, tmpl, ctx):
         n = ctx.node()
-        showtags = self.showtag(tmpl, 'changesettag', n)
+        showtags = webutil.showtag(self.repo, tmpl, 'changesettag', n)
         parents = ctx.parents()
         p1 = parents[0].node()
 
@@ -582,18 +535,18 @@
                     diff=diff,
                     rev=ctx.rev(),
                     node=hex(n),
-                    parent=self.siblings(parents),
-                    child=self.siblings(ctx.children()),
+                    parent=webutil.siblings(parents),
+                    child=webutil.siblings(ctx.children()),
                     changesettag=showtags,
                     author=ctx.user(),
                     desc=ctx.description(),
                     date=ctx.date(),
                     files=files,
                     archives=self.archivelist(hex(n)),
-                    tags=self.nodetagsdict(n),
-                    branch=self.nodebranchnodefault(ctx),
-                    inbranch=self.nodeinbranch(ctx),
-                    branches=self.nodebranchdict(ctx))
+                    tags=webutil.nodetagsdict(self.repo, n),
+                    branch=webutil.nodebranchnodefault(ctx),
+                    inbranch=webutil.nodeinbranch(self.repo, ctx),
+                    branches=webutil.nodebranchdict(self.repo, ctx))
 
     def filelog(self, tmpl, fctx):
         f = fctx.path()
@@ -619,9 +572,9 @@
                              "node": hex(ctx.node()),
                              "author": ctx.user(),
                              "date": ctx.date(),
-                             "rename": self.renamelink(fl, n),
-                             "parent": self.siblings(fctx.parents()),
-                             "child": self.siblings(fctx.children()),
+                             "rename": webutil.renamelink(fl, n),
+                             "parent": webutil.siblings(fctx.parents()),
+                             "child": webutil.siblings(fctx.children()),
                              "desc": ctx.description()})
 
             if limit > 0:
@@ -663,10 +616,10 @@
                     author=fctx.user(),
                     date=fctx.date(),
                     desc=fctx.description(),
-                    branch=self.nodebranchnodefault(fctx),
-                    parent=self.siblings(fctx.parents()),
-                    child=self.siblings(fctx.children()),
-                    rename=self.renamelink(fl, n),
+                    branch=webutil.nodebranchnodefault(fctx),
+                    parent=webutil.siblings(fctx.parents()),
+                    child=webutil.siblings(fctx.children()),
+                    rename=webutil.renamelink(fl, n),
                     permissions=fctx.manifest().flags(f))
 
     def fileannotate(self, tmpl, fctx):
@@ -710,10 +663,10 @@
                     author=fctx.user(),
                     date=fctx.date(),
                     desc=fctx.description(),
-                    rename=self.renamelink(fl, n),
-                    branch=self.nodebranchnodefault(fctx),
-                    parent=self.siblings(fctx.parents()),
-                    child=self.siblings(fctx.children()),
+                    rename=webutil.renamelink(fl, n),
+                    branch=webutil.nodebranchnodefault(fctx),
+                    parent=webutil.siblings(fctx.parents()),
+                    child=webutil.siblings(fctx.children()),
                     permissions=fctx.manifest().flags(f))
 
     def manifest(self, tmpl, ctx, path):
@@ -779,9 +732,9 @@
                     fentries=filelist,
                     dentries=dirlist,
                     archives=self.archivelist(hex(node)),
-                    tags=self.nodetagsdict(node),
-                    inbranch=self.nodeinbranch(ctx),
-                    branches=self.nodebranchdict(ctx))
+                    tags=webutil.nodetagsdict(self.repo, node),
+                    inbranch=webutil.nodeinbranch(self.repo, ctx),
+                    branches=webutil.nodebranchdict(self.repo, ctx))
 
     def tags(self, tmpl):
         i = self.repo.tagslist()
@@ -860,9 +813,9 @@
                     date=ctx.date(),
                     rev=i,
                     node=hn,
-                    tags=self.nodetagsdict(n),
-                    inbranch=self.nodeinbranch(ctx),
-                    branches=self.nodebranchdict(ctx)))
+                    tags=webutil.nodetagsdict(self.repo, n),
+                    inbranch=webutil.nodeinbranch(self.repo, ctx),
+                    branches=webutil.nodebranchdict(self.repo, ctx)))
 
             yield l
 
@@ -894,9 +847,9 @@
                     file=path,
                     node=hex(n),
                     rev=fctx.rev(),
-                    branch=self.nodebranchnodefault(fctx),
-                    parent=self.siblings(parents),
-                    child=self.siblings(fctx.children()),
+                    branch=webutil.nodebranchnodefault(fctx),
+                    parent=webutil.siblings(parents),
+                    child=webutil.siblings(fctx.children()),
                     diff=diff)
 
     archive_specs = {
@@ -924,45 +877,6 @@
         req.respond(HTTP_OK)
         archival.archive(self.repo, req, cnode, artype, prefix=name)
 
-    # add tags to things
-    # tags -> list of changesets corresponding to tags
-    # find tag, changeset, file
-
-    def cleanpath(self, path):
-        path = path.lstrip('/')
-        return util.canonpath(self.repo.root, '', path)
-
-    def changectx(self, req):
-        if 'node' in req.form:
-            changeid = req.form['node'][0]
-        elif 'manifest' in req.form:
-            changeid = req.form['manifest'][0]
-        else:
-            changeid = self.repo.changelog.count() - 1
-
-        try:
-            ctx = self.repo.changectx(changeid)
-        except RepoError:
-            man = self.repo.manifest
-            mn = man.lookup(changeid)
-            ctx = self.repo.changectx(man.linkrev(mn))
-
-        return ctx
-
-    def filectx(self, req):
-        path = self.cleanpath(req.form['file'][0])
-        if 'node' in req.form:
-            changeid = req.form['node'][0]
-        else:
-            changeid = req.form['filenode'][0]
-        try:
-            ctx = self.repo.changectx(changeid)
-            fctx = ctx.filectx(path)
-        except RepoError:
-            fctx = self.repo.filectx(path, fileid=changeid)
-
-        return fctx
-
     def check_perm(self, req, op, default):
         '''check permission for operation based on user auth.
         return true if op allowed, else false.

--- a/mercurial/hgweb/webcommands.py	Mon Mar 24 18:18:39 2008 +0100
+++ b/mercurial/hgweb/webcommands.py	Fri Mar 28 19:37:28 2008 +0100
@@ -6,7 +6,9 @@
 # of the GNU General Public License, incorporated herein by reference.
 
 import os, mimetypes
-from mercurial import revlog, util
+import webutil
+from mercurial import revlog
+from mercurial.util import binary
 from mercurial.repo import RepoError
 from common import staticfile, ErrorResponse, HTTP_OK, HTTP_NOT_FOUND
 
@@ -26,17 +28,17 @@
         return changelog(web, req, tmpl)
 
 def rawfile(web, req, tmpl):
-    path = web.cleanpath(req.form.get('file', [''])[0])
+    path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
     if not path:
-        content = web.manifest(tmpl, web.changectx(req), path)
+        content = web.manifest(tmpl, webutil.changectx(web.repo, req), path)
         req.respond(HTTP_OK, web.ctype)
         return content
 
     try:
-        fctx = web.filectx(req)
+        fctx = webutil.filectx(web.repo, req)
     except revlog.LookupError, inst:
         try:
-            content = web.manifest(tmpl, web.changectx(req), path)
+            content = web.manifest(tmpl, webutil.changectx(web.repo, req), path)
             req.respond(HTTP_OK, web.ctype)
             return content
         except ErrorResponse:
@@ -45,28 +47,28 @@
     path = fctx.path()
     text = fctx.data()
     mt = mimetypes.guess_type(path)[0]
-    if mt is None or util.binary(text):
+    if mt is None or binary(text):
         mt = mt or 'application/octet-stream'
 
     req.respond(HTTP_OK, mt, path, len(text))
     return [text]
 
 def file(web, req, tmpl):
-    path = web.cleanpath(req.form.get('file', [''])[0])
+    path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
     if path:
         try:
-            return web.filerevision(tmpl, web.filectx(req))
+            return web.filerevision(tmpl, webutil.filectx(web.repo, req))
         except revlog.LookupError, inst:
             pass
 
     try:
-        return web.manifest(tmpl, web.changectx(req), path)
+        return web.manifest(tmpl, webutil.changectx(web.repo, req), path)
     except ErrorResponse:
         raise inst
 
 def changelog(web, req, tmpl, shortlog = False):
     if 'node' in req.form:
-        ctx = web.changectx(req)
+        ctx = webutil.changectx(web.repo, req)
     else:
         if 'rev' in req.form:
             hi = req.form['rev'][0]
@@ -83,13 +85,13 @@
     return changelog(web, req, tmpl, shortlog = True)
 
 def changeset(web, req, tmpl):
-    return web.changeset(tmpl, web.changectx(req))
+    return web.changeset(tmpl, webutil.changectx(web.repo, req))
 
 rev = changeset
 
 def manifest(web, req, tmpl):
-    return web.manifest(tmpl, web.changectx(req),
-                        web.cleanpath(req.form['path'][0]))
+    return web.manifest(tmpl, webutil.changectx(web.repo, req),
+                        webutil.cleanpath(web.repo, req.form['path'][0]))
 
 def tags(web, req, tmpl):
     return web.tags(tmpl)
@@ -98,15 +100,15 @@
     return web.summary(tmpl)
 
 def filediff(web, req, tmpl):
-    return web.filediff(tmpl, web.filectx(req))
+    return web.filediff(tmpl, webutil.filectx(web.repo, req))
 
 diff = filediff
 
 def annotate(web, req, tmpl):
-    return web.fileannotate(tmpl, web.filectx(req))
+    return web.fileannotate(tmpl, webutil.filectx(web.repo, req))
 
 def filelog(web, req, tmpl):
-    return web.filelog(tmpl, web.filectx(req))
+    return web.filelog(tmpl, webutil.filectx(web.repo, req))
 
 def archive(web, req, tmpl):
     type_ = req.form['type'][0]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/hgweb/webutil.py	Fri Mar 28 19:37:28 2008 +0100
@@ -0,0 +1,94 @@
+# hgweb/webutil.py - utility library for the web interface.
+#
+# Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
+# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
+#
+# This software may be used and distributed according to the terms
+# of the GNU General Public License, incorporated herein by reference.
+
+from mercurial.node import hex, nullid
+from mercurial.repo import RepoError
+from mercurial import util
+
+def siblings(siblings=[], hiderev=None, **args):
+    siblings = [s for s in siblings if s.node() != nullid]
+    if len(siblings) == 1 and siblings[0].rev() == hiderev:
+        return
+    for s in siblings:
+        d = {'node': hex(s.node()), 'rev': s.rev()}
+        if hasattr(s, 'path'):
+            d['file'] = s.path()
+        d.update(args)
+        yield d
+
+def renamelink(fl, node):
+    r = fl.renamed(node)
+    if r:
+        return [dict(file=r[0], node=hex(r[1]))]
+    return []
+
+def nodetagsdict(repo, node):
+    return [{"name": i} for i in repo.nodetags(node)]
+
+def nodebranchdict(repo, ctx):
+    branches = []
+    branch = ctx.branch()
+    # If this is an empty repo, ctx.node() == nullid,
+    # ctx.branch() == 'default', but branchtags() is
+    # an empty dict. Using dict.get avoids a traceback.
+    if repo.branchtags().get(branch) == ctx.node():
+        branches.append({"name": branch})
+    return branches
+
+def nodeinbranch(repo, ctx):
+    branches = []
+    branch = ctx.branch()
+    if branch != 'default' and repo.branchtags().get(branch) != ctx.node():
+        branches.append({"name": branch})
+    return branches
+
+def nodebranchnodefault(ctx):
+    branches = []
+    branch = ctx.branch()
+    if branch != 'default':
+        branches.append({"name": branch})
+    return branches
+
+def showtag(repo, tmpl, t1, node=nullid, **args):
+    for t in repo.nodetags(node):
+        yield tmpl(t1, tag=t, **args)
+
+def cleanpath(repo, path):
+    path = path.lstrip('/')
+    return util.canonpath(repo.root, '', path)
+
+def changectx(repo, req):
+    if 'node' in req.form:
+        changeid = req.form['node'][0]
+    elif 'manifest' in req.form:
+        changeid = req.form['manifest'][0]
+    else:
+        changeid = self.repo.changelog.count() - 1
+
+    try:
+        ctx = repo.changectx(changeid)
+    except RepoError:
+        man = repo.manifest
+        mn = man.lookup(changeid)
+        ctx = repo.changectx(man.linkrev(mn))
+
+    return ctx
+
+def filectx(repo, req):
+    path = cleanpath(repo, req.form['file'][0])
+    if 'node' in req.form:
+        changeid = req.form['node'][0]
+    else:
+        changeid = req.form['filenode'][0]
+    try:
+        ctx = repo.changectx(changeid)
+        fctx = ctx.filectx(path)
+    except RepoError:
+        fctx = repo.filectx(path, fileid=changeid)
+
+    return fctx