hgweb: disable diff.noprefix option for diffstat

Copied from cf1e15f91c90.

mercurial/hgweb/webutil.py

@@ -1,643 +1,644 b''
 # 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 or any later version.
 
 from __future__ import absolute_import
 
 import copy
 import difflib
 import os
 import re
 
 from ..i18n import _
 from ..node import hex, nullid, short
 
 from .common import (
     ErrorResponse,
     HTTP_BAD_REQUEST,
     HTTP_NOT_FOUND,
     paritygen,
 )
 
 from .. import (
     context,
     error,
     match,
     mdiff,
     patch,
     pathutil,
     pycompat,
     templatefilters,
     ui as uimod,
     util,
 )
 
 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 _navseq(step, firststep=None):
     if firststep:
         yield firststep
         if firststep >= 20 and firststep <= 40:
             firststep = 50
             yield firststep
         assert step > 0
         assert firststep > 0
         while step <= firststep:
             step *= 10
     while True:
         yield 1 * step
         yield 3 * step
         step *= 10
 
 class revnav(object):
 
     def __init__(self, repo):
         """Navigation generation object
 
         :repo: repo object we generate nav for
         """
         # used for hex generation
         self._revlog = repo.changelog
 
     def __nonzero__(self):
         """return True if any revision to navigate over"""
         return self._first() is not None
 
     __bool__ = __nonzero__
 
     def _first(self):
         """return the minimum non-filtered changeset or None"""
         try:
             return next(iter(self._revlog))
         except StopIteration:
             return None
 
     def hex(self, rev):
         return hex(self._revlog.node(rev))
 
     def gen(self, pos, pagelen, limit):
         """computes label and revision id for navigation link
 
         :pos: is the revision relative to which we generate navigation.
         :pagelen: the size of each navigation page
         :limit: how far shall we link
 
         The return is:
             - a single element tuple
             - containing a dictionary with a `before` and `after` key
             - values are generator functions taking arbitrary number of kwargs
             - yield items are dictionaries with `label` and `node` keys
         """
         if not self:
             # empty repo
             return ({'before': (), 'after': ()},)
 
         targets = []
         for f in _navseq(1, pagelen):
             if f > limit:
                 break
             targets.append(pos + f)
             targets.append(pos - f)
         targets.sort()
 
         first = self._first()
         navbefore = [("(%i)" % first, self.hex(first))]
         navafter = []
         for rev in targets:
             if rev not in self._revlog:
                 continue
             if pos < rev < limit:
                 navafter.append(("+%d" % abs(rev - pos), self.hex(rev)))
             if 0 < rev < pos:
                 navbefore.append(("-%d" % abs(rev - pos), self.hex(rev)))
 
 
         navafter.append(("tip", "tip"))
 
         data = lambda i: {"label": i[0], "node": i[1]}
         return ({'before': lambda **map: (data(i) for i in navbefore),
                  'after':  lambda **map: (data(i) for i in navafter)},)
 
 class filerevnav(revnav):
 
     def __init__(self, repo, path):
         """Navigation generation object
 
         :repo: repo object we generate nav for
         :path: path of the file we generate nav for
         """
         # used for iteration
         self._changelog = repo.unfiltered().changelog
         # used for hex generation
         self._revlog = repo.file(path)
 
     def hex(self, rev):
         return hex(self._changelog.node(self._revlog.linkrev(rev)))
 
 class _siblings(object):
     def __init__(self, siblings=None, hiderev=None):
         if siblings is None:
             siblings = []
         self.siblings = [s for s in siblings if s.node() != nullid]
         if len(self.siblings) == 1 and self.siblings[0].rev() == hiderev:
             self.siblings = []
 
     def __iter__(self):
         for s in self.siblings:
             d = {
                 'node': s.hex(),
                 'rev': s.rev(),
                 'user': s.user(),
                 'date': s.date(),
                 'description': s.description(),
                 'branch': s.branch(),
             }
             if util.safehasattr(s, 'path'):
                 d['file'] = s.path()
             yield d
 
     def __len__(self):
         return len(self.siblings)
 
 def difffeatureopts(req, ui, section):
     diffopts = patch.difffeatureopts(ui, untrusted=True,
                                      section=section, whitespace=True)
 
     for k in ('ignorews', 'ignorewsamount', 'ignorewseol', 'ignoreblanklines'):
         v = req.form.get(k, [None])[0]
         if v is not None:
             v = util.parsebool(v)
             setattr(diffopts, k, v if v is not None else True)
 
     return diffopts
 
 def annotate(req, fctx, ui):
     diffopts = difffeatureopts(req, ui, 'annotate')
     return fctx.annotate(follow=True, linenumber=True, diffopts=diffopts)
 
 def parents(ctx, hide=None):
     if isinstance(ctx, context.basefilectx):
         introrev = ctx.introrev()
         if ctx.changectx().rev() != introrev:
             return _siblings([ctx.repo()[introrev]], hide)
     return _siblings(ctx.parents(), hide)
 
 def children(ctx, hide=None):
     return _siblings(ctx.children(), hide)
 
 def renamelink(fctx):
     r = fctx.renamed()
     if r:
         return [{'file': r[0], 'node': hex(r[1])}]
     return []
 
 def nodetagsdict(repo, node):
     return [{"name": i} for i in repo.nodetags(node)]
 
 def nodebookmarksdict(repo, node):
     return [{"name": i} for i in repo.nodebookmarks(node)]
 
 def nodebranchdict(repo, ctx):
     branches = []
     branch = ctx.branch()
     # If this is an empty repo, ctx.node() == nullid,
     # ctx.branch() == 'default'.
     try:
         branchnode = repo.branchtip(branch)
     except error.RepoLookupError:
         branchnode = None
     if branchnode == ctx.node():
         branches.append({"name": branch})
     return branches
 
 def nodeinbranch(repo, ctx):
     branches = []
     branch = ctx.branch()
     try:
         branchnode = repo.branchtip(branch)
     except error.RepoLookupError:
         branchnode = None
     if branch != 'default' and branchnode != 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 showbookmark(repo, tmpl, t1, node=nullid, **args):
     for t in repo.nodebookmarks(node):
         yield tmpl(t1, bookmark=t, **args)
 
 def branchentries(repo, stripecount, limit=0):
     tips = []
     heads = repo.heads()
     parity = paritygen(stripecount)
     sortkey = lambda item: (not item[1], item[0].rev())
 
     def entries(**map):
         count = 0
         if not tips:
             for tag, hs, tip, closed in repo.branchmap().iterbranches():
                 tips.append((repo[tip], closed))
         for ctx, closed in sorted(tips, key=sortkey, reverse=True):
             if limit > 0 and count >= limit:
                 return
             count += 1
             if closed:
                 status = 'closed'
             elif ctx.node() not in heads:
                 status = 'inactive'
             else:
                 status = 'open'
             yield {
                 'parity': next(parity),
                 'branch': ctx.branch(),
                 'status': status,
                 'node': ctx.hex(),
                 'date': ctx.date()
             }
 
     return entries
 
 def cleanpath(repo, path):
     path = path.lstrip('/')
     return pathutil.canonpath(repo.root, '', path)
 
 def changeidctx(repo, changeid):
     try:
         ctx = repo[changeid]
     except error.RepoError:
         man = repo.manifestlog._revlog
         ctx = repo[man.linkrev(man.rev(man.lookup(changeid)))]
 
     return ctx
 
 def changectx(repo, req):
     changeid = "tip"
     if 'node' in req.form:
         changeid = req.form['node'][0]
         ipos = changeid.find(':')
         if ipos != -1:
             changeid = changeid[(ipos + 1):]
     elif 'manifest' in req.form:
         changeid = req.form['manifest'][0]
 
     return changeidctx(repo, changeid)
 
 def basechangectx(repo, req):
     if 'node' in req.form:
         changeid = req.form['node'][0]
         ipos = changeid.find(':')
         if ipos != -1:
             changeid = changeid[:ipos]
             return changeidctx(repo, changeid)
 
     return None
 
 def filectx(repo, req):
     if 'file' not in req.form:
         raise ErrorResponse(HTTP_NOT_FOUND, 'file not given')
     path = cleanpath(repo, req.form['file'][0])
     if 'node' in req.form:
         changeid = req.form['node'][0]
     elif 'filenode' in req.form:
         changeid = req.form['filenode'][0]
     else:
         raise ErrorResponse(HTTP_NOT_FOUND, 'node or filenode not given')
     try:
         fctx = repo[changeid][path]
     except error.RepoError:
         fctx = repo.filectx(path, fileid=changeid)
 
     return fctx
 
 def linerange(req):
     linerange = req.form.get('linerange')
     if linerange is None:
         return None
     if len(linerange) > 1:
         raise ErrorResponse(HTTP_BAD_REQUEST,
                             'redundant linerange parameter')
     try:
         fromline, toline = map(int, linerange[0].split(':', 1))
     except ValueError:
         raise ErrorResponse(HTTP_BAD_REQUEST,
                             'invalid linerange parameter')
     try:
         return util.processlinerange(fromline, toline)
     except error.ParseError as exc:
         raise ErrorResponse(HTTP_BAD_REQUEST, str(exc))
 
 def formatlinerange(fromline, toline):
     return '%d:%d' % (fromline + 1, toline)
 
 def commonentry(repo, ctx):
     node = ctx.node()
     return {
         'rev': ctx.rev(),
         'node': hex(node),
         'author': ctx.user(),
         'desc': ctx.description(),
         'date': ctx.date(),
         'extra': ctx.extra(),
         'phase': ctx.phasestr(),
         'branch': nodebranchnodefault(ctx),
         'inbranch': nodeinbranch(repo, ctx),
         'branches': nodebranchdict(repo, ctx),
         'tags': nodetagsdict(repo, node),
         'bookmarks': nodebookmarksdict(repo, node),
         'parent': lambda **x: parents(ctx),
         'child': lambda **x: children(ctx),
     }
 
 def changelistentry(web, ctx, tmpl):
     '''Obtain a dictionary to be used for entries in a changelist.
 
     This function is called when producing items for the "entries" list passed
     to the "shortlog" and "changelog" templates.
     '''
     repo = web.repo
     rev = ctx.rev()
     n = ctx.node()
     showtags = showtag(repo, tmpl, 'changelogtag', n)
     files = listfilediffs(tmpl, ctx.files(), n, web.maxfiles)
 
     entry = commonentry(repo, ctx)
     entry.update(
         allparents=lambda **x: parents(ctx),
         parent=lambda **x: parents(ctx, rev - 1),
         child=lambda **x: children(ctx, rev + 1),
         changelogtag=showtags,
         files=files,
     )
     return entry
 
 def symrevorshortnode(req, ctx):
     if 'node' in req.form:
         return templatefilters.revescape(req.form['node'][0])
     else:
         return short(ctx.node())
 
 def changesetentry(web, req, tmpl, ctx):
     '''Obtain a dictionary to be used to render the "changeset" template.'''
 
     showtags = showtag(web.repo, tmpl, 'changesettag', ctx.node())
     showbookmarks = showbookmark(web.repo, tmpl, 'changesetbookmark',
                                  ctx.node())
     showbranch = nodebranchnodefault(ctx)
 
     files = []
     parity = paritygen(web.stripecount)
     for blockno, f in enumerate(ctx.files()):
         template = f in ctx and 'filenodelink' or 'filenolink'
         files.append(tmpl(template,
                           node=ctx.hex(), file=f, blockno=blockno + 1,
                           parity=next(parity)))
 
     basectx = basechangectx(web.repo, req)
     if basectx is None:
         basectx = ctx.p1()
 
     style = web.config('web', 'style')
     if 'style' in req.form:
         style = req.form['style'][0]
 
     diff = diffs(web, tmpl, ctx, basectx, None, style)
 
     parity = paritygen(web.stripecount)
     diffstatsgen = diffstatgen(ctx, basectx)
     diffstats = diffstat(tmpl, ctx, diffstatsgen, parity)
 
     return dict(
         diff=diff,
         symrev=symrevorshortnode(req, ctx),
         basenode=basectx.hex(),
         changesettag=showtags,
         changesetbookmark=showbookmarks,
         changesetbranch=showbranch,
         files=files,
         diffsummary=lambda **x: diffsummary(diffstatsgen),
         diffstat=diffstats,
         archives=web.archivelist(ctx.hex()),
         **commonentry(web.repo, ctx))
 
 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(web, tmpl, ctx, basectx, files, style, linerange=None,
           lineidprefix=''):
 
     def prettyprintlines(lines, blockno):
         for lineno, l in enumerate(lines, 1):
             difflineno = "%d.%d" % (blockno, lineno)
             if l.startswith('+'):
                 ltype = "difflineplus"
             elif l.startswith('-'):
                 ltype = "difflineminus"
             elif l.startswith('@'):
                 ltype = "difflineat"
             else:
                 ltype = "diffline"
             yield tmpl(ltype,
                        line=l,
                        lineno=lineno,
                        lineid=lineidprefix + "l%s" % difflineno,
                        linenumber="% 8s" % difflineno)
 
     repo = web.repo
     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)
     node1 = basectx.node()
     node2 = ctx.node()
     parity = paritygen(web.stripecount)
 
     diffhunks = patch.diffhunks(repo, node1, node2, m, opts=diffopts)
     for blockno, (fctx1, fctx2, header, hunks) in enumerate(diffhunks, 1):
         if style != 'raw':
             header = header[1:]
         lines = [h + '\n' for h in header]
         for hunkrange, hunklines in hunks:
             if linerange is not None and hunkrange is not None:
                 s1, l1, s2, l2 = hunkrange
                 if not mdiff.hunkinrange((s2, l2), linerange):
                     continue
             lines.extend(hunklines)
         if lines:
             yield tmpl('diffblock', parity=next(parity), blockno=blockno,
                        lines=prettyprintlines(lines, blockno))
 
 def compare(tmpl, context, leftlines, rightlines):
     '''Generator function that provides side-by-side comparison data.'''
 
     def compline(type, leftlineno, leftline, rightlineno, rightline):
         lineid = leftlineno and ("l%s" % leftlineno) or ''
         lineid += rightlineno and ("r%s" % rightlineno) or ''
         return tmpl('comparisonline',
                     type=type,
                     lineid=lineid,
                     leftlineno=leftlineno,
                     leftlinenumber="% 6s" % (leftlineno or ''),
                     leftline=leftline or '',
                     rightlineno=rightlineno,
                     rightlinenumber="% 6s" % (rightlineno or ''),
                     rightline=rightline or '')
 
     def getblock(opcodes):
         for type, llo, lhi, rlo, rhi in opcodes:
             len1 = lhi - llo
             len2 = rhi - rlo
             count = min(len1, len2)
             for i in xrange(count):
                 yield compline(type=type,
                                leftlineno=llo + i + 1,
                                leftline=leftlines[llo + i],
                                rightlineno=rlo + i + 1,
                                rightline=rightlines[rlo + i])
             if len1 > len2:
                 for i in xrange(llo + count, lhi):
                     yield compline(type=type,
                                    leftlineno=i + 1,
                                    leftline=leftlines[i],
                                    rightlineno=None,
                                    rightline=None)
             elif len2 > len1:
                 for i in xrange(rlo + count, rhi):
                     yield compline(type=type,
                                    leftlineno=None,
                                    leftline=None,
                                    rightlineno=i + 1,
                                    rightline=rightlines[i])
 
     s = difflib.SequenceMatcher(None, leftlines, rightlines)
     if context < 0:
         yield tmpl('comparisonblock', lines=getblock(s.get_opcodes()))
     else:
         for oc in s.get_grouped_opcodes(n=context):
             yield tmpl('comparisonblock', lines=getblock(oc))
 
 def diffstatgen(ctx, basectx):
     '''Generator function that provides the diffstat data.'''
 
