Merge with crew-stable

mercurial/hgweb/webcommands.py

@@ -1,690 +1,698
 #
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <[e-mail]>
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2, incorporated herein by reference.
 
 import os, mimetypes, re, cgi, copy
 import webutil
 from mercurial import error, archival, templater, templatefilters
 from mercurial.node import short, hex
 from mercurial.util import binary
 from common import paritygen, staticfile, get_contact, ErrorResponse
 from common import HTTP_OK, HTTP_FORBIDDEN, HTTP_NOT_FOUND
 from mercurial import graphmod
 
 # __all__ is populated with the allowed commands. Be sure to add to it if
 # you're adding a new command, or the new command won't work.
 
 __all__ = [
    'log', 'rawfile', 'file', 'changelog', 'shortlog', 'changeset', 'rev',
    'manifest', 'tags', 'branches', 'summary', 'filediff', 'diff', 'annotate',
    'filelog', 'archive', 'static', 'graph',
 ]
 
 def log(web, req, tmpl):
     if 'file' in req.form and req.form['file'][0]:
         return filelog(web, req, tmpl)
     else:
         return changelog(web, req, tmpl)
 
 def rawfile(web, req, tmpl):
     path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
     if not path:
         content = manifest(web, req, tmpl)
         req.respond(HTTP_OK, web.ctype)
         return content
 
     try:
         fctx = webutil.filectx(web.repo, req)
     except error.LookupError, inst:
         try:
             content = manifest(web, req, tmpl)
             req.respond(HTTP_OK, web.ctype)
             return content
         except ErrorResponse:
             raise inst
 
     path = fctx.path()
     text = fctx.data()
     mt = mimetypes.guess_type(path)[0]
     if mt is None:
         mt = binary(text) and 'application/octet-stream' or 'text/plain'
 
     req.respond(HTTP_OK, mt, path, len(text))
     return [text]
 
 def _filerevision(web, tmpl, fctx):
     f = fctx.path()
     text = fctx.data()
     parity = paritygen(web.stripecount)
 
     if binary(text):
         mt = mimetypes.guess_type(f)[0] or 'application/octet-stream'
         text = '(binary:%s)' % mt
 
     def lines():
         for lineno, t in enumerate(text.splitlines(True)):
             yield {"line": t,
                    "lineid": "l%d" % (lineno + 1),
                    "linenumber": "% 6d" % (lineno + 1),
                    "parity": parity.next()}
 
     return tmpl("filerevision",
                 file=f,
                 path=webutil.up(f),
                 text=lines(),
                 rev=fctx.rev(),
                 node=hex(fctx.node()),
                 author=fctx.user(),
                 date=fctx.date(),
                 desc=fctx.description(),
                 branch=webutil.nodebranchnodefault(fctx),
                 parent=webutil.parents(fctx),
                 child=webutil.children(fctx),
                 rename=webutil.renamelink(fctx),
                 permissions=fctx.manifest().flags(f))
 
 def file(web, req, tmpl):
     path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
     if not path:
         return manifest(web, req, tmpl)
     try:
         return _filerevision(web, tmpl, webutil.filectx(web.repo, req))
     except error.LookupError, inst:
         try:
             return manifest(web, req, tmpl)
         except ErrorResponse:
             raise inst
 
 def _search(web, tmpl, query):
 
     def changelist(**map):
         cl = web.repo.changelog
         count = 0
         qw = query.lower().split()
 
         def revgen():
             for i in xrange(len(cl) - 1, 0, -100):
                 l = []
                 for j in xrange(max(0, i - 100), i + 1):
                     ctx = web.repo[j]
                     l.append(ctx)
                 l.reverse()
                 for e in l:
                     yield e
 
         for ctx in revgen():
             miss = 0
             for q in qw:
                 if not (q in ctx.user().lower() or
                         q in ctx.description().lower() or
                         q in " ".join(ctx.files()).lower()):
                     miss = 1
                     break
             if miss:
                 continue
 
             count += 1
             n = ctx.node()
             showtags = webutil.showtag(web.repo, tmpl, 'changelogtag', n)
             files = webutil.listfilediffs(tmpl, ctx.files(), n, web.maxfiles)
 
             yield tmpl('searchentry',
                        parity=parity.next(),
                        author=ctx.user(),
                        parent=webutil.parents(ctx),
                        child=webutil.children(ctx),
                        changelogtag=showtags,
                        desc=ctx.description(),
                        date=ctx.date(),
                        files=files,
                        rev=ctx.rev(),
                        node=hex(n),
                        tags=webutil.nodetagsdict(web.repo, n),
                        inbranch=webutil.nodeinbranch(web.repo, ctx),
                        branches=webutil.nodebranchdict(web.repo, ctx))
 
             if count >= web.maxchanges:
                 break
 
     cl = web.repo.changelog
     parity = paritygen(web.stripecount)
 
     return tmpl('search',
                 query=query,
                 node=hex(cl.tip()),
                 entries=changelist,
                 archives=web.archivelist("tip"))
 
 def changelog(web, req, tmpl, shortlog = False):
     if 'node' in req.form:
         ctx = webutil.changectx(web.repo, req)
     else:
         if 'rev' in req.form:
             hi = req.form['rev'][0]
         else:
             hi = len(web.repo) - 1
         try:
             ctx = web.repo[hi]
         except error.RepoError:
             return _search(web, tmpl, hi) # XXX redirect to 404 page?
 
     def changelist(limit=0, **map):
         l = [] # build a list in forward order for efficiency
         for i in xrange(start, end):
             ctx = web.repo[i]
             n = ctx.node()
             showtags = webutil.showtag(web.repo, tmpl, 'changelogtag', n)
             files = webutil.listfilediffs(tmpl, ctx.files(), n, web.maxfiles)
 
             l.insert(0, {"parity": parity.next(),
                          "author": ctx.user(),
                          "parent": webutil.parents(ctx, i - 1),
                          "child": webutil.children(ctx, i + 1),
                          "changelogtag": showtags,
                          "desc": ctx.description(),
                          "date": ctx.date(),
                          "files": files,
                          "rev": i,
                          "node": hex(n),
                          "tags": webutil.nodetagsdict(web.repo, n),
                          "inbranch": webutil.nodeinbranch(web.repo, ctx),
                          "branches": webutil.nodebranchdict(web.repo, ctx)
                         })
 
         if limit > 0:
             l = l[:limit]
 
         for e in l:
             yield e
 
     maxchanges = shortlog and web.maxshortchanges or web.maxchanges
     cl = web.repo.changelog
     count = len(cl)
     pos = ctx.rev()
     start = max(0, pos - maxchanges + 1)
     end = min(count, start + maxchanges)
     pos = end - 1
     parity = paritygen(web.stripecount, offset=start-end)
 
     changenav = webutil.revnavgen(pos, maxchanges, count, web.repo.changectx)
 
     return tmpl(shortlog and 'shortlog' or 'changelog',
                 changenav=changenav,
                 node=hex(ctx.node()),
                 rev=pos, changesets=count,
                 entries=lambda **x: changelist(limit=0,**x),
                 latestentry=lambda **x: changelist(limit=1,**x),
                 archives=web.archivelist("tip"))
 
 def shortlog(web, req, tmpl):
     return changelog(web, req, tmpl, shortlog = True)
 
 def changeset(web, req, tmpl):
     ctx = webutil.changectx(web.repo, req)
     showtags = webutil.showtag(web.repo, tmpl, 'changesettag', ctx.node())
     showbranch = webutil.nodebranchnodefault(ctx)
 
     files = []
     parity = paritygen(web.stripecount)
     for f in ctx.files():
         template = f in ctx and 'filenodelink' or 'filenolink'
         files.append(tmpl(template,
                           node=ctx.hex(), file=f,
                           parity=parity.next()))
 
     parity = paritygen(web.stripecount)
