upstream/mercurial-mirror Files · mercurial/templates/monoblue/filecomparison.tmpl

update: specify custom conflict markers for update (BC)...

update: specify custom conflict markers for update (BC) Add custom conflict markers 'working copy' and 'destination' for doing hg update when there are conflicts between your working copy and the destination.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r18526:9409aeaa stable


                r21537:1ab30e9b

default

Download file

             filecomparison.tmpl
        
                    72 lines
            
             | 3.1 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / filecomparison.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      {header}

      <title>{repo|escape}: comparison {file|escape}</title>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
          <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}"/>

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      </head>

      <body>

      <div id="container">

          <div class="page-header">

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb: add a "URL breadcrumb" to the index and repository pages...

              r18258
            
              <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / file comparison</h1>

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
              <form action="{url|urlescape}log">

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
                  {sessionvars%hiddenformentry}

                  <dl class="search">

                      <dt><label>Search: </label></dt>

                      <dd><input type="text" name="rev" /></dd>

                  </dl>

              </form>

              <ul class="page-nav">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
              </ul>

          </div>

          <ul class="submenu">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
              <li class="current">comparison</li>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
              <li><a href="{url|urlescape}raw-diff/{node|short}/{file|urlescape}">raw</a></li>

        wujek srujek
    
hgweb: side-by-side comparison functionality...

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

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
              <dd><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd>

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
              {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">

        wujek srujek
    
hgweb: fixes traceback for invalid files by removing top-level template...

              r17302
            
            <table class="bigtable">

              <thead class="header">

                <tr>

                  <th>{leftrev}:{leftnode|short}</th>

                  <th>{rightrev}:{rightnode|short}</th>

                </tr>

              </thead>

              {comparison}

            </table>

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
          </div>

      {footer}

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

wujek srujek hgweb: side-by-side comparison functionality...	r17202	{header}
		<title>{repo\|escape}: comparison {file\|escape}</title>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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}"/>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	</head>

		<body>
		<div id="container">
		<div class="page-header">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / file comparison</h1>
wujek srujek hgweb: side-by-side comparison functionality...	r17202
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<form action="{url\|urlescape}log">
wujek srujek hgweb: side-by-side comparison functionality...	r17202	{sessionvars%hiddenformentry}
		<dl class="search">
		<dt><label>Search: </label></dt>
		<dd><input type="text" name="rev" /></dd>
		</dl>
		</form>

		<ul class="page-nav">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	</ul>
		</div>

		<ul class="submenu">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	<li class="current">comparison</li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}raw-diff/{node\|short}/{file\|urlescape}">raw</a></li>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	</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>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<dd><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></dd>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	{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">
wujek srujek hgweb: fixes traceback for invalid files by removing top-level template...	r17302	<table class="bigtable">
		<thead class="header">
		<tr>
		<th>{leftrev}:{leftnode\|short}</th>
		<th>{rightrev}:{rightnode\|short}</th>
		</tr>
		</thead>
		{comparison}
		</table>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	</div>

		{footer}