-    stats = patch.diffstatdata(util.iterlines(ctx.diff(basectx)))
+    stats = patch.diffstatdata(
+        util.iterlines(ctx.diff(basectx, noprefix=False)))
     maxname, maxtotal, addtotal, removetotal, binary = patch.diffstatsum(stats)
     while True:
         yield stats, maxname, maxtotal, addtotal, removetotal, binary
 
 def diffsummary(statgen):
     '''Return a short summary of the diff.'''
 
     stats, maxname, maxtotal, addtotal, removetotal, binary = next(statgen)
     return _(' %d files changed, %d insertions(+), %d deletions(-)\n') % (
              len(stats), addtotal, removetotal)
 
 def diffstat(tmpl, ctx, statgen, parity):
     '''Return a diffstat template for each file in the diff.'''
 
     stats, maxname, maxtotal, addtotal, removetotal, binary = next(statgen)
     files = ctx.files()
 
     def pct(i):
         if maxtotal == 0:
             return 0
         return (float(i) / maxtotal) * 100
 
     fileno = 0
     for filename, adds, removes, isbinary in stats:
         template = filename in files and 'diffstatlink' or 'diffstatnolink'
         total = adds + removes
         fileno += 1
         yield tmpl(template, node=ctx.hex(), file=filename, fileno=fileno,
                    total=total, addpct=pct(adds), removepct=pct(removes),
                    parity=next(parity))
 
 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 sorted(self.vars.iteritems()):
             yield {'name': key,
                    'value': pycompat.bytestr(value),
                    'separator': separator,
             }
             separator = '&'
 
 class wsgiui(uimod.ui):
     # default termwidth breaks under mod_wsgi
     def termwidth(self):
         return 80
 
 def getwebsubs(repo):
     websubtable = []
     websubdefs = repo.ui.configitems('websub')
     # we must maintain interhg backwards compatibility
     websubdefs += repo.ui.configitems('interhg')
     for key, pattern in websubdefs:
         # grab the delimiter from the character after the "s"
         unesc = pattern[1]
         delim = re.escape(unesc)
 
         # identify portions of the pattern, taking care to avoid escaped
         # delimiters. the replace format and flags are optional, but
         # delimiters are required.
         match = re.match(
             r'^s%s(.+)(?:(?<=\\\\)|(?<!\\))%s(.*)%s([ilmsux])*$'
             % (delim, delim, delim), pattern)
         if not match:
             repo.ui.warn(_("websub: invalid pattern for %s: %s\n")
                               % (key, pattern))
             continue
 
         # we need to unescape the delimiter for regexp and format
         delim_re = re.compile(r'(?<!\\)\\%s' % delim)
         regexp = delim_re.sub(unesc, match.group(1))
         format = delim_re.sub(unesc, match.group(2))
 
         # the pattern allows for 6 regexp flags, so set them if necessary
         flagin = match.group(3)
         flags = 0
         if flagin:
             for flag in flagin.upper():
                 flags |= re.__dict__[flag]
 
         try:
             regexp = re.compile(regexp, flags)
             websubtable.append((regexp, format))
         except re.error:
             repo.ui.warn(_("websub: invalid regexp for %s: %s\n")
                          % (key, regexp))
     return websubtable