-    diffs = webutil.diffs(web.repo, tmpl, ctx, None, parity)
+    style = web.config('web', 'style', 'paper')
+    if 'style' in req.form:
+        style = req.form['style'][0]
+
+    diffs = webutil.diffs(web.repo, tmpl, ctx, None, parity, style)
     return tmpl('changeset',
                 diff=diffs,
                 rev=ctx.rev(),
                 node=ctx.hex(),
                 parent=webutil.parents(ctx),
                 child=webutil.children(ctx),
                 changesettag=showtags,
                 changesetbranch=showbranch,
                 author=ctx.user(),
                 desc=ctx.description(),
                 date=ctx.date(),
                 files=files,
                 archives=web.archivelist(ctx.hex()),
                 tags=webutil.nodetagsdict(web.repo, ctx.node()),
                 branch=webutil.nodebranchnodefault(ctx),
                 inbranch=webutil.nodeinbranch(web.repo, ctx),
                 branches=webutil.nodebranchdict(web.repo, ctx))
 
 rev = changeset
 
 def manifest(web, req, tmpl):
     ctx = webutil.changectx(web.repo, req)
     path = webutil.cleanpath(web.repo, req.form.get('file', [''])[0])
     mf = ctx.manifest()
     node = ctx.node()
 
     files = {}
     dirs = {}
     parity = paritygen(web.stripecount)
 
     if path and path[-1] != "/":
         path += "/"
     l = len(path)
     abspath = "/" + path
 
     for f, n in mf.iteritems():
         if f[:l] != path:
             continue
         remain = f[l:]
         elements = remain.split('/')
         if len(elements) == 1:
             files[remain] = f
         else:
             h = dirs # need to retain ref to dirs (root)
             for elem in elements[0:-1]:
                 if elem not in h:
                     h[elem] = {}
                 h = h[elem]
                 if len(h) > 1:
                     break
             h[None] = None # denotes files present
 
     if mf and not files and not dirs:
         raise ErrorResponse(HTTP_NOT_FOUND, 'path not found: ' + path)
 
     def filelist(**map):
         for f in sorted(files):
             full = files[f]
 
             fctx = ctx.filectx(full)
             yield {"file": full,
                    "parity": parity.next(),
                    "basename": f,
                    "date": fctx.date(),
                    "size": fctx.size(),
                    "permissions": mf.flags(full)}
 
     def dirlist(**map):
         for d in sorted(dirs):
 
             emptydirs = []
             h = dirs[d]
             while isinstance(h, dict) and len(h) == 1:
                 k,v = h.items()[0]
                 if v:
                     emptydirs.append(k)
                 h = v
 
             path = "%s%s" % (abspath, d)
             yield {"parity": parity.next(),
                    "path": path,
                    "emptydirs": "/".join(emptydirs),
                    "basename": d}
 
     return tmpl("manifest",
                 rev=ctx.rev(),
                 node=hex(node),
                 path=abspath,
                 up=webutil.up(abspath),
                 upparity=parity.next(),
                 fentries=filelist,
                 dentries=dirlist,
                 archives=web.archivelist(hex(node)),
                 tags=webutil.nodetagsdict(web.repo, node),
                 inbranch=webutil.nodeinbranch(web.repo, ctx),
                 branches=webutil.nodebranchdict(web.repo, ctx))
 
 def tags(web, req, tmpl):
     i = web.repo.tagslist()
     i.reverse()
     parity = paritygen(web.stripecount)
 
     def entries(notip=False, limit=0, **map):
         count = 0
         for k, n in i:
             if notip and k == "tip":
                 continue
             if limit > 0 and count >= limit:
                 continue
             count = count + 1
             yield {"parity": parity.next(),
                    "tag": k,
                    "date": web.repo[n].date(),
                    "node": hex(n)}
 
     return tmpl("tags",
                 node=hex(web.repo.changelog.tip()),
                 entries=lambda **x: entries(False,0, **x),
                 entriesnotip=lambda **x: entries(True,0, **x),
                 latestentry=lambda **x: entries(True,1, **x))
 
 def branches(web, req, tmpl):
     b = web.repo.branchtags()
     tips = (web.repo[n] for t, n in web.repo.branchtags().iteritems())
     heads = web.repo.heads()
     parity = paritygen(web.stripecount)
     sortkey = lambda ctx: ('close' not in ctx.extra(), ctx.rev())
 
     def entries(limit, **map):
         count = 0
         for ctx in sorted(tips, key=sortkey, reverse=True):
             if limit > 0 and count >= limit:
                 return
             count += 1
             if ctx.node() not in heads:
                 status = 'inactive'
             elif not web.repo.branchheads(ctx.branch()):
                 status = 'closed'
             else:
                 status = 'open'
             yield {'parity': parity.next(),
                    'branch': ctx.branch(),
                    'status': status,
                    'node': ctx.hex(),
                    'date': ctx.date()}
 
     return tmpl('branches', node=hex(web.repo.changelog.tip()),
                 entries=lambda **x: entries(0, **x),
                 latestentry=lambda **x: entries(1, **x))
 
 def summary(web, req, tmpl):
     i = web.repo.tagslist()
     i.reverse()
 
     def tagentries(**map):
         parity = paritygen(web.stripecount)
         count = 0
         for k, n in i:
             if k == "tip": # skip tip
                 continue
 
             count += 1
             if count > 10: # limit to 10 tags
                 break
 
             yield tmpl("tagentry",
                        parity=parity.next(),
                        tag=k,
                        node=hex(n),
                        date=web.repo[n].date())
 
     def branches(**map):
         parity = paritygen(web.stripecount)
 
         b = web.repo.branchtags()
         l = [(-web.repo.changelog.rev(n), n, t) for t, n in b.iteritems()]
         for r,n,t in sorted(l):
             yield {'parity': parity.next(),
                    'branch': t,
                    'node': hex(n),
                    'date': web.repo[n].date()}
 
     def changelist(**map):
         parity = paritygen(web.stripecount, offset=start-end)
         l = [] # build a list in forward order for efficiency
         for i in xrange(start, end):
             ctx = web.repo[i]
             n = ctx.node()
             hn = hex(n)
 
             l.insert(0, tmpl(
                'shortlogentry',
                 parity=parity.next(),
                 author=ctx.user(),
                 desc=ctx.description(),
                 date=ctx.date(),
                 rev=i,
                 node=hn,
                 tags=webutil.nodetagsdict(web.repo, n),
                 inbranch=webutil.nodeinbranch(web.repo, ctx),
                 branches=webutil.nodebranchdict(web.repo, ctx)))
 
         yield l
 
     cl = web.repo.changelog
     count = len(cl)
     start = max(0, count - web.maxchanges)
     end = min(count, start + web.maxchanges)
 
     return tmpl("summary",
                 desc=web.config("web", "description", "unknown"),
                 owner=get_contact(web.config) or "unknown",
                 lastchange=cl.read(cl.tip())[2],
                 tags=tagentries,
                 branches=branches,
                 shortlog=changelist,
                 node=hex(cl.tip()),
                 archives=web.archivelist("tip"))
 
 def filediff(web, req, tmpl):
     fctx, ctx = None, None
     try:
         fctx = webutil.filectx(web.repo, req)
     except LookupError:
         ctx = webutil.changectx(web.repo, req)
         path = webutil.cleanpath(web.repo, req.form['file'][0])
         if path not in ctx.files():
             raise
 
     if fctx is not None:
         n = fctx.node()
         path = fctx.path()
     else:
         n = ctx.node()
         # path already defined in except clause
 
     parity = paritygen(web.stripecount)
-    diffs = webutil.diffs(web.repo, tmpl, fctx or ctx, [path], parity)
+    style = web.config('web', 'style', 'paper')
+    if 'style' in req.form:
+        style = req.form['style'][0]
+
+    diffs = webutil.diffs(web.repo, tmpl, fctx or ctx, [path], parity, style)
     rename = fctx and webutil.renamelink(fctx) or []
     ctx = fctx and fctx or ctx
     return tmpl("filediff",
                 file=path,
                 node=hex(n),
                 rev=ctx.rev(),
                 date=ctx.date(),
                 desc=ctx.description(),
                 author=ctx.user(),
                 rename=rename,
                 branch=webutil.nodebranchnodefault(ctx),
                 parent=webutil.parents(ctx),
                 child=webutil.children(ctx),
                 diff=diffs)
 
 diff = filediff
 
 def annotate(web, req, tmpl):
     fctx = webutil.filectx(web.repo, req)
     f = fctx.path()
     parity = paritygen(web.stripecount)
 
     def annotate(**map):
         last = None
         if binary(fctx.data()):
             mt = (mimetypes.guess_type(fctx.path())[0]
                   or 'application/octet-stream')
             lines = enumerate([((fctx.filectx(fctx.filerev()), 1),
                                 '(binary:%s)' % mt)])
         else:
             lines = enumerate(fctx.annotate(follow=True, linenumber=True))
         for lineno, ((f, targetline), l) in lines:
             fnode = f.filenode()
 
             if last != fnode:
                 last = fnode
 
             yield {"parity": parity.next(),
                    "node": hex(f.node()),
                    "rev": f.rev(),
                    "author": f.user(),
                    "desc": f.description(),
                    "file": f.path(),
                    "targetline": targetline,
                    "line": l,
                    "lineid": "l%d" % (lineno + 1),
                    "linenumber": "% 6d" % (lineno + 1)}
 
     return tmpl("fileannotate",
                 file=f,
                 annotate=annotate,
                 path=webutil.up(f),
                 rev=fctx.rev(),
                 node=hex(fctx.node()),
                 author=fctx.user(),
                 date=fctx.date(),
                 desc=fctx.description(),
                 rename=webutil.renamelink(fctx),
                 branch=webutil.nodebranchnodefault(fctx),
                 parent=webutil.parents(fctx),
                 child=webutil.children(fctx),
                 permissions=fctx.manifest().flags(f))
 
 def filelog(web, req, tmpl):
 
     try:
         fctx = webutil.filectx(web.repo, req)
         f = fctx.path()
         fl = fctx.filelog()
     except error.LookupError:
         f = webutil.cleanpath(web.repo, req.form['file'][0])
         fl = web.repo.file(f)
         numrevs = len(fl)
         if not numrevs: # file doesn't exist at all
             raise
         rev = webutil.changectx(web.repo, req).rev()
         first = fl.linkrev(0)
         if rev < first: # current rev is from before file existed
             raise
         frev = numrevs - 1
         while fl.linkrev(frev) > rev:
             frev -= 1
         fctx = web.repo.filectx(f, fl.linkrev(frev))
 
     count = fctx.filerev() + 1
     pagelen = web.maxshortchanges
     start = max(0, fctx.filerev() - pagelen + 1) # first rev on this page
     end = min(count, start + pagelen) # last rev on this page
     parity = paritygen(web.stripecount, offset=start-end)
 
     def entries(limit=0, **map):
         l = []
 
         repo = web.repo
         for i in xrange(start, end):
             iterfctx = fctx.filectx(i)
 
             l.insert(0, {"parity": parity.next(),
                          "filerev": i,
                          "file": f,
                          "node": hex(iterfctx.node()),
                          "author": iterfctx.user(),
                          "date": iterfctx.date(),
                          "rename": webutil.renamelink(iterfctx),
                          "parent": webutil.parents(iterfctx),
                          "child": webutil.children(iterfctx),
                          "desc": iterfctx.description(),
                          "tags": webutil.nodetagsdict(repo, iterfctx.node()),
                          "branch": webutil.nodebranchnodefault(iterfctx),
                          "inbranch": webutil.nodeinbranch(repo, iterfctx),
                          "branches": webutil.nodebranchdict(repo, iterfctx)})
 
         if limit > 0:
             l = l[:limit]
 
         for e in l:
             yield e
 
     nodefunc = lambda x: fctx.filectx(fileid=x)
     nav = webutil.revnavgen(end - 1, pagelen, count, nodefunc)
     return tmpl("filelog", file=f, node=hex(fctx.node()), nav=nav,
                 entries=lambda **x: entries(limit=0, **x),
                 latestentry=lambda **x: entries(limit=1, **x))
 
 
 def archive(web, req, tmpl):
     type_ = req.form.get('type', [None])[0]
     allowed = web.configlist("web", "allow_archive")
     key = req.form['node'][0]
 
     if type_ not in web.archives:
         msg = 'Unsupported archive type: %s' % type_
         raise ErrorResponse(HTTP_NOT_FOUND, msg)
 
     if not ((type_ in allowed or
         web.configbool("web", "allow" + type_, False))):
         msg = 'Archive type not allowed: %s' % type_
         raise ErrorResponse(HTTP_FORBIDDEN, msg)
 
     reponame = re.sub(r"\W+", "-", os.path.basename(web.reponame))
     cnode = web.repo.lookup(key)
     arch_version = key
     if cnode == key or key == 'tip':
         arch_version = short(cnode)
     name = "%s-%s" % (reponame, arch_version)
     mimetype, artype, extension, encoding = web.archive_specs[type_]
     headers = [
         ('Content-Type', mimetype),
         ('Content-Disposition', 'attachment; filename=%s%s' % (name, extension))
     ]
     if encoding:
         headers.append(('Content-Encoding', encoding))
     req.header(headers)
     req.respond(HTTP_OK)
     archival.archive(web.repo, req, cnode, artype, prefix=name)
     return []
 
 
 def static(web, req, tmpl):
     fname = req.form['file'][0]
     # a repo owner may set web.static in .hg/hgrc to get any file
     # readable by the user running the CGI script
     static = web.config("web", "static", None, untrusted=False)
     if not static:
         tp = web.templatepath or templater.templatepath()
         if isinstance(tp, str):
             tp = [tp]
         static = [os.path.join(p, 'static') for p in tp]
     return [staticfile(static, fname, req)]
 
 def graph(web, req, tmpl):
     rev = webutil.changectx(web.repo, req).rev()
     bg_height = 39
 
     revcount = 25
     if 'revcount' in req.form:
         revcount = int(req.form.get('revcount', [revcount])[0])
         tmpl.defaults['sessionvars']['revcount'] = revcount
 
     lessvars = copy.copy(tmpl.defaults['sessionvars'])
     lessvars['revcount'] = revcount / 2
     morevars = copy.copy(tmpl.defaults['sessionvars'])
     morevars['revcount'] = revcount * 2
 
     max_rev = len(web.repo) - 1
     revcount = min(max_rev, revcount)
     revnode = web.repo.changelog.node(rev)
     revnode_hex = hex(revnode)
     uprev = min(max_rev, rev + revcount)
     downrev = max(0, rev - revcount)
     count = len(web.repo)
     changenav = webutil.revnavgen(rev, revcount, count, web.repo.changectx)
 
     dag = graphmod.revisions(web.repo, rev, downrev)
     tree = list(graphmod.colored(dag))
     canvasheight = (len(tree) + 1) * bg_height - 27;
     data = []
     for (id, type, ctx, vtx, edges) in tree:
         if type != graphmod.CHANGESET:
             continue
         node = short(ctx.node())
         age = templatefilters.age(ctx.date())
         desc = templatefilters.firstline(ctx.description())
         desc = cgi.escape(templatefilters.nonempty(desc))
         user = cgi.escape(templatefilters.person(ctx.user()))
         branch = ctx.branch()
         branch = branch, web.repo.branchtags().get(branch) == ctx.node()
         data.append((node, vtx, edges, desc, user, age, branch, ctx.tags()))
 
     return tmpl('graph', rev=rev, revcount=revcount, uprev=uprev,
                 lessvars=lessvars, morevars=morevars, downrev=downrev,
                 canvasheight=canvasheight, jsdata=data, bg_height=bg_height,
                 node=revnode_hex, changenav=changenav)

