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

mergestate: handle additional record types specially...

mergestate: handle additional record types specially This works around a bug in older Mercurial versions' handling of the v2 merge state. We also add a bunch of tests that make sure that (1) we correctly abort when the merge state has an unsupported record type (2) aborting the merge, rebase or histedit continues to work and clears out the merge state.

av6 - - Load All Authors

File last commit:

r26598:264e8890 default


                r27027:a01ecbcf

default

Download file

             filecomparison.tmpl
        
                    73 lines
            
             | 3.2 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>

        av6
    
hgweb: don't dereference symbolic revision in monoblue style...

              r25604
            
                  <li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>

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

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

        av6
    
hgweb: don't dereference symbolic revision in monoblue style...

              r25604
            
                  <li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a></li>

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

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

        av6
    
hgweb: don't dereference symbolic revision in monoblue style...

              r25604
            
              <li><a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a></li>

        av6
    
monoblue: add a link to the latest file revision...

              r26598
            
              <li><a href="{url|urlescape}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li>

        av6
    
hgweb: don't dereference symbolic revision in monoblue style...

              r25604
            
              <li><a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a></li>

              <li><a href="{url|urlescape}annotate/{symrev}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li>

              <li><a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>

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

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

        av6
    
hgweb: don't dereference symbolic revision in monoblue style...

              r25604
            
              <li><a href="{url|urlescape}raw-diff/{symrev}/{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>
av6 hgweb: don't dereference symbolic revision in monoblue style...	r25604	<li><a href="{url\|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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>
av6 hgweb: don't dereference symbolic revision in monoblue style...	r25604	<li><a href="{url\|urlescape}file/{symrev}{path\|urlescape}{sessionvars%urlparameter}">files</a></li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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">
av6 hgweb: don't dereference symbolic revision in monoblue style...	r25604	<li><a href="{url\|urlescape}file/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">file</a></li>
av6 monoblue: add a link to the latest file revision...	r26598	<li><a href="{url\|urlescape}file/tip/{file\|urlescape}{sessionvars%urlparameter}">latest</a></li>
av6 hgweb: don't dereference symbolic revision in monoblue style...	r25604	<li><a href="{url\|urlescape}log/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">revisions</a></li>
		<li><a href="{url\|urlescape}annotate/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a></li>
		<li><a href="{url\|urlescape}diff/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">diff</a></li>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	<li class="current">comparison</li>
av6 hgweb: don't dereference symbolic revision in monoblue style...	r25604	<li><a href="{url\|urlescape}raw-diff/{symrev}/{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}