tests/test-hgweb-diffs.t

@@ -1,1169 +1,1186 b''
 #require serve
 
 setting up repo
 
   $ hg init test
   $ cd test
   $ echo a > a
   $ echo b > b
   $ hg ci -Ama
   adding a
   adding b
 
 change permissions for git diffs
 
   $ hg import -q --bypass - <<EOF
   > # HG changeset patch
   > # User test
   > # Date 0 0
   > b
   > 
   > diff --git a/a b/a
   > old mode 100644
   > new mode 100755
   > diff --git a/b b/b
   > deleted file mode 100644
   > --- a/b
   > +++ /dev/null
   > @@ -1,1 +0,0 @@
   > -b
   > EOF
 
 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
 
 revision
 
   $ get-with-headers.py localhost:$HGPORT 'rev/0'
   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" />
   <script type="text/javascript" src="/static/mercurial.js"></script>
   
   <title>test: 0cd96de13884</title>
   </head>
   <body>
   <div class="container">
   <div class="menu">
   <div class="logo">
   <a href="https://mercurial-scm.org/">
   <img src="/static/hglogo.png" alt="mercurial" /></a>
   </div>
   <ul>
    <li><a href="/shortlog/0">log</a></li>
    <li><a href="/graph/0">graph</a></li>
    <li><a href="/tags">tags</a></li>
    <li><a href="/bookmarks">bookmarks</a></li>
    <li><a href="/branches">branches</a></li>
   </ul>
   <ul>
    <li class="active">changeset</li>
    <li><a href="/raw-rev/0">raw</a></li>
    <li><a href="/file/0">browse</a></li>
   </ul>
   <ul>
    
   </ul>
   <ul>
    <li><a href="/help">help</a></li>
   </ul>
   </div>
   
   <div class="main">
   
   <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
   <h3>
    changeset 0:<a href="/rev/0cd96de13884">0cd96de13884</a>
    
   </h3>
   
   
   <form class="search" action="/log">
   
   <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
   <div id="hint">Find changesets by keywords (author, files, the commit message), revision
   number or hash, or <a href="/help/revsets">revset expression</a>.</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 age">Thu, 01 Jan 1970 00:00:00 +0000</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/559edbd9ed20">559edbd9ed20</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>
   <tr>
     <th class="diffstat">diffstat</th>
     <td class="diffstat">
        2 files changed, 2 insertions(+), 0 deletions(-)
   
       <a id="diffstatexpand" href="javascript:toggleDiffstat()">[<tt>+</tt>]</a>
       <div id="diffstatdetails" style="display:none;">
         <a href="javascript:toggleDiffstat()">[<tt>-</tt>]</a>
         <table class="diffstat-table stripes2">  <tr>
       <td class="diffstat-file"><a href="#l1.1">a</a></td>
       <td class="diffstat-total" align="right">1</td>
       <td class="diffstat-graph">
         <span class="diffstat-add" style="width:100.0%;">&nbsp;</span>
         <span class="diffstat-remove" style="width:0.0%;">&nbsp;</span>
       </td>
     </tr>
     <tr>
       <td class="diffstat-file"><a href="#l2.1">b</a></td>
       <td class="diffstat-total" align="right">1</td>
       <td class="diffstat-graph">
         <span class="diffstat-add" style="width:100.0%;">&nbsp;</span>
         <span class="diffstat-remove" style="width:0.0%;">&nbsp;</span>
       </td>
     </tr>
   </table>
       </div>
     </td>
   </tr>
   </table>
   
   <div class="overflow">
   <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
   <div class="sourcefirst"> line diff</div>
   <div class="stripes2 diffblocks">
   <div class="bottomline inc-lineno"><pre class="sourcelines wrap">
   <span id="l1.1" class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.1"></a>
   <span id="l1.2" class="plusline">+++ b/a	Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.2"></a>
   <span id="l1.3" class="atline">@@ -0,0 +1,1 @@</span><a href="#l1.3"></a>
   <span id="l1.4" class="plusline">+a</span><a href="#l1.4"></a></pre></div><div class="bottomline inc-lineno"><pre class="sourcelines wrap">
   <span id="l2.1" class="minusline">--- /dev/null	Thu Jan 01 00:00:00 1970 +0000</span><a href="#l2.1"></a>
   <span id="l2.2" class="plusline">+++ b/b	Thu Jan 01 00:00:00 1970 +0000</span><a href="#l2.2"></a>
   <span id="l2.3" class="atline">@@ -0,0 +1,1 @@</span><a href="#l2.3"></a>
   <span id="l2.4" class="plusline">+b</span><a href="#l2.4"></a></pre></div>
   </div>
   </div>
   
   </div>
   </div>
   
   
   </body>
   </html>
   
 
 raw revision
 
   $ get-with-headers.py localhost:$HGPORT 'raw-rev/0'
   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
 
   $ hg log --template "{file_mods}\n{file_dels}\n" -r tip
   a
   b
   $ hg parents --template "{node|short}\n" -r tip
   0cd96de13884
   $ hg parents --template "{node|short}\n" -r tip b
   0cd96de13884
 
   $ get-with-headers.py localhost:$HGPORT 'diff/tip/b'
   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" />
   <script type="text/javascript" src="/static/mercurial.js"></script>
   
   <title>test: b diff</title>
   </head>
   <body>
   
   <div class="container">
   <div class="menu">
   <div class="logo">
   <a href="https://mercurial-scm.org/">
   <img src="/static/hglogo.png" alt="mercurial" /></a>
   </div>
   <ul>
   <li><a href="/shortlog/tip">log</a></li>
   <li><a href="/graph/tip">graph</a></li>
   <li><a href="/tags">tags</a></li>
   <li><a href="/bookmarks">bookmarks</a></li>
   <li><a href="/branches">branches</a></li>
   </ul>
   <ul>
   <li><a href="/rev/tip">changeset</a></li>
   <li><a href="/file/tip">browse</a></li>
   </ul>
   <ul>
   <li><a href="/file/tip/b">file</a></li>
   <li><a href="/file/tip/b">latest</a></li>
   <li class="active">diff</li>
   <li><a href="/comparison/tip/b">comparison</a></li>
   <li><a href="/annotate/tip/b">annotate</a></li>
   <li><a href="/log/tip/b">file log</a></li>
   <li><a href="/raw-file/tip/b">raw</a></li>
   </ul>
   <ul>
   <li><a href="/help">help</a></li>
   </ul>
   </div>
   
   <div class="main">
   <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
   <h3>
    diff b @ 1:<a href="/rev/559edbd9ed20">559edbd9ed20</a>
    <span class="tag">tip</span> 
   </h3>
   
   
   <form class="search" action="/log">
   
   <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
   <div id="hint">Find changesets by keywords (author, files, the commit message), revision
   number or hash, or <a href="/help/revsets">revset expression</a>.</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 class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
   </tr>
   <tr>
    <th>parents</th>
    <td><a href="/file/0cd96de13884/b">0cd96de13884</a> </td>
   </tr>
   <tr>
    <th>children</th>
    <td></td>
   </tr>
   </table>
   
   <div class="overflow">
   <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
   <div class="sourcefirst"> line diff</div>
   <div class="stripes2 diffblocks">
   <div class="bottomline inc-lineno"><pre class="sourcelines wrap">
   <span id="l1.1" class="minusline">--- a/b	Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.1"></a>
   <span id="l1.2" class="plusline">+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000</span><a href="#l1.2"></a>
   <span id="l1.3" class="atline">@@ -1,1 +0,0 @@</span><a href="#l1.3"></a>
   <span id="l1.4" class="minusline">-b</span><a href="#l1.4"></a></pre></div>
   </div>
   </div>
   </div>
   </div>
   
   
   
   </body>
   </html>
   
 