mercurial/hgweb/webutil.py

@@ -1,218 +1,218
 # hgweb/webutil.py - utility library for the web interface.
 #
 # Copyright 21 May 2005 - (c) 2005 Jake Edge <[e-mail]>
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2, incorporated herein by reference.
 
 import os, copy
 from mercurial import match, patch, util, error
 from mercurial.node import hex, nullid
 
 def up(p):
     if p[0] != "/":
         p = "/" + p
     if p[-1] == "/":
         p = p[:-1]
     up = os.path.dirname(p)
     if up == "/":
         return "/"
     return up + "/"
 
 def revnavgen(pos, pagelen, limit, nodefunc):
     def seq(factor, limit=None):
         if limit:
             yield limit
             if limit >= 20 and limit <= 40:
                 yield 50
         else:
             yield 1 * factor
             yield 3 * factor
         for f in seq(factor * 10):
             yield f
 
     def nav(**map):
         l = []
         last = 0
         for f in seq(1, pagelen):
             if f < pagelen or f <= last:
                 continue
             if f > limit:
                 break
             last = f
             if pos + f < limit:
                 l.append(("+%d" % f, hex(nodefunc(pos + f).node())))
             if pos - f >= 0:
                 l.insert(0, ("-%d" % f, hex(nodefunc(pos - f).node())))
 
         try:
             yield {"label": "(0)", "node": hex(nodefunc('0').node())}
 
             for label, node in l:
                 yield {"label": label, "node": node}
 
             yield {"label": "tip", "node": "tip"}
         except error.RepoError:
             pass
 
     return nav
 
 def _siblings(siblings=[], hiderev=None):
     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()}
         d['user'] = s.user()
         d['date'] = s.date()
         d['description'] = s.description()
         d['branch'] = s.branch()
         if hasattr(s, 'path'):
             d['file'] = s.path()
         yield d
 
 def parents(ctx, hide=None):
     return _siblings(ctx.parents(), hide)
 
 def children(ctx, hide=None):
     return _siblings(ctx.children(), hide)
 
 def renamelink(fctx):
     r = fctx.renamed()
     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):
     changeid = "tip"
     if 'node' in req.form:
         changeid = req.form['node'][0]
     elif 'manifest' in req.form:
         changeid = req.form['manifest'][0]
 
     try:
         ctx = repo[changeid]
     except error.RepoError:
         man = repo.manifest
         ctx = repo[man.linkrev(man.rev(man.lookup(changeid)))]
 
     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:
         fctx = repo[changeid][path]
     except error.RepoError:
         fctx = repo.filectx(path, fileid=changeid)
 
     return fctx
 
 def listfilediffs(tmpl, files, node, max):
     for f in files[:max]:
         yield tmpl('filedifflink', node=hex(node), file=f)
     if len(files) > max:
         yield tmpl('fileellipses')
 
-def diffs(repo, tmpl, ctx, files, parity):
+def diffs(repo, tmpl, ctx, files, parity, style):
 
     def countgen():
         start = 1
         while True:
             yield start
             start += 1
 
     blockcount = countgen()
     def prettyprintlines(diff):
         blockno = blockcount.next()
         for lineno, l in enumerate(diff.splitlines(True)):
             lineno = "%d.%d" % (blockno, lineno + 1)
             if l.startswith('+'):
                 ltype = "difflineplus"
             elif l.startswith('-'):
                 ltype = "difflineminus"
             elif l.startswith('@'):
                 ltype = "difflineat"
             else:
                 ltype = "diffline"
             yield tmpl(ltype,
                        line=l,
                        lineid="l%s" % lineno,
                        linenumber="% 8s" % lineno)
 
     if files:
         m = match.exact(repo.root, repo.getcwd(), files)
     else:
         m = match.always(repo.root, repo.getcwd())
 
     diffopts = patch.diffopts(repo.ui, untrusted=True)
     parents = ctx.parents()
     node1 = parents and parents[0].node() or nullid
     node2 = ctx.node()
 
     block = []
     for chunk in patch.diff(repo, node1, node2, m, opts=diffopts):
         if chunk.startswith('diff') and block:
             yield tmpl('diffblock', parity=parity.next(),
                        lines=prettyprintlines(''.join(block)))
             block = []
-        if chunk.startswith('diff'):
+        if chunk.startswith('diff') and style != 'raw':
             chunk = ''.join(chunk.splitlines(True)[1:])
         block.append(chunk)
     yield tmpl('diffblock', parity=parity.next(),
                lines=prettyprintlines(''.join(block)))
 
 class sessionvars(object):
     def __init__(self, vars, start='?'):
         self.start = start
         self.vars = vars
     def __getitem__(self, key):
         return self.vars[key]
     def __setitem__(self, key, value):
         self.vars[key] = value
     def __copy__(self):
         return sessionvars(copy.copy(self.vars), self.start)
     def __iter__(self):
         separator = self.start
         for key, value in self.vars.iteritems():
             yield {'name': key, 'value': str(value), 'separator': separator}
             separator = '&'

tests/test-hgweb-commands.out

