Mercurial > hg

view mercurial/templates/monoblue/filecomparison.tmpl @ 22026:6966542768ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: allow the formatting of three labels instead of two When a third label is provided (to included the base content) it is properly processed as the two others. Nothing changes if only two labels are provided.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 05 Aug 2014 15:17:38 -0700
parents 9409aeaafdc1
children 0cdcbc477cac
line wrap: on
line source

{header}
<title>{repo|escape}: comparison {file|escape}</title>
    <link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>
    <link rel="alternate" type="application/rss+xml" href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>
</head>

<body>
<div id="container">
    <div class="page-header">
        <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / file comparison</h1>

        <form action="{url|urlescape}log">
            {sessionvars%hiddenformentry}
            <dl class="search">
                <dt><label>Search: </label></dt>
                <dd><input type="text" name="rev" /></dd>
            </dl>
        </form>

        <ul class="page-nav">
            <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
            <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
            <li><a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a></li>
            <li><a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
            <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
            <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
            <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
            <li><a href="{url|urlescape}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li>
            <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
        </ul>
    </div>

    <ul class="submenu">
        <li><a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a></li>
        <li><a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a></li>
        <li><a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li>
        <li><a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
        <li class="current">comparison</li>
        <li><a href="{url|urlescape}raw-diff/{node|short}/{file|urlescape}">raw</a></li>
    </ul>

    <h2 class="no-link no-border">comparison: {file|escape}</h2>
    <h3 class="changeset">{file|escape}</h3>

    <dl class="overview">
        {branch%filerevbranch}
        <dt>changeset {rev}</dt>
        <dd><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd>
        {parent%filecompparent}
        {child%filecompchild}
    </dl>

    <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>

    <div class="comparison">
      <table class="bigtable">
        <thead class="header">
          <tr>
            <th>{leftrev}:{leftnode|short}</th>
            <th>{rightrev}:{rightnode|short}</th>
          </tr>
        </thead>
        {comparison}
      </table>
    </div>

{footer}