+set up hgweb with git diffs + noprefix
+
+  $ killdaemons.py
+  $ hg serve --config 'diff.git=1' --config 'diff.noprefix=1' -p $HGPORT -d \
+  > --pid-file=hg.pid -A access.log -E errors.log
+  $ cat hg.pid >> $DAEMON_PIDS
+
+patch header and diffstat
+
+  $ get-with-headers.py localhost:$HGPORT 'rev/0' \
+  > | egrep 'files changed|---|\+\+\+'
+       2 files changed, 2 insertions(+), 0 deletions(-)
+  <span id="l1.2" class="minusline">--- /dev/null</span><a href="#l1.2"></a>
+  <span id="l1.3" class="plusline">+++ a</span><a href="#l1.3"></a>
+  <span id="l2.2" class="minusline">--- /dev/null</span><a href="#l2.2"></a>
+  <span id="l2.3" class="plusline">+++ b</span><a href="#l2.3"></a>
+
 set up hgweb with git diffs
 
   $ 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
 
 revision
 
   $ get-with-headers.py localhost:$HGPORT 'rev/0'
   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" />
   <script type="text/javascript" src="/static/mercurial.js"></script>
   
   <title>test: 0cd96de13884</title>
   </head>
   <body>
   <div class="container">
   <div class="menu">
   <div class="logo">
   <a href="https://mercurial-scm.org/">
   <img src="/static/hglogo.png" alt="mercurial" /></a>
   </div>
   <ul>
    <li><a href="/shortlog/0">log</a></li>
    <li><a href="/graph/0">graph</a></li>
    <li><a href="/tags">tags</a></li>
    <li><a href="/bookmarks">bookmarks</a></li>
    <li><a href="/branches">branches</a></li>
   </ul>
   <ul>
    <li class="active">changeset</li>
    <li><a href="/raw-rev/0">raw</a></li>
    <li><a href="/file/0">browse</a></li>
   </ul>
   <ul>
    
   </ul>
   <ul>
    <li><a href="/help">help</a></li>
   </ul>
   </div>
   
   <div class="main">
   
   <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
   <h3>
    changeset 0:<a href="/rev/0cd96de13884">0cd96de13884</a>
    
   </h3>
   
   
   <form class="search" action="/log">
   
   <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
   <div id="hint">Find changesets by keywords (author, files, the commit message), revision
   number or hash, or <a href="/help/revsets">revset expression</a>.</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 age">Thu, 01 Jan 1970 00:00:00 +0000</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/559edbd9ed20">559edbd9ed20</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>
   <tr>
     <th class="diffstat">diffstat</th>
     <td class="diffstat">
        2 files changed, 2 insertions(+), 0 deletions(-)
   
       <a id="diffstatexpand" href="javascript:toggleDiffstat()">[<tt>+</tt>]</a>
       <div id="diffstatdetails" style="display:none;">
         <a href="javascript:toggleDiffstat()">[<tt>-</tt>]</a>
         <table class="diffstat-table stripes2">  <tr>
       <td class="diffstat-file"><a href="#l1.1">a</a></td>
       <td class="diffstat-total" align="right">1</td>
       <td class="diffstat-graph">
         <span class="diffstat-add" style="width:100.0%;">&nbsp;</span>
         <span class="diffstat-remove" style="width:0.0%;">&nbsp;</span>
       </td>
     </tr>
     <tr>
       <td class="diffstat-file"><a href="#l2.1">b</a></td>
       <td class="diffstat-total" align="right">1</td>
       <td class="diffstat-graph">
         <span class="diffstat-add" style="width:100.0%;">&nbsp;</span>
         <span class="diffstat-remove" style="width:0.0%;">&nbsp;</span>
       </td>
     </tr>
   </table>
       </div>
     </td>
   </tr>
   </table>
   
   <div class="overflow">
   <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
   <div class="sourcefirst"> line diff</div>
   <div class="stripes2 diffblocks">
   <div class="bottomline inc-lineno"><pre class="sourcelines wrap">
   <span id="l1.1">new file mode 100644</span><a href="#l1.1"></a>
   <span id="l1.2" class="minusline">--- /dev/null</span><a href="#l1.2"></a>
   <span id="l1.3" class="plusline">+++ b/a</span><a href="#l1.3"></a>
   <span id="l1.4" class="atline">@@ -0,0 +1,1 @@</span><a href="#l1.4"></a>
   <span id="l1.5" class="plusline">+a</span><a href="#l1.5"></a></pre></div><div class="bottomline inc-lineno"><pre class="sourcelines wrap">
   <span id="l2.1">new file mode 100644</span><a href="#l2.1"></a>
   <span id="l2.2" class="minusline">--- /dev/null</span><a href="#l2.2"></a>
   <span id="l2.3" class="plusline">+++ b/b</span><a href="#l2.3"></a>
   <span id="l2.4" class="atline">@@ -0,0 +1,1 @@</span><a href="#l2.4"></a>
   <span id="l2.5" class="plusline">+b</span><a href="#l2.5"></a></pre></div>
   </div>
   </div>
   
   </div>
   </div>
   
   
   </body>
   </html>
   
 
 revision
 
   $ get-with-headers.py localhost:$HGPORT 'raw-rev/0'
   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 modified file
 
   $ hg log --template "{file_mods}\n{file_dels}\n" -r tip
   a
   b
   $ hg parents --template "{node|short}\n" -r tip
   0cd96de13884
   $ hg parents --template "{node|short}\n" -r tip a
   0cd96de13884
 
   $ get-with-headers.py localhost:$HGPORT 'diff/tip/a'
   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" />
   <script type="text/javascript" src="/static/mercurial.js"></script>
   
   <title>test: a diff</title>
   </head>
   <body>
   
   <div class="container">
   <div class="menu">
   <div class="logo">
   <a href="https://mercurial-scm.org/">
   <img src="/static/hglogo.png" alt="mercurial" /></a>
   </div>
   <ul>
   <li><a href="/shortlog/tip">log</a></li>
   <li><a href="/graph/tip">graph</a></li>
   <li><a href="/tags">tags</a></li>
   <li><a href="/bookmarks">bookmarks</a></li>
   <li><a href="/branches">branches</a></li>
   </ul>
   <ul>
   <li><a href="/rev/tip">changeset</a></li>
   <li><a href="/file/tip">browse</a></li>
   </ul>
   <ul>
   <li><a href="/file/tip/a">file</a></li>
   <li><a href="/file/tip/a">latest</a></li>
   <li class="active">diff</li>
   <li><a href="/comparison/tip/a">comparison</a></li>
   <li><a href="/annotate/tip/a">annotate</a></li>
   <li><a href="/log/tip/a">file log</a></li>
   <li><a href="/raw-file/tip/a">raw</a></li>
   </ul>
   <ul>
   <li><a href="/help">help</a></li>
   </ul>
   </div>
   
   <div class="main">
   <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
   <h3>
    diff a @ 1:<a href="/rev/559edbd9ed20">559edbd9ed20</a>
    <span class="tag">tip</span> 
   </h3>
   
   
   <form class="search" action="/log">
   
   <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
   <div id="hint">Find changesets by keywords (author, files, the commit message), revision
   number or hash, or <a href="/help/revsets">revset expression</a>.</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 class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
   </tr>
   <tr>
    <th>parents</th>
    <td><a href="/file/0cd96de13884/a">0cd96de13884</a> </td>
   </tr>
   <tr>
    <th>children</th>
    <td></td>
   </tr>
   </table>
   
   <div class="overflow">
   <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
   <div class="sourcefirst"> line diff</div>
   <div class="stripes2 diffblocks">
   <div class="bottomline inc-lineno"><pre class="sourcelines wrap">
   <span id="l1.1">old mode 100644</span><a href="#l1.1"></a>
   <span id="l1.2">new mode 100755</span><a href="#l1.2"></a></pre></div>
   </div>
   </div>
   </div>
   </div>
   
   
   
   </body>
   </html>
   
 
 comparison new file
 
   $ hg parents --template "{rev}:{node|short}\n" -r 0
   $ hg log --template "{rev}:{node|short}\n" -r 0
   0:0cd96de13884
 
   $ get-with-headers.py localhost:$HGPORT 'comparison/0/a'
   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" />
   <script type="text/javascript" src="/static/mercurial.js"></script>
   
   <title>test: a comparison</title>
   </head>
   <body>
   
   <div class="container">
   <div class="menu">
   <div class="logo">
   <a href="https://mercurial-scm.org/">
   <img src="/static/hglogo.png" alt="mercurial" /></a>
   </div>
   <ul>
   <li><a href="/shortlog/0">log</a></li>
   <li><a href="/graph/0">graph</a></li>
   <li><a href="/tags">tags</a></li>
   <li><a href="/bookmarks">bookmarks</a></li>
   <li><a href="/branches">branches</a></li>
   </ul>
   <ul>
   <li><a href="/rev/0">changeset</a></li>
   <li><a href="/file/0">browse</a></li>
   </ul>
   <ul>
   <li><a href="/file/0/a">file</a></li>
   <li><a href="/file/tip/a">latest</a></li>
   <li><a href="/diff/0/a">diff</a></li>
   <li class="active">comparison</li>
   <li><a href="/annotate/0/a">annotate</a></li>
   <li><a href="/log/0/a">file log</a></li>
   <li><a href="/raw-file/0/a">raw</a></li>
   </ul>
   <ul>
   <li><a href="/help">help</a></li>
   </ul>
   </div>
   
   <div class="main">
   <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
   <h3>
    comparison a @ 0:<a href="/rev/0cd96de13884">0cd96de13884</a>
    
   </h3>
   
   
   <form class="search" action="/log">
   
   <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
   <div id="hint">Find changesets by keywords (author, files, the commit message), revision
   number or hash, or <a href="/help/revsets">revset expression</a>.</div>
   </form>
   
   <div class="description">a</div>
   
   <table id="changesetEntry">
   <tr>
    <th>author</th>
    <td>&#116;&#101;&#115;&#116;</td>
   </tr>
   <tr>
    <th>date</th>
    <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
   </tr>
   <tr>
    <th>parents</th>
    <td></td>
   </tr>
   <tr>
    <th>children</th>
    <td></td>
   </tr>
   </table>
   
   <div class="overflow">
   <div class="sourcefirst">   comparison</div>
   <div class="legend">
     <span class="legendinfo equal">equal</span>
     <span class="legendinfo delete">deleted</span>
     <span class="legendinfo insert">inserted</span>
     <span class="legendinfo replace">replaced</span>
   </div>
   
   <table class="bigtable">
     <thead class="header">
       <tr>
         <th>-1:000000000000</th>
         <th>0:0cd96de13884</th>
       </tr>
     </thead>
     
   <tbody class="block">
   
   <tr id="r1">
   <td class="source insert"><a href="#r1">      </a> </td>
   <td class="source insert"><a href="#r1">     1</a> a</td>
   </tr>
   </tbody>
   </table>
   
   </div>
   </div>
   </div>
   
   
   
   </body>
   </html>
   
 
 comparison existing file
 
   $ hg up
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo a >> a
   $ hg ci -mc
 
   $ hg parents --template "{rev}:{node|short}\n" -r tip
   1:559edbd9ed20
   $ hg log --template "{rev}:{node|short}\n" -r tip
   2:d73db4d812ff
 
   $ get-with-headers.py localhost:$HGPORT 'comparison/tip/a'
   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" />
   <script type="text/javascript" src="/static/mercurial.js"></script>
   
   <title>test: a comparison</title>
   </head>
   <body>
   
   <div class="container">
   <div class="menu">
   <div class="logo">
   <a href="https://mercurial-scm.org/">
   <img src="/static/hglogo.png" alt="mercurial" /></a>
   </div>
   <ul>
   <li><a href="/shortlog/tip">log</a></li>
   <li><a href="/graph/tip">graph</a></li>
   <li><a href="/tags">tags</a></li>
   <li><a href="/bookmarks">bookmarks</a></li>
   <li><a href="/branches">branches</a></li>
   </ul>
   <ul>
   <li><a href="/rev/tip">changeset</a></li>
   <li><a href="/file/tip">browse</a></li>
   </ul>
   <ul>
   <li><a href="/file/tip/a">file</a></li>
   <li><a href="/file/tip/a">latest</a></li>
   <li><a href="/diff/tip/a">diff</a></li>
   <li class="active">comparison</li>
   <li><a href="/annotate/tip/a">annotate</a></li>
   <li><a href="/log/tip/a">file log</a></li>
   <li><a href="/raw-file/tip/a">raw</a></li>
   </ul>
   <ul>
   <li><a href="/help">help</a></li>
   </ul>
   </div>
   
   <div class="main">
   <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
   <h3>
    comparison a @ 2:<a href="/rev/d73db4d812ff">d73db4d812ff</a>
    <span class="tag">tip</span> 
   </h3>
   
   
   <form class="search" action="/log">
   
   <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
   <div id="hint">Find changesets by keywords (author, files, the commit message), revision
   number or hash, or <a href="/help/revsets">revset expression</a>.</div>
   </form>
   
   <div class="description">c</div>
   
   <table id="changesetEntry">
   <tr>
    <th>author</th>
    <td>&#116;&#101;&#115;&#116;</td>
   </tr>
   <tr>
    <th>date</th>
    <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
   </tr>
   <tr>
    <th>parents</th>
    <td><a href="/file/0cd96de13884/a">0cd96de13884</a> </td>
   </tr>
   <tr>
    <th>children</th>
    <td></td>
   </tr>
   </table>
   
   <div class="overflow">
   <div class="sourcefirst">   comparison</div>
   <div class="legend">
     <span class="legendinfo equal">equal</span>
     <span class="legendinfo delete">deleted</span>
     <span class="legendinfo insert">inserted</span>
     <span class="legendinfo replace">replaced</span>
   </div>
   
   <table class="bigtable">
     <thead class="header">
       <tr>
         <th>1:559edbd9ed20</th>
         <th>2:d73db4d812ff</th>
       </tr>
     </thead>
     
   <tbody class="block">
   
   <tr id="l1r1">
   <td class="source equal"><a href="#l1r1">     1</a> a</td>
   <td class="source equal"><a href="#l1r1">     1</a> a</td>
   </tr>
   <tr id="r2">
   <td class="source insert"><a href="#r2">      </a> </td>
   <td class="source insert"><a href="#r2">     2</a> a</td>
   </tr>
   </tbody>
   </table>
   
   </div>
   </div>
   </div>
   
   
   
   </body>
   </html>
   
 
 comparison removed file
 
   $ hg rm a
   $ hg ci -md
 
   $ hg parents --template "{rev}:{node|short}\n" -r tip
   2:d73db4d812ff
   $ hg log --template "{rev}:{node|short}\n" -r tip
   3:20e80271eb7a
 
   $ get-with-headers.py localhost:$HGPORT 'comparison/tip/a'
   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" />
   <script type="text/javascript" src="/static/mercurial.js"></script>
   
   <title>test: a comparison</title>
   </head>
   <body>
   
   <div class="container">
   <div class="menu">
   <div class="logo">
   <a href="https://mercurial-scm.org/">
   <img src="/static/hglogo.png" alt="mercurial" /></a>
   </div>
   <ul>
   <li><a href="/shortlog/tip">log</a></li>
   <li><a href="/graph/tip">graph</a></li>
   <li><a href="/tags">tags</a></li>
   <li><a href="/bookmarks">bookmarks</a></li>
   <li><a href="/branches">branches</a></li>
   </ul>
   <ul>
   <li><a href="/rev/tip">changeset</a></li>
   <li><a href="/file/tip">browse</a></li>
   </ul>
   <ul>
   <li><a href="/file/tip/a">file</a></li>
   <li><a href="/file/tip/a">latest</a></li>
   <li><a href="/diff/tip/a">diff</a></li>
   <li class="active">comparison</li>
   <li><a href="/annotate/tip/a">annotate</a></li>
   <li><a href="/log/tip/a">file log</a></li>
   <li><a href="/raw-file/tip/a">raw</a></li>
   </ul>
   <ul>
   <li><a href="/help">help</a></li>
   </ul>
   </div>
   
   <div class="main">
   <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
   <h3>
    comparison a @ 3:<a href="/rev/20e80271eb7a">20e80271eb7a</a>
    <span class="tag">tip</span> 
   </h3>
   
   
   <form class="search" action="/log">
   
   <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
   <div id="hint">Find changesets by keywords (author, files, the commit message), revision
   number or hash, or <a href="/help/revsets">revset expression</a>.</div>
   </form>
   
   <div class="description">d</div>
   
   <table id="changesetEntry">
   <tr>
    <th>author</th>
    <td>&#116;&#101;&#115;&#116;</td>
   </tr>
   <tr>
    <th>date</th>
    <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
   </tr>
   <tr>
    <th>parents</th>
    <td><a href="/file/d73db4d812ff/a">d73db4d812ff</a> </td>
   </tr>
   <tr>
    <th>children</th>
    <td></td>
   </tr>
   </table>
   
   <div class="overflow">
   <div class="sourcefirst">   comparison</div>
   <div class="legend">
     <span class="legendinfo equal">equal</span>
     <span class="legendinfo delete">deleted</span>
     <span class="legendinfo insert">inserted</span>
     <span class="legendinfo replace">replaced</span>
   </div>
   
   <table class="bigtable">
     <thead class="header">
       <tr>
         <th>2:d73db4d812ff</th>
         <th>3:20e80271eb7a</th>
       </tr>
     </thead>
     
   <tbody class="block">
   
   <tr id="l1">
   <td class="source delete"><a href="#l1">     1</a> a</td>
   <td class="source delete"><a href="#l1">      </a> </td>
   </tr>
   <tr id="l2">
   <td class="source delete"><a href="#l2">     2</a> a</td>
   <td class="source delete"><a href="#l2">      </a> </td>
   </tr>
   </tbody>
   </table>
   
   </div>
   </div>
   </div>
   
   
   
   </body>
   </html>
   
 
 comparison not-modified file
 
   $ echo e > e
   $ hg add e
   $ hg ci -m e
   $ echo f > f
   $ hg add f
   $ hg ci -m f
   $ hg tip --template "{rev}:{node|short}\n"
   5:41d9fc4a6ae1
   $ hg diff -c tip e
   $ hg parents --template "{rev}:{node|short}\n" -r tip
   4:402bea3b0976
   $ hg parents --template "{rev}:{node|short}\n" -r tip e
   4:402bea3b0976
 
   $ get-with-headers.py localhost:$HGPORT 'comparison/tip/e'
   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" />
   <script type="text/javascript" src="/static/mercurial.js"></script>
   
   <title>test: e comparison</title>
   </head>
   <body>
   
   <div class="container">
   <div class="menu">
   <div class="logo">
   <a href="https://mercurial-scm.org/">
   <img src="/static/hglogo.png" alt="mercurial" /></a>
   </div>
   <ul>
   <li><a href="/shortlog/tip">log</a></li>
   <li><a href="/graph/tip">graph</a></li>
   <li><a href="/tags">tags</a></li>
   <li><a href="/bookmarks">bookmarks</a></li>
   <li><a href="/branches">branches</a></li>
   </ul>
   <ul>
   <li><a href="/rev/tip">changeset</a></li>
   <li><a href="/file/tip">browse</a></li>
   </ul>
   <ul>
   <li><a href="/file/tip/e">file</a></li>
   <li><a href="/file/tip/e">latest</a></li>
   <li><a href="/diff/tip/e">diff</a></li>
   <li class="active">comparison</li>
   <li><a href="/annotate/tip/e">annotate</a></li>
   <li><a href="/log/tip/e">file log</a></li>
   <li><a href="/raw-file/tip/e">raw</a></li>
   </ul>
   <ul>
   <li><a href="/help">help</a></li>
   </ul>
   </div>
   
   <div class="main">
   <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
   <h3>
    comparison e @ 5:<a href="/rev/41d9fc4a6ae1">41d9fc4a6ae1</a>
    <span class="tag">tip</span> 
   </h3>
   
   
   <form class="search" action="/log">
   
   <p><input name="rev" id="search1" type="text" size="30" value="" /></p>
   <div id="hint">Find changesets by keywords (author, files, the commit message), revision
   number or hash, or <a href="/help/revsets">revset expression</a>.</div>
   </form>
   
   <div class="description">f</div>
   
   <table id="changesetEntry">
   <tr>
    <th>author</th>
    <td>&#116;&#101;&#115;&#116;</td>
   </tr>
   <tr>
    <th>date</th>
    <td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td>
   </tr>
   <tr>
    <th>parents</th>
    <td><a href="/file/402bea3b0976/e">402bea3b0976</a> </td>
   </tr>
   <tr>
    <th>children</th>
    <td></td>
   </tr>
   </table>
   
   <div class="overflow">
   <div class="sourcefirst">   comparison</div>
   <div class="legend">
     <span class="legendinfo equal">equal</span>
     <span class="legendinfo delete">deleted</span>
     <span class="legendinfo insert">inserted</span>
     <span class="legendinfo replace">replaced</span>
   </div>
   
   <table class="bigtable">
     <thead class="header">
       <tr>
         <th>4:402bea3b0976</th>
         <th>5:41d9fc4a6ae1</th>
       </tr>
     </thead>
     
   </table>
   
   </div>
   </div>
   </div>
   
   
   
   </body>
   </html>
   
   $ cd ..
 
 test import rev as raw-rev
 
   $ hg clone -r0 test test1
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
   new changesets 0cd96de13884
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd test1
   $ hg import -q --bypass --exact http://localhost:$HGPORT/rev/1
 
 raw revision with diff block numbers
 
   $ killdaemons.py
   $ cat <<EOF > .hg/hgrc
   > [web]
   > templates = rawdiff
   > EOF
   $ mkdir rawdiff
   $ cat <<EOF > rawdiff/map
   > mimetype = 'text/plain; charset={encoding}'
   > changeset = '{diff}'
   > difflineplus = '{line}'
   > difflineminus = '{line}'
   > difflineat = '{line}'
   > diffline = '{line}'
   > filenodelink = ''
   > filenolink = ''
   > fileline = '{line}'
   > diffblock = 'Block: {blockno}\n{lines}\n'
   > EOF
   $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ get-with-headers.py localhost:$HGPORT 'raw-rev/0'
   200 Script output follows
   
   Block: 1
   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
   
   Block: 2
   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
   
   $ killdaemons.py
   $ rm .hg/hgrc rawdiff/map
   $ rmdir rawdiff
   $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
 
 errors
 
   $ cat ../test/errors.log
 
   $ cd ..