@@ -1,988 +1,990
 % Set up the repo
 adding da/foo
 adding foo
 marked working directory as branch stable
 % Logs and changes
 200 Script output follows
 
 <?xml version="1.0" encoding="ascii"?>
 <feed xmlns="http://127.0.0.1/2005/Atom">
  <!-- Changelog -->
  <id>http://127.0.0.1/</id>
  <link rel="self" href="http://127.0.0.1/atom-log"/>
  <link rel="alternate" href="http://127.0.0.1/"/>
  <title>test Changelog</title>
  <updated>1970-01-01T00:00:00+00:00</updated>
 
  <entry>
   <title>branch</title>
   <id>http://127.0.0.1/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe</id>
   <link href="http://127.0.0.1/rev/1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
   </author>
   <updated>1970-01-01T00:00:00+00:00</updated>
   <published>1970-01-01T00:00:00+00:00</published>
   <content type="xhtml">
    <div xmlns="http://127.0.0.1/1999/xhtml">
     <pre xml:space="preserve">branch</pre>
    </div>
   </content>
  </entry>
  <entry>
   <title>Added tag 1.0 for changeset 2ef0ac749a14</title>
   <id>http://127.0.0.1/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de</id>
   <link href="http://127.0.0.1/rev/a4f92ed23982be056b9852de5dfe873eaac7f0de"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
   </author>
   <updated>1970-01-01T00:00:00+00:00</updated>
   <published>1970-01-01T00:00:00+00:00</published>
   <content type="xhtml">
    <div xmlns="http://127.0.0.1/1999/xhtml">
     <pre xml:space="preserve">Added tag 1.0 for changeset 2ef0ac749a14</pre>
    </div>
   </content>
  </entry>
  <entry>
   <title>base</title>
   <id>http://127.0.0.1/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id>
   <link href="http://127.0.0.1/rev/2ef0ac749a14e4f57a5a822464a0902c6f7f448f"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
   </author>
   <updated>1970-01-01T00:00:00+00:00</updated>
   <published>1970-01-01T00:00:00+00:00</published>
   <content type="xhtml">
    <div xmlns="http://127.0.0.1/1999/xhtml">
     <pre xml:space="preserve">base</pre>
    </div>
   </content>
  </entry>
 
 </feed>
 200 Script output follows
 
 <?xml version="1.0" encoding="ascii"?>
 <feed xmlns="http://127.0.0.1/2005/Atom">
  <!-- Changelog -->
  <id>http://127.0.0.1/</id>
  <link rel="self" href="http://127.0.0.1/atom-log"/>
  <link rel="alternate" href="http://127.0.0.1/"/>
  <title>test Changelog</title>
  <updated>1970-01-01T00:00:00+00:00</updated>
 
  <entry>
   <title>branch</title>
   <id>http://127.0.0.1/#changeset-1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe</id>
   <link href="http://127.0.0.1/rev/1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
   </author>
   <updated>1970-01-01T00:00:00+00:00</updated>
   <published>1970-01-01T00:00:00+00:00</published>
   <content type="xhtml">
    <div xmlns="http://127.0.0.1/1999/xhtml">
     <pre xml:space="preserve">branch</pre>
    </div>
   </content>
  </entry>
  <entry>
   <title>Added tag 1.0 for changeset 2ef0ac749a14</title>
   <id>http://127.0.0.1/#changeset-a4f92ed23982be056b9852de5dfe873eaac7f0de</id>
   <link href="http://127.0.0.1/rev/a4f92ed23982be056b9852de5dfe873eaac7f0de"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
   </author>
   <updated>1970-01-01T00:00:00+00:00</updated>
   <published>1970-01-01T00:00:00+00:00</published>
   <content type="xhtml">
    <div xmlns="http://127.0.0.1/1999/xhtml">
     <pre xml:space="preserve">Added tag 1.0 for changeset 2ef0ac749a14</pre>
    </div>
   </content>
  </entry>
  <entry>
   <title>base</title>
   <id>http://127.0.0.1/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id>
   <link href="http://127.0.0.1/rev/2ef0ac749a14e4f57a5a822464a0902c6f7f448f"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
   </author>
   <updated>1970-01-01T00:00:00+00:00</updated>
   <published>1970-01-01T00:00:00+00:00</published>
   <content type="xhtml">
    <div xmlns="http://127.0.0.1/1999/xhtml">
     <pre xml:space="preserve">base</pre>
    </div>
   </content>
  </entry>
 
 </feed>
 200 Script output follows
 
 <?xml version="1.0" encoding="ascii"?>
 <feed xmlns="http://127.0.0.1/2005/Atom">
  <id>http://127.0.0.1/atom-log/tip/foo</id>
  <link rel="self" href="http://127.0.0.1/atom-log/tip/foo"/>
  <title>test: foo history</title>
  <updated>1970-01-01T00:00:00+00:00</updated>
 
  <entry>
   <title>base</title>
   <id>http://127.0.0.1/#changeset-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id>
   <link href="http://127.0.0.1/rev/2ef0ac749a14e4f57a5a822464a0902c6f7f448f"/>
   <author>
    <name>test</name>
    <email>&#116;&#101;&#115;&#116;</email>
   </author>
   <updated>1970-01-01T00:00:00+00:00</updated>
   <published>1970-01-01T00:00:00+00:00</published>
   <content type="xhtml">
    <div xmlns="http://127.0.0.1/1999/xhtml">
     <pre xml:space="preserve">base</pre>
    </div>
   </content>
  </entry>
 
 </feed>
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: log</title>
 <link rel="alternate" type="application/atom+xml"
    href="/atom-log" title="Atom feed for test" />
 <link rel="alternate" type="application/rss+xml"
    href="/rss-log" title="RSS feed for test" />
 </head>
 <body>
 
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
 <li class="active">log</li>
 <li><a href="/graph/1d22e65f027e">graph</a></li>
 <li><a href="/tags">tags</a></li>
 <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
 <li><a href="/rev/1d22e65f027e">changeset</a></li>
 <li><a href="/file/1d22e65f027e">browse</a></li>
 </ul>
 <ul>
 
 </ul>
 </div>
 
 <div class="main">
 <h2><a href="/">test</a></h2>
 <h3>log</h3>
 
 <form class="search" action="/log">
 
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="navigate">rev 2: <a href="/shortlog/2ef0ac749a14">(0)</a> <a href="/shortlog/tip">tip</a> </div>
 
 <table class="bigtable">
  <tr>
   <th class="age">age</th>
   <th class="author">author</th>
   <th class="description">description</th>
  </tr>
  <tr class="parity0">
   <td class="age">many years</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/1d22e65f027e">branch</a><span class="branchhead">stable</span> <span class="tag">tip</span> </td>
  </tr>
  <tr class="parity1">
   <td class="age">many years</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/a4f92ed23982">Added tag 1.0 for changeset 2ef0ac749a14</a><span class="branchhead">default</span> </td>
  </tr>
  <tr class="parity0">
   <td class="age">many years</td>
   <td class="author">test</td>
   <td class="description"><a href="/rev/2ef0ac749a14">base</a><span class="tag">1.0</span> </td>
  </tr>
 
 </table>
 
 <div class="navigate">rev 2: <a href="/shortlog/2ef0ac749a14">(0)</a> <a href="/shortlog/tip">tip</a> </div>
 </div>
 </div>
 
 
 
 </body>
 </html>
 
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: 2ef0ac749a14</title>
 </head>
 <body>
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
  <li><a href="/shortlog/2ef0ac749a14">log</a></li>
  <li><a href="/graph/2ef0ac749a14">graph</a></li>
  <li><a href="/tags">tags</a></li>
  <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
  <li class="active">changeset</li>
  <li><a href="/raw-rev/2ef0ac749a14">raw</a></li>
  <li><a href="/file/2ef0ac749a14">browse</a></li>
 </ul>
 <ul>
  
 </ul>
 </div>
 
 <div class="main">
 
 <h2><a href="/">test</a></h2>
 <h3>changeset 0:2ef0ac749a14  <span class="tag">1.0</span> </h3>
 
 <form class="search" action="/log">
 
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="description">base</div>
 
 <table id="changesetEntry">
 <tr>
  <th class="author">author</th>
  <td class="author">&#116;&#101;&#115;&#116;</td>
 </tr>
 <tr>
  <th class="date">date</th>
  <td class="date">Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td></tr>
 <tr>
  <th class="author">parents</th>
  <td class="author"></td>
 </tr>
 <tr>
  <th class="author">children</th>
  <td class="author"> <a href="/rev/a4f92ed23982">a4f92ed23982</a></td>
 </tr>
 <tr>
  <th class="files">files</th>
  <td class="files"><a href="/file/2ef0ac749a14/da/foo">da/foo</a> <a href="/file/2ef0ac749a14/foo">foo</a> </td>
 </tr>
 </table>
 
 <div class="overflow">
 <div class="sourcefirst">   line diff</div>
 
 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 </span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ b/da/foo	Thu Jan 01 00:00:00 1970 +0000
 </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="atline">@@ -0,0 +1,1 @@
 </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="plusline">+foo
 </span></pre></div><div class="source bottomline parity1"><pre><a href="#l2.1" id="l2.1">     2.1</a> <span class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 </span><a href="#l2.2" id="l2.2">     2.2</a> <span class="plusline">+++ b/foo	Thu Jan 01 00:00:00 1970 +0000
 </span><a href="#l2.3" id="l2.3">     2.3</a> <span class="atline">@@ -0,0 +1,1 @@
 </span><a href="#l2.4" id="l2.4">     2.4</a> <span class="plusline">+foo
 </span></pre></div>
 </div>
 
 </div>
 </div>
 
 
 </body>
 </html>
 
 200 Script output follows
 
 
 # HG changeset patch
 # User test
 # Date 0 0
 # Node ID a4f92ed23982be056b9852de5dfe873eaac7f0de
 # Parent  2ef0ac749a14e4f57a5a822464a0902c6f7f448f
 Added tag 1.0 for changeset 2ef0ac749a14
 
+diff -r 2ef0ac749a14 -r a4f92ed23982 .hgtags
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/.hgtags	Thu Jan 01 00:00:00 1970 +0000
 @@ -0,0 +1,1 @@
 +2ef0ac749a14e4f57a5a822464a0902c6f7f448f 1.0
 
 % File-related
 200 Script output follows
 
 foo
 200 Script output follows
 
 
 test@0: foo
 
 
 
 
 200 Script output follows
 
 
 drwxr-xr-x da
 -rw-r--r-- 45 .hgtags
 -rw-r--r-- 4 foo
 
 
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: a4f92ed23982 foo</title>
 </head>
 <body>
 
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
 <li><a href="/shortlog/a4f92ed23982">log</a></li>
 <li><a href="/graph/a4f92ed23982">graph</a></li>
 <li><a href="/tags">tags</a></li>
 <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
 <li><a href="/rev/a4f92ed23982">changeset</a></li>
 <li><a href="/file/a4f92ed23982/">browse</a></li>
 </ul>
 <ul>
 <li class="active">file</li>
 <li><a href="/diff/a4f92ed23982/foo">diff</a></li>
 <li><a href="/annotate/a4f92ed23982/foo">annotate</a></li>
 <li><a href="/log/a4f92ed23982/foo">file log</a></li>
 <li><a href="/raw-file/a4f92ed23982/foo">raw</a></li>
 </ul>
 </div>
 
 <div class="main">
 <h2><a href="/">test</a></h2>
 <h3>view foo @ 1:a4f92ed23982</h3>
 
 <form class="search" action="/log">
 
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="description">Added tag 1.0 for changeset 2ef0ac749a14</div>
 
 <table id="changesetEntry">
 <tr>
  <th class="author">author</th>
  <td class="author">&#116;&#101;&#115;&#116;</td>
 </tr>
 <tr>
  <th class="date">date</th>
  <td class="date">Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td>
 </tr>
 <tr>
  <th class="author">parents</th>
  <td class="author"></td>
 </tr>
 <tr>
  <th class="author">children</th>
  <td class="author"><a href="/file/1d22e65f027e/foo">1d22e65f027e</a> </td>
 </tr>
 
 </table>
 
 <div class="overflow">
 <div class="sourcefirst"> line source</div>
 
 <div class="parity0 source"><a href="#l1" id="l1">     1</a> foo
 </div>
 <div class="sourcelast"></div>
 </div>
 </div>
 </div>
 
 
 
 </body>
 </html>
 
 200 Script output follows
 
 
