upstream/mercurial-mirror Files · mercurial/templates/paper/fileannotate.tmpl

hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...

hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904) This adds UI portion of the feature that has resided in mercurial since 2012. Back then the interface was added together with the code, but was shortly backed out because it was deemed "not ready". Code, however, stayed. For the original feature and its implementation, see issue2810 and d605a82cf189. In short, the backed-out interface had two outstanding issues: 1. it was introducing an entirely new term (baseline) and 2. it was present on every changeset's page, even for changesets with 1 parent (or no parents), which didn't make sense This patch implements a hopefully better interface because: 1. it uses the usual terms (diff) and 2. it only shows up when there actually are 2 parents.

Alexander Plavin - - Load All Authors

File last commit:

r19795:ac08ff37 default


                r23740:9e1f4c65

default

Download file

             fileannotate.tmpl
        
                    83 lines
            
             | 2.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / fileannotate.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {header}

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

      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

        Steven Stallion
    
hgweb: support alternate logo url...

              r13964
            
      <a href="{logourl}">

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

              r18526
            
      <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </div>

      <ul>

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

              r18526
            
      <li><a href="{url|urlescape}shortlog/{node|short}{sessionvars%urlparameter}">log</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>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </ul>

      <ul>

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

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

      <li><a href="{url|urlescape}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">browse</a></li>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </ul>

      <ul>

        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}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li>

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

      <li><a href="{url|urlescape}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      <li class="active">annotate</li>

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

              r18526
            
      <li><a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li>

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </ul>

        Augie Fackler
    
hgweb: add help link to templates missed in ead4e21f49f1

              r12680
            
      <ul>

        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>

        Augie Fackler
    
hgweb: add help link to templates missed in ead4e21f49f1

              r12680
            
      </ul>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </div>

      <div class="main">

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

              r18258
            
      <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      <h3>annotate {file|escape} @ {rev}:{node|short}</h3>

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

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {sessionvars%hiddenformentry}

      <p><input name="rev" id="search1" type="text" size="30" /></p>

        Alexander Plavin
    
paper: define searchhint message in map file and use it in other templates

              r19795
            
      <div id="hint">{searchhint}</div>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </form>

        Angel Ezquerra
    
hgweb: apply the websub filter to revision descriptions...

              r18628
            
      <div class="description">{desc|strip|escape|websub|nonempty}</div>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      <table id="changesetEntry">

      <tr>

       <th class="author">author</th>

       <td class="author">{author|obfuscate}</td>

      </tr>

      <tr>

       <th class="date">date</th>

        Brodie Rao
    
hgweb: fix dynamic date calculation not working under Safari...

              r15375
            
       <td class="date age">{date|rfc822date}</td>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </tr>

      <tr>

       <th class="author">parents</th>

       <td class="author">{parent%filerevparent}</td>

      </tr>

      <tr>

       <th class="author">children</th>

       <td class="author">{child%filerevchild}</td>

      </tr>

      </table>

      <div class="overflow">

      <table class="bigtable">

      <tr>

       <th class="annotate">rev</th>

       <th class="line">&nbsp;&nbsp;line source</th>

      </tr>

        Alexander Plavin
    
hgweb: make stripes in file annotate view with CSS

              r19449
            
      <tbody class="stripes2">

        {annotate%annotateline}

      </tbody>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </table>

      </div>

      </div>

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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<title>{repo\|escape}: {file\|escape} annotate</title>
		</head>
		<body>

		<div class="container">
		<div class="menu">
		<div class="logo">
Steven Stallion hgweb: support alternate logo url...	r13964	<a href="{logourl}">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<img src="{staticurl\|urlescape}{logoimg}" alt="mercurial" /></a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}shortlog/{node\|short}{sessionvars%urlparameter}">log</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>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>

		<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">changeset</a></li>
		<li><a href="{url\|urlescape}file/{node\|short}{path\|urlescape}{sessionvars%urlparameter}">browse</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		<ul>
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}file/tip/{file\|urlescape}{sessionvars%urlparameter}">latest</a></li>
		<li><a href="{url\|urlescape}diff/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">diff</a></li>
		<li><a href="{url\|urlescape}comparison/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">comparison</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<li class="active">annotate</li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}log/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">file log</a></li>
		<li><a href="{url\|urlescape}raw-annotate/{node\|short}/{file\|urlescape}">raw</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
Augie Fackler hgweb: add help link to templates missed in ead4e21f49f1	r12680	<ul>
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>
Augie Fackler hgweb: add help link to templates missed in ead4e21f49f1	r12680	</ul>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="main">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<h3>annotate {file\|escape} @ {rev}:{node\|short}</h3>

Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<form class="search" action="{url\|urlescape}log">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{sessionvars%hiddenformentry}
		<p><input name="rev" id="search1" type="text" size="30" /></p>
Alexander Plavin paper: define searchhint message in map file and use it in other templates	r19795	<div id="hint">{searchhint}</div>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</form>

Angel Ezquerra hgweb: apply the websub filter to revision descriptions...	r18628	<div class="description">{desc\|strip\|escape\|websub\|nonempty}</div>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<table id="changesetEntry">
		<tr>
		<th class="author">author</th>
		<td class="author">{author\|obfuscate}</td>
		</tr>
		<tr>
		<th class="date">date</th>
Brodie Rao hgweb: fix dynamic date calculation not working under Safari...	r15375	<td class="date age">{date\|rfc822date}</td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>
		<tr>
		<th class="author">parents</th>
		<td class="author">{parent%filerevparent}</td>
		</tr>
		<tr>
		<th class="author">children</th>
		<td class="author">{child%filerevchild}</td>
		</tr>
		</table>

		<div class="overflow">
		<table class="bigtable">
		<tr>
		<th class="annotate">rev</th>
		<th class="line">  line source</th>
		</tr>
Alexander Plavin hgweb: make stripes in file annotate view with CSS	r19449	<tbody class="stripes2">
		{annotate%annotateline}
		</tbody>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</table>
		</div>
		</div>
		</div>

		{footer}