+diff -r 000000000000 -r a4f92ed23982 foo
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
 @@ -0,0 +1,1 @@
 +foo
 
 
 
 
 % Overviews
 200 Script output follows
 
 <?xml version="1.0" encoding="ascii"?>
 <feed xmlns="http://127.0.0.1/2005/Atom">
  <id>http://127.0.0.1/</id>
  <link rel="self" href="http://127.0.0.1/atom-tags"/>
  <link rel="alternate" href="http://127.0.0.1/tags"/>
  <title>test: tags</title>
  <summary>test tag history</summary>
  <author><name>Mercurial SCM</name></author>
  <updated>1970-01-01T00:00:00+00:00</updated>
 
  <entry>
   <title>1.0</title>
   <link rel="alternate" href="http://127.0.0.1/rev/2ef0ac749a14e4f57a5a822464a0902c6f7f448f"/>
   <id>http://127.0.0.1/#tag-2ef0ac749a14e4f57a5a822464a0902c6f7f448f</id>
   <updated>1970-01-01T00:00:00+00:00</updated>
   <published>1970-01-01T00:00:00+00:00</published>
   <content type="text">1.0</content>
  </entry>
 
 </feed>
 200 Script output follows
 
 <?xml version="1.0" encoding="ascii"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://127.0.0.1/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://127.0.0.1/1999/xhtml" xml:lang="en-US" lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow"/>
 <link rel="stylesheet" href="/static/style-gitweb.css" type="text/css" />
 
 
 <title>test: Branches</title>
 <link rel="alternate" type="application/atom+xml"
    href="/atom-tags" title="Atom feed for test"/>
 <link rel="alternate" type="application/rss+xml"
    href="/rss-tags" title="RSS feed for test"/>
 </head>
 <body>
 
 <div class="page_header">
 <a href="http://127.0.0.1/" title="Mercurial" style="float: right;">Mercurial</a><a href="/summary?style=gitweb">test</a> / branches
 </div>
 
 <div class="page_nav">
 <a href="/summary?style=gitweb">summary</a> |
 <a href="/shortlog?style=gitweb">shortlog</a> |
 <a href="/log?style=gitweb">changelog</a> |
 <a href="/graph?style=gitweb">graph</a> |
 <a href="/tags?style=gitweb">tags</a> |
 branches |
 <a href="/file/1d22e65f027e?style=gitweb">files</a>
 <br/>
 </div>
 
 <div class="title">&nbsp;</div>
 <table cellspacing="0">
 
 <tr class="parity0">
 <td class="age"><i>many years ago</i></td>
 <td><a class="list" href="/shortlog/1d22e65f027e?style=gitweb"><b>1d22e65f027e</b></a></td>
 <td class="open">stable</td>
 <td class="link">
 <a href="/changeset/1d22e65f027e?style=gitweb">changeset</a> |
 <a href="/log/1d22e65f027e?style=gitweb">changelog</a> |
 <a href="/file/1d22e65f027e?style=gitweb">files</a>
 </td>
 </tr>
 <tr class="parity1">
 <td class="age"><i>many years ago</i></td>
 <td><a class="list" href="/shortlog/a4f92ed23982?style=gitweb"><b>a4f92ed23982</b></a></td>
 <td class="inactive">default</td>
 <td class="link">
 <a href="/changeset/a4f92ed23982?style=gitweb">changeset</a> |
 <a href="/log/a4f92ed23982?style=gitweb">changelog</a> |
 <a href="/file/a4f92ed23982?style=gitweb">files</a>
 </td>
 </tr>
 </table>
 
 <div class="page_footer">
 <div class="page_footer_text">test</div>
 <div class="rss_logo">
 <a href="/rss-log">RSS</a>
 <a href="/atom-log">Atom</a>
 </div>
 <br />
 
 </div>
 </body>
 </html>
 
 200 Script output follows
 
 <?xml version="1.0" encoding="ascii"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow"/>
 <link rel="stylesheet" href="/static/style-gitweb.css" type="text/css" />
 
 
 <title>test: Summary</title>
 <link rel="alternate" type="application/atom+xml"
    href="/atom-log" title="Atom feed for test"/>
 <link rel="alternate" type="application/rss+xml"
    href="/rss-log" title="RSS feed for test"/>
 </head>
 <body>
 
 <div class="page_header">
 <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="/summary?style=gitweb">test</a> / summary
 
 <form action="/log">
 <input type="hidden" name="style" value="gitweb" />
 <div class="search">
 <input type="text" name="rev"  />
 </div>
 </form>
 </div>
 
 <div class="page_nav">
 summary |
 <a href="/shortlog?style=gitweb">shortlog</a> |
 <a href="/log?style=gitweb">changelog</a> |
 <a href="/graph?style=gitweb">graph</a> |
 <a href="/tags?style=gitweb">tags</a> |
 <a href="/branches?style=gitweb">branches</a> |
 <a href="/file/1d22e65f027e?style=gitweb">files</a>
 <br/>
 </div>
 
 <div class="title">&nbsp;</div>
 <table cellspacing="0">
 <tr><td>description</td><td>unknown</td></tr>
 <tr><td>owner</td><td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td></tr>
 <tr><td>last change</td><td>Thu, 01 Jan 1970 00:00:00 +0000</td></tr>
 </table>
 
 <div><a  class="title" href="/shortlog?style=gitweb">changes</a></div>
 <table cellspacing="0">
 
 <tr class="parity0">
 <td class="age"><i>many years ago</i></td>
 <td><i>test</i></td>
 <td>
 <a class="list" href="/rev/1d22e65f027e?style=gitweb">
 <b>branch</b>
 <span class="logtags"><span class="branchtag" title="stable">stable</span> <span class="tagtag" title="tip">tip</span> </span>
 </a>
 </td>
 <td class="link" nowrap>
 <a href="/rev/1d22e65f027e?style=gitweb">changeset</a> |
 <a href="/file/1d22e65f027e?style=gitweb">files</a>
 </td>
 </tr>
 <tr class="parity1">
 <td class="age"><i>many years ago</i></td>
 <td><i>test</i></td>
 <td>
 <a class="list" href="/rev/a4f92ed23982?style=gitweb">
 <b>Added tag 1.0 for changeset 2ef0ac749a14</b>
 <span class="logtags"><span class="branchtag" title="default">default</span> </span>
 </a>
 </td>
 <td class="link" nowrap>
 <a href="/rev/a4f92ed23982?style=gitweb">changeset</a> |
 <a href="/file/a4f92ed23982?style=gitweb">files</a>
 </td>
 </tr>
 <tr class="parity0">
 <td class="age"><i>many years ago</i></td>
 <td><i>test</i></td>
 <td>
 <a class="list" href="/rev/2ef0ac749a14?style=gitweb">
 <b>base</b>
 <span class="logtags"><span class="tagtag" title="1.0">1.0</span> </span>
 </a>
 </td>
 <td class="link" nowrap>
 <a href="/rev/2ef0ac749a14?style=gitweb">changeset</a> |
 <a href="/file/2ef0ac749a14?style=gitweb">files</a>
 </td>
 </tr>
 <tr class="light"><td colspan="4"><a class="list" href="/shortlog?style=gitweb">...</a></td></tr>
 </table>
 
 <div><a class="title" href="/tags?style=gitweb">tags</a></div>
 <table cellspacing="0">
 
 <tr class="parity0">
 <td class="age"><i>many years ago</i></td>
 <td><a class="list" href="/rev/2ef0ac749a14?style=gitweb"><b>1.0</b></a></td>
 <td class="link">
 <a href="/rev/2ef0ac749a14?style=gitweb">changeset</a> |
 <a href="/log/2ef0ac749a14?style=gitweb">changelog</a> |
 <a href="/file/2ef0ac749a14?style=gitweb">files</a>
 </td>
 </tr>
 <tr class="light"><td colspan="3"><a class="list" href="/tags?style=gitweb">...</a></td></tr>
 </table>
 
 <div><a class="title" href="#">branches</a></div>
 <table cellspacing="0">
 
 <tr class="parity0">
 <td class="age"><i>many years ago</i></td>
 <td><a class="list" href="/shortlog/1d22e65f027e?style=gitweb"><b>1d22e65f027e</b></a></td>
 <td class="">stable</td>
 <td class="link">
 <a href="/changeset/1d22e65f027e?style=gitweb">changeset</a> |
 <a href="/log/1d22e65f027e?style=gitweb">changelog</a> |
 <a href="/file/1d22e65f027e?style=gitweb">files</a>
 </td>
 </tr>
 <tr class="parity1">
 <td class="age"><i>many years ago</i></td>
 <td><a class="list" href="/shortlog/a4f92ed23982?style=gitweb"><b>a4f92ed23982</b></a></td>
 <td class="">default</td>
 <td class="link">
 <a href="/changeset/a4f92ed23982?style=gitweb">changeset</a> |
 <a href="/log/a4f92ed23982?style=gitweb">changelog</a> |
 <a href="/file/a4f92ed23982?style=gitweb">files</a>
 </td>
 </tr>
 <tr class="light">
   <td colspan="4"><a class="list"  href="#">...</a></td>
 </tr>
 </table>
 <div class="page_footer">
 <div class="page_footer_text">test</div>
 <div class="rss_logo">
 <a href="/rss-log">RSS</a>
 <a href="/atom-log">Atom</a>
 </div>
 <br />
 
 </div>
 </body>
 </html>
 
 200 Script output follows
 
 <?xml version="1.0" encoding="ascii"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow"/>
 <link rel="stylesheet" href="/static/style-gitweb.css" type="text/css" />
 
 
 <title>test: Graph</title>
 <link rel="alternate" type="application/atom+xml"
    href="/atom-log" title="Atom feed for test"/>
 <link rel="alternate" type="application/rss+xml"
    href="/rss-log" title="RSS feed for test"/>
 <!--[if IE]><script type="text/javascript" src="/static/excanvas.js"></script><![endif]-->
 </head>
 <body>
 
 <div class="page_header">
 <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="/summary?style=gitweb">test</a> / graph
 </div>
 
 <form action="/log">
 <input type="hidden" name="style" value="gitweb" />
 <div class="search">
 <input type="text" name="rev"  />
 </div>
 </form>
 <div class="page_nav">
 <a href="/summary?style=gitweb">summary</a> |
 <a href="/shortlog?style=gitweb">shortlog</a> |
 <a href="/log/2?style=gitweb">changelog</a> |
 graph |
 <a href="/tags?style=gitweb">tags</a> |
 <a href="/branches?style=gitweb">branches</a> |
 <a href="/file/1d22e65f027e?style=gitweb">files</a>
 <br/>
 <a href="/graph/2?style=gitweb&revcount=12">less</a>
 <a href="/graph/2?style=gitweb&revcount=50">more</a>
 | <a href="/graph/2ef0ac749a14?style=gitweb">(0)</a> <a href="/graph/2ef0ac749a14?style=gitweb">-2</a> <a href="/graph/tip?style=gitweb">tip</a> <br/>
 </div>
 
 <div class="title">&nbsp;</div>
 
 <noscript>The revision graph only works with JavaScript-enabled browsers.</noscript>
 
 <div id="wrapper">
 <ul id="nodebgs"></ul>
 <canvas id="graph" width="224" height="129"></canvas>
 <ul id="graphnodes"></ul>
 </div>
 
 <script type="text/javascript" src="/static/graph.js"></script>
 <script>
 <!-- hide script content
 
 var data = [["1d22e65f027e", [0, 1], [[0, 0, 1]], "branch", "test", "many years", ["stable", true], ["tip"]], ["a4f92ed23982", [0, 1], [[0, 0, 1]], "Added tag 1.0 for changeset 2ef0ac749a14", "test", "many years", ["default", true], []], ["2ef0ac749a14", [0, 1], [], "base", "test", "many years", ["default", false], ["1.0"]]];
 var graph = new Graph();
 graph.scale(39);
 
 graph.edge = function(x0, y0, x1, y1, color) {
 	
 	this.setColor(color, 0.0, 0.65);
 	this.ctx.beginPath();
 	this.ctx.moveTo(x0, y0);
 	this.ctx.lineTo(x1, y1);
 	this.ctx.stroke();
 	
 }
 
 var revlink = '<li style="_STYLE"><span class="desc">';
 revlink += '<a class="list" href="/rev/_NODEID?style=gitweb" title="_NODEID"><b>_DESC</b></a>';
 revlink += '</span> _TAGS';
 revlink += '<span class="info">_DATE ago, by _USER</span></li>';
 
 graph.vertex = function(x, y, color, parity, cur) {
 	
 	this.ctx.beginPath();
 	color = this.setColor(color, 0.25, 0.75);
 	this.ctx.arc(x, y, radius, 0, Math.PI * 2, true);
 	this.ctx.fill();
 	
 	var bg = '<li class="bg parity' + parity + '"></li>';
 	var left = (this.columns + 1) * this.bg_height;
 	var nstyle = 'padding-left: ' + left + 'px;';
 	var item = revlink.replace(/_STYLE/, nstyle);
 	item = item.replace(/_PARITY/, 'parity' + parity);
 	item = item.replace(/_NODEID/, cur[0]);
 	item = item.replace(/_NODEID/, cur[0]);
 	item = item.replace(/_DESC/, cur[3]);
 	item = item.replace(/_USER/, cur[4]);
 	item = item.replace(/_DATE/, cur[5]);
 	
 	var tagspan = '';
 	if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
 		tagspan = '<span class="logtags">';
 		if (cur[6][1]) {
 			tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';
 			tagspan += cur[6][0] + '</span> ';
 		} else if (!cur[6][1] && cur[6][0] != 'default') {
 			tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">';
 			tagspan += cur[6][0] + '</span> ';
 		}
 		if (cur[7].length) {
 			for (var t in cur[7]) {
 				var tag = cur[7][t];
 				tagspan += '<span class="tagtag">' + tag + '</span> ';
 			}
 		}
 		tagspan += '</span>';
 	}
 	
 	item = item.replace(/_TAGS/, tagspan);
 	return [bg, item];
 	
 }
 
 graph.render(data);
 
 // stop hiding script -->
 </script>
 
 <div class="page_nav">
 <a href="/graph/2?style=gitweb&revcount=12">less</a>
 <a href="/graph/2?style=gitweb&revcount=50">more</a>
 | <a href="/graph/2ef0ac749a14?style=gitweb">(0)</a> <a href="/graph/2ef0ac749a14?style=gitweb">-2</a> <a href="/graph/tip?style=gitweb">tip</a> 
 </div>
 
 <div class="page_footer">
 <div class="page_footer_text">test</div>
 <div class="rss_logo">
 <a href="/rss-log">RSS</a>
 <a href="/atom-log">Atom</a>
 </div>
 <br />
 
 </div>
 </body>
 </html>
 
 % capabilities
 200 Script output follows
 
 lookup changegroupsubset branchmap unbundle=HG10GZ,HG10BZ,HG10UN% heads
 200 Script output follows
 
 1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe
 % lookup
 200 Script output follows
 
 0 'key'
 % branches
 200 Script output follows
 
 1d22e65f027e5a0609357e7d8e7508cd2ba5d2fe 2ef0ac749a14e4f57a5a822464a0902c6f7f448f 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
 % changegroup
 200 Script output follows
 
 x\x9c\xbdTMHUA\x14\xbe\xa8\xf9\xec\xda&\x10\x11*\xb8\x88\x81\x99\xbef\xe6\xce\xbdw\xc6\xf2a\x16E\x1b\x11[%\x98\xcc\xaf\x8f\x8c\xf7\xc0\xf7\x82
 4\x11KP2m\x95\xad*\xabE\x05AP\xd0\xc22Z\x14\xf9\x03\xb9j\xa3\x9b$\xa4MJ\xb4\x90\xc0\x9a\x9bO0\x10\xdf\x13\xa2\x81\x0f\x869g\xe6|\xe7\x9c\xef\x8ceY\xf7\xa2KO\xd2\xb7K\x16~\
 \xe9\xad\x90w\x86\xab\x93W\x8e\xdf\xb0r\\Y\xee6(\xa2)\xf6\x95\xc6\x01\xe4\x1az\x80R\xe8kN\x98\xe7R\xa4\xa9K@\xe0!A\xb4k\xa7U*m\x03\x07\xd8\x92\x1d\xd2\xc9\xa4\x1d\xc2\xe6,\xa5\xcc+\x1f\xef\xafDgi\xef\xab\x1d\x1d\xb7\x9a\xe7[W\xfbc\x8f\xde-\xcd\xe7\xcaz\xb3\xbb\x19\xd3\x81\x10>c>\x08\x00"X\x11\xc2\x84@\xd2\xe7B*L\x00\x01P\x04R\xc3@\xbaB0\xdb8#\x83:\x83\xa2h\xbc=\xcd\xdaS\xe1Y,L\xd3\xa0\xf2\xa8\x94J:\xe6\xd8\x81Q\xe0\xe8d\xa7#\xe2,\xd1\xaeR*\xed \xa5\x01\x13\x01\xa6\x0cb\xe3;\xbe\xaf\xfcK[^wK\xe1N\xaf\xbbk\xe8B\xd1\xf4\xc1\x07\xb3\xab[\x10\xfdkmvwcB\xa6\xa4\xd4G\xc4D\xc2\x141\xad\x91\x10\x00\x08J\x81\xcb}\xee\t\xee+W\xba\x8a\x80\x90|\xd4\xa0\xd6\xa0\xd4T\xde\xe1\x9d,!\xe2\xb5\xa94\xe3\xe7\xd5\x9f\x06\x18\xcba\x03aP\xb8f\xcd\x04\x1a_\\9\xf1\xed\xe4\x9e\xe5\xa6\xd1\xd2\x9f\x03\xa7o\xae\x90H\xf3\xfb\xef\xffH3\xadk
 \xb0\x90\x92\x88\xb9\x14"\x068\xc2\x1e@\x00\xbb\x8a)\xd3\'\x859
 \xa8\x80\x84S \xa5\xbd-g\x13`\xe4\xdc\xc3H^\xdf\xe2\xc0TM\xc7\xf4BO\xcf\xde\xae\xe5\xae#\x1frM(K\x97`F\x19\x16s\x05GD\xb9\x01\xc1\x00+\x8c|\x9fp\xc11\xf0\x14\x00\x9cJ\x82<\xe0\x12\x9f\xc1\x90\xd0\xf5\xc8\x19>Pr\xaa\xeaW\xf5\xc4\xae\xd1\xfc\x17\xcf\'\x13u\xb1\x9e\xcdHnC\x0e\xcc`\xc8\xa0&\xac\x0e\xf1|\x8c\x10$\xc4\x8c\xa2p\x05`\xdc\x08 \x80\xc4\xd7Rr-\x94\x10\x102\xedi;\xf3f\xf1z\x16\x86\xdb\xd8d\xe5\xe7\x8b\xf5\x8d\rzp\xb2\xfe\xac\xf5\xf2\xd3\xfe\xfckws\xedt\x96b\xd5l\x1c\x0b\x85\xb5\x170\x8f\x11\x84\xb0\x8f\x19\xa0\x00\t_\x07\x1ac\xa2\xc3\x89Z\xe7\x96\xf9 \xccNFg\xc7F\xaa\x8a+\x9a\x9cc_\x17\x1b\x17\x9e]z38<\x97+\xb5,",\xc8\xc8?\\\x91\xff\x17.~U\x96\x97\xf5%\xdeN<\x8e\xf5\x97%\xe7^\xcfL\xed~\xda\x96k\xdc->\x86\x02\x83"\x96H\xa6\xe3\xaas=-\xeb7\xe5\xda\x8f\xbc
 % stream_out
 200 Script output follows
 
 1
 % failing unbundle, requires POST request
 405 Method Not Allowed
 
 0
 push requires POST request
 % Static files
 200 Script output follows
 
 a { text-decoration:none; }
 .age { white-space:nowrap; }
 .date { white-space:nowrap; }
 .indexlinks { white-space:nowrap; }
 .parity0 { background-color: #ddd; }
 .parity1 { background-color: #eee; }
 .lineno { width: 60px; color: #aaa; font-size: smaller;
           text-align: right; }
 .plusline { color: green; }
 .minusline { color: red; }
 .atline { color: purple; }
 .annotate { font-size: smaller; text-align: right; padding-right: 1em; }
 .buttons a {
   background-color: #666;
   padding: 2pt;
   color: white;
   font-family: sans;
   font-weight: bold;
 }
 .navigate a {
   background-color: #ccc;
   padding: 2pt;
   font-family: sans;
   color: black;
 }
 
 .metatag {
   background-color: #888;
   color: white;
   text-align: right;
 }
 
 /* Common */
 pre { margin: 0; }
 
 .logo {
   float: right;
   clear: right;
 }
 
 /* Changelog/Filelog entries */
 .logEntry { width: 100%; }
 .logEntry .age { width: 15%; }
 .logEntry th { font-weight: normal; text-align: right; vertical-align: top; }
 .logEntry th.age, .logEntry th.firstline { font-weight: bold; }
 .logEntry th.firstline { text-align: left; width: inherit; }
 
 /* Shortlog entries */
 .slogEntry { width: 100%; }
 .slogEntry .age { width: 8em; }
 .slogEntry td { font-weight: normal; text-align: left; vertical-align: top; }
 .slogEntry td.author { width: 15em; }
 
 /* Tag entries */
 #tagEntries { list-style: none; margin: 0; padding: 0; }
 #tagEntries .tagEntry { list-style: none; margin: 0; padding: 0; }
 
 /* Changeset entry */
 #changesetEntry { }
 #changesetEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; }
 #changesetEntry th.files, #changesetEntry th.description { vertical-align: top; }
 
 /* File diff view */
 #filediffEntry { }
 #filediffEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; }
 
 /* Graph */
 div#wrapper {
 	position: relative;
 	margin: 0;
 	padding: 0;
 }
 
 canvas {
 	position: absolute;
 	z-index: 5;
 	top: -0.6em;
 	margin: 0;
 }
 
 ul#nodebgs {
 	list-style: none inside none;
 	padding: 0;
 	margin: 0;
 	top: -0.7em;
 }
 
 ul#graphnodes li, ul#nodebgs li {
 	height: 39px;
 }
 
 ul#graphnodes {
 	position: absolute;
 	z-index: 10;
 	top: -0.85em;
 	list-style: none inside none;
 	padding: 0;
 }
 
 ul#graphnodes li .info {
 	display: block;
 	font-size: 70%;
 	position: relative;
 	top: -1px;
 }
 % ERRORS ENCOUNTERED

tests/test-hgweb-diffs

@@ -1,36 +1,42
 #!/bin/sh
 
 echo % setting up repo
 hg init test
 cd test
 echo a > a
 echo b > b
 hg ci -Ama
 
 echo % change permissions for git diffs
 chmod 755 a
 hg ci -Amb
 
 echo % set up hgweb
 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
 cat hg.pid >> $DAEMON_PIDS
 
 echo % revision
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/0'
 
+echo % raw revision
+"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-rev/0'
+
 echo % diff removed file
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a'
 
 echo % set up hgweb with git diffs
 "$TESTDIR/killdaemons.py"
 hg serve --config 'diff.git=1' -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
 cat hg.pid >> $DAEMON_PIDS
 
 echo % revision
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/0'
 
+echo % revision
+"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-rev/0'
+
 echo % diff removed file
 "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a'
 
 echo % errors
 cat errors.log

tests/test-hgweb-diffs.out

@@ -1,372 +1,418
 % setting up repo
 adding a
 adding b
 % change permissions for git diffs
 % set up hgweb
 % revision
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: 0cd96de13884</title>
 </head>
 <body>
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
  <li><a href="/shortlog/0cd96de13884">log</a></li>
  <li><a href="/graph/0cd96de13884">graph</a></li>
  <li><a href="/tags">tags</a></li>
  <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
  <li class="active">changeset</li>
  <li><a href="/raw-rev/0cd96de13884">raw</a></li>
  <li><a href="/file/0cd96de13884">browse</a></li>
 </ul>
 <ul>
  
 </ul>
 </div>
 
 <div class="main">
 
 <h2><a href="/">test</a></h2>
 <h3>changeset 0:0cd96de13884  </h3>
 
 <form class="search" action="/log">
 
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="description">a</div>
 
 <table id="changesetEntry">
 <tr>
  <th class="author">author</th>
  <td class="author">&#116;&#101;&#115;&#116;</td>
 </tr>
 <tr>
  <th class="date">date</th>
  <td class="date">Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td></tr>
 <tr>
  <th class="author">parents</th>
  <td class="author"></td>
 </tr>
 <tr>
  <th class="author">children</th>
  <td class="author"> <a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td>
 </tr>
 <tr>
  <th class="files">files</th>
  <td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td>
 </tr>
 </table>
 
 <div class="overflow">
 <div class="sourcefirst">   line diff</div>
 
 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 </span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ b/a	Thu Jan 01 00:00:00 1970 +0000
 </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="atline">@@ -0,0 +1,1 @@
 </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="plusline">+a
 </span></pre></div><div class="source bottomline parity1"><pre><a href="#l2.1" id="l2.1">     2.1</a> <span class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 </span><a href="#l2.2" id="l2.2">     2.2</a> <span class="plusline">+++ b/b	Thu Jan 01 00:00:00 1970 +0000
 </span><a href="#l2.3" id="l2.3">     2.3</a> <span class="atline">@@ -0,0 +1,1 @@
 </span><a href="#l2.4" id="l2.4">     2.4</a> <span class="plusline">+b
 </span></pre></div>
 </div>
 
 </div>
 </div>
 
 
 </body>
 </html>
 
+% raw revision
+200 Script output follows
+
+
+# HG changeset patch
+# User test
+# Date 0 0
+# Node ID 0cd96de13884b090099512d4794ae87ad067ea8e
+
+a
+
+diff -r 000000000000 -r 0cd96de13884 a
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/a	Thu Jan 01 00:00:00 1970 +0000
+@@ -0,0 +1,1 @@
++a
+diff -r 000000000000 -r 0cd96de13884 b
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/b	Thu Jan 01 00:00:00 1970 +0000
+@@ -0,0 +1,1 @@
++b
+
 % diff removed file
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: a diff</title>
 </head>
 <body>
 
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
 <li><a href="/shortlog/78e4ebad7cdf">log</a></li>
 <li><a href="/graph/78e4ebad7cdf">graph</a></li>
 <li><a href="/tags">tags</a></li>
 <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
 <li><a href="/rev/78e4ebad7cdf">changeset</a></li>
 <li><a href="/file/78e4ebad7cdf">browse</a></li>
 </ul>
 <ul>
 <li><a href="/file/78e4ebad7cdf/a">file</a></li>
 <li class="active">diff</li>
 <li><a href="/annotate/78e4ebad7cdf/a">annotate</a></li>
 <li><a href="/log/78e4ebad7cdf/a">file log</a></li>
 <li><a href="/raw-file/78e4ebad7cdf/a">raw</a></li>
 </ul>
 </div>
 
 <div class="main">
 <h2><a href="/">test</a></h2>
 <h3>diff a @ 1:78e4ebad7cdf</h3>
 
 <form class="search" action="/log">
 <p></p>
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="description">b</div>
 
 <table id="changesetEntry">
 <tr>
  <th>author</th>
  <td>&#116;&#101;&#115;&#116;</td>
 </tr>
 <tr>
  <th>date</th>
  <td>Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td>
 </tr>
 <tr>
  <th>parents</th>
  <td></td>
 </tr>
 <tr>
  <th>children</th>
  <td></td>
 </tr>
 
 </table>
 
 <div class="overflow">
 <div class="sourcefirst">   line diff</div>
 
 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> <span class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 </span><a href="#l1.2" id="l1.2">     1.2</a> <span class="plusline">+++ b/a	Thu Jan 01 00:00:00 1970 +0000
 </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="atline">@@ -0,0 +1,1 @@
 </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="plusline">+a
 </span></pre></div>
 </div>
 </div>
 </div>
 
 
 
 </body>
 </html>
 
 % set up hgweb with git diffs
 % revision
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: 0cd96de13884</title>
 </head>
 <body>
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
  <li><a href="/shortlog/0cd96de13884">log</a></li>
  <li><a href="/graph/0cd96de13884">graph</a></li>
  <li><a href="/tags">tags</a></li>
  <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
  <li class="active">changeset</li>
  <li><a href="/raw-rev/0cd96de13884">raw</a></li>
  <li><a href="/file/0cd96de13884">browse</a></li>
 </ul>
 <ul>
  
 </ul>
 </div>
 
 <div class="main">
 
 <h2><a href="/">test</a></h2>
 <h3>changeset 0:0cd96de13884  </h3>
 
 <form class="search" action="/log">
 
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="description">a</div>
 
 <table id="changesetEntry">
 <tr>
  <th class="author">author</th>
  <td class="author">&#116;&#101;&#115;&#116;</td>
 </tr>
 <tr>
  <th class="date">date</th>
  <td class="date">Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td></tr>
 <tr>
  <th class="author">parents</th>
  <td class="author"></td>
 </tr>
 <tr>
  <th class="author">children</th>
  <td class="author"> <a href="/rev/78e4ebad7cdf">78e4ebad7cdf</a></td>
 </tr>
 <tr>
  <th class="files">files</th>
  <td class="files"><a href="/file/0cd96de13884/a">a</a> <a href="/file/0cd96de13884/b">b</a> </td>
 </tr>
 </table>
 
 <div class="overflow">
 <div class="sourcefirst">   line diff</div>
 
 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> new file mode 100644
 <a href="#l1.2" id="l1.2">     1.2</a> <span class="minusline">--- /dev/null
 </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="plusline">+++ b/a
 </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="atline">@@ -0,0 +1,1 @@
 </span><a href="#l1.5" id="l1.5">     1.5</a> <span class="plusline">+a
 </span></pre></div><div class="source bottomline parity1"><pre><a href="#l2.1" id="l2.1">     2.1</a> new file mode 100644
 <a href="#l2.2" id="l2.2">     2.2</a> <span class="minusline">--- /dev/null
 </span><a href="#l2.3" id="l2.3">     2.3</a> <span class="plusline">+++ b/b
 </span><a href="#l2.4" id="l2.4">     2.4</a> <span class="atline">@@ -0,0 +1,1 @@
 </span><a href="#l2.5" id="l2.5">     2.5</a> <span class="plusline">+b
 </span></pre></div>
 </div>
 
 </div>
 </div>
 
 
 </body>
 </html>
 
+% revision
+200 Script output follows
+
+
+# HG changeset patch
+# User test
+# Date 0 0
+# Node ID 0cd96de13884b090099512d4794ae87ad067ea8e
+
+a
+
+diff --git a/a b/a
+new file mode 100644
+--- /dev/null
++++ b/a
+@@ -0,0 +1,1 @@
++a
+diff --git a/b b/b
+new file mode 100644
+--- /dev/null
++++ b/b
+@@ -0,0 +1,1 @@
++b
+
 % diff removed file
 200 Script output follows
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
 <head>
 <link rel="icon" href="/static/hgicon.png" type="image/png" />
 <meta name="robots" content="index, nofollow" />
 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
 
 <title>test: a diff</title>
 </head>
 <body>
 
 <div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
 <li><a href="/shortlog/78e4ebad7cdf">log</a></li>
 <li><a href="/graph/78e4ebad7cdf">graph</a></li>
 <li><a href="/tags">tags</a></li>
 <li><a href="/branches">branches</a></li>
 </ul>
 <ul>
 <li><a href="/rev/78e4ebad7cdf">changeset</a></li>
 <li><a href="/file/78e4ebad7cdf">browse</a></li>
 </ul>
 <ul>
 <li><a href="/file/78e4ebad7cdf/a">file</a></li>
 <li class="active">diff</li>
 <li><a href="/annotate/78e4ebad7cdf/a">annotate</a></li>
 <li><a href="/log/78e4ebad7cdf/a">file log</a></li>
 <li><a href="/raw-file/78e4ebad7cdf/a">raw</a></li>
 </ul>
 </div>
 
 <div class="main">
 <h2><a href="/">test</a></h2>
 <h3>diff a @ 1:78e4ebad7cdf</h3>
 
 <form class="search" action="/log">
 <p></p>
 <p><input name="rev" id="search1" type="text" size="30" /></p>
 <div id="hint">find changesets by author, revision,
 files, or words in the commit message</div>
 </form>
 
 <div class="description">b</div>
 
 <table id="changesetEntry">
 <tr>
  <th>author</th>
  <td>&#116;&#101;&#115;&#116;</td>
 </tr>
 <tr>
  <th>date</th>
  <td>Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td>
 </tr>
 <tr>
  <th>parents</th>
  <td></td>
 </tr>
 <tr>
  <th>children</th>
  <td></td>
 </tr>
 
 </table>
 
 <div class="overflow">
 <div class="sourcefirst">   line diff</div>
 
 <div class="source bottomline parity0"><pre><a href="#l1.1" id="l1.1">     1.1</a> new file mode 100755
 <a href="#l1.2" id="l1.2">     1.2</a> <span class="minusline">--- /dev/null
 </span><a href="#l1.3" id="l1.3">     1.3</a> <span class="plusline">+++ b/a
 </span><a href="#l1.4" id="l1.4">     1.4</a> <span class="atline">@@ -0,0 +1,1 @@
 </span><a href="#l1.5" id="l1.5">     1.5</a> <span class="plusline">+a
 </span></pre></div>
 </div>
 </div>
 </div>
 
 
 
 </body>
 </html>
 
 % errors

tests/test-keyword.out

@@ -1,442 +1,444
 % hg kwdemo
 [extensions]
 hgext.keyword = 
 [keyword]
 * = 
 b = ignore
 demo.txt = 
 [keywordmaps]
 RCSFile = {file|basename},v
 Author = {author|user}
 Header = {root}/{file},v {node|short} {date|utcdate} {author|user}
 Source = {root}/{file},v
 Date = {date|utcdate}
 Id = {file|basename},v {node|short} {date|utcdate} {author|user}
 Revision = {node|short}
 $RCSFile: demo.txt,v $
 $Author: test $
 $Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $
 $Source: /TMP/demo.txt,v $
 $Date: 2000/00/00 00:00:00 $
 $Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $
 $Revision: xxxxxxxxxxxx $
 [extensions]
 hgext.keyword = 
 [keyword]
 * = 
 b = ignore
 demo.txt = 
 [keywordmaps]
 Branch = {branches}
 $Branch: demobranch $
 % kwshrink should exit silently in empty/invalid repo
 pulling from test-keyword.hg
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % cat
 expand $Id$
 do not process $Id:
 xxx $
 ignore $Id$
 % addremove
 adding a
 adding b
 % status
 A a
 A b
 % default keyword expansion including commit hook
 % interrupted commit should not change state or run commit hook
 abort: empty commit message
 % status
 A a
 A b
 % commit
 a
 b
 overwriting a expanding keywords
 running hook commit.test: cp a hooktest
 committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9
 % status
 ? hooktest
 % identify
 ef63ca68695b
 % cat
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 ignore $Id$
 % hg cat
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 ignore $Id$
 a
 % diff a hooktest
 % removing commit hook from config
 % bundle
 2 changesets found
 % notify on pull to check whether keywords stay as is in email
 % ie. if patch.diff wrapper acts as it should
 % pull from bundle
 pulling from ../kw.hg
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 3 changes to 3 files
 
 diff -r 000000000000 -r a2392c293916 sym
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/sym	Sat Feb 09 20:25:47 2008 +0100
 @@ -0,0 +1,1 @@
 +a
 \ No newline at end of file
 
 diff -r a2392c293916 -r ef63ca68695b a
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
 @@ -0,0 +1,3 @@
 +expand $Id$
 +do not process $Id:
 +xxx $
 diff -r a2392c293916 -r ef63ca68695b b
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/b	Thu Jan 01 00:00:00 1970 +0000
 @@ -0,0 +1,1 @@
 +ignore $Id$
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % remove notify config
 % touch
 % status
 % update
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % cat
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 ignore $Id$
 % check whether expansion is filewise
 % commit c
 adding c
 % force expansion
 overwriting a expanding keywords
 overwriting c expanding keywords
 % compare changenodes in a c
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
 tests for different changenodes
 % qinit -c
 % qimport
 % qcommit
 % keywords should not be expanded in patch
 # HG changeset patch
 # User User Name <[e-mail]>
 # Date 1 0
 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad
 # Parent  ef63ca68695bc9495032c6fda1350c71e6d256e9
 cndiff
 
 diff -r ef63ca68695b -r 40a904bbbe4c c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/c	Thu Jan 01 00:00:01 1970 +0000
 @@ -0,0 +1,2 @@
 +$Id$
 +tests for different changenodes
 % qpop
 popping mqtest.diff
 patch queue now empty
 % qgoto - should imply qpush
 applying mqtest.diff
 now at: mqtest.diff
 % cat
 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
 tests for different changenodes
 % qpop and move on
 popping mqtest.diff
 patch queue now empty
 % copy
 % kwfiles added
 a
 c
 % commit
 c
  c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
 overwriting c expanding keywords
 committed changeset 2:e22d299ac0c2bd8897b3df5114374b9e4d4ca62f
 % cat a c
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 expand $Id: c,v e22d299ac0c2 1970/01/01 00:00:01 user $
 do not process $Id:
 xxx $
 % touch copied c
 % status
 % kwfiles
 a
 c
 % diff --rev
 diff -r ef63ca68695b c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -0,0 +1,3 @@
 +expand $Id$
 +do not process $Id:
 +xxx $
 % rollback
 rolling back last transaction
 % status
 A c
 % update -C
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % custom keyword expansion
 % try with kwdemo
 [extensions]
 hgext.keyword = 
 [keyword]
 * = 
 b = ignore
 demo.txt = 
 [keywordmaps]
 Xinfo = {author}: {desc}
 $Xinfo: test: hg keyword config and expansion example $
 % cat
 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
 ignore $Id$
 % hg cat
 expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $
 do not process $Id:
 xxx $
 ignore $Id$
 a
 % interrupted commit should not change state
 abort: empty commit message
 % status
 M a
 ? c
 ? log
 % commit
 a
 overwriting a expanding keywords
 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
 % status
 ? c
 % verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 3 files, 3 changesets, 4 total revisions
 % cat
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: firstline $
 ignore $Id$
 % hg cat
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: firstline $
 ignore $Id$
 a
 % annotate
 1: expand $Id$
 1: do not process $Id:
 1: xxx $
 2: $Xinfo$
 % remove
 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012
 % status
 ? c
 % rollback
 rolling back last transaction
 % status
 R a
 ? c
 % revert a
 % cat a
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: firstline $
 % clone to test incoming
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 3 changes to 3 files
 updating working directory
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % incoming
 comparing with test-keyword/Test
 searching for changes
 changeset:   2:bb948857c743
 tag:         tip
 user:        User Name <[e-mail]>
 date:        Thu Jan 01 00:00:02 1970 +0000
 summary:     firstline
 
 % commit rejecttest
 a
 overwriting a expanding keywords
 committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082
 % export
 % import
 applying ../rejecttest.diff
 % cat
 expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest
 do not process $Id: rejecttest
 xxx $
 $Xinfo: User Name <[e-mail]>: rejects? $
 ignore $Id$
 
 % rollback
 rolling back last transaction
 % clean update
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % kwexpand/kwshrink on selected files
 % copy a x/a
 % kwexpand a
 overwriting a expanding keywords
 % kwexpand x/a should abort
 abort: outstanding uncommitted changes
 x/a
  x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
 overwriting x/a expanding keywords
 committed changeset 3:cfa68229c1167443337266ebac453c73b1d5d16e
 % cat a
 expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: xa $
 % kwshrink a inside directory x
 overwriting x/a shrinking keywords
 % cat a
 expand $Id$
 do not process $Id:
 xxx $
 $Xinfo$
 % kwexpand nonexistent
 nonexistent:
 % hg serve
 % expansion
 % hgweb file
 200 Script output follows
 
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: firstline $
 % no expansion
 % hgweb annotate
 200 Script output follows
 
 
 user@1: expand $Id$
 user@1: do not process $Id:
 user@1: xxx $
 user@2: $Xinfo$
 
 
 
 
 % hgweb changeset
 200 Script output follows
 
 
 # HG changeset patch
 # User User Name <[e-mail]>
 # Date 3 0
 # Node ID cfa68229c1167443337266ebac453c73b1d5d16e
 # Parent  bb948857c743469b22bbf51f7ec8112279ca5d83
 xa
 
+diff -r bb948857c743 -r cfa68229c116 x/a
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/x/a	Thu Jan 01 00:00:03 1970 +0000
 @@ -0,0 +1,4 @@
 +expand $Id$
 +do not process $Id:
 +xxx $
 +$Xinfo$
 
 % hgweb filediff
 200 Script output follows
 
 
+diff -r ef63ca68695b -r bb948857c743 a
 --- a/a	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:02 1970 +0000
 @@ -1,3 +1,4 @@
  expand $Id$
  do not process $Id:
  xxx $
 +$Xinfo$
 
 
 
 
 % errors encountered
 % merge/resolve
 % simplemerge
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 $Id: m 8731e1dadc99 Thu, 01 Jan 1970 00:00:00 +0000 test $
 foo
 % conflict
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 merging m
 warning: conflicts during merge.
 merging m failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 % keyword stays outside conflict zone
 $Id$
 <<<<<<< local
 bar
 =======
 foo
 >>>>>>> other
 % resolve to local
 $Id: m 43dfd2854b5b Thu, 01 Jan 1970 00:00:00 +0000 test $
 bar
 % switch off expansion
 % kwshrink with unknown file u
 overwriting a shrinking keywords
 overwriting m shrinking keywords
 overwriting x/a shrinking keywords
 % cat
 expand $Id$
 do not process $Id:
 xxx $
 $Xinfo$
 ignore $Id$
 % hg cat
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <[e-mail]>: firstline $
 ignore $Id$
 a
 % cat
 expand $Id$
 do not process $Id:
 xxx $
 $Xinfo$
 ignore $Id$
 % hg cat
 expand $Id$
 do not process $Id:
 xxx $
 $Xinfo$
 ignore $Id$
 a