upstream/mercurial-mirror Files · mercurial/templates/paper/shortlog.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.

Takumi IINO - - Load All Authors

File last commit:

r20253:43cfad93 default


                r23740:9e1f4c65

default

Download file

             shortlog.tmpl
        
                    92 lines
            
             | 2.8 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / shortlog.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

      <title>{repo|escape}: log</title>

      <link rel="alternate" type="application/atom+xml"

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

              r18526
            
         href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}" />

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

              r9999
            
      <link rel="alternate" type="application/rss+xml"

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

              r18526
            
         href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}" />

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

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

      <li class="active">log</li>

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

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

      {archives%archiveentry}

      </ul>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      <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
    
web: add a help view for getting hg help output

              r12666
            
      </ul>

        Angel Ezquerra
    
hgweb: add (Atom) subscribe link to the main paper template pages...

              r18200
            
      <p>

      <div class="atom-logo">

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

              r18526
            
      <a href="{url|urlescape}atom-log" title="subscribe to atom feed">

      <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed">

        Angel Ezquerra
    
hgweb: add (Atom) subscribe link to the main paper template pages...

              r18200
            
      </a>

      </div>

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

        Alexander Plavin
    
hgweb: show current search query in the input field

              r19396
            
      <p><input name="rev" id="search1" type="text" size="30" value="{query|escape}" /></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>

        Dirkjan Ochtman
    
hgweb: add less/more links to shortlog/filelog nav

              r10246
            
      <div class="navigate">

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

              r18526
            
      <a href="{url|urlescape}shortlog/{rev}{lessvars%urlparameter}">less</a>

      <a href="{url|urlescape}shortlog/{rev}{morevars%urlparameter}">more</a>

        Nicolas Dumazet
    
hgweb: changenav: separate pages before and after the current position...

              r10254
            
      | rev {rev}: {changenav%navshort}

        Dirkjan Ochtman
    
hgweb: add less/more links to shortlog/filelog nav

              r10246
            
      </div>

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

              r9999
            
      <table class="bigtable">

       <tr>

        <th class="age">age</th>

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

        <th class="description">description</th>

       </tr>

        Alexander Plavin
    
hgweb: make stripes in log and search with CSS

              r19452
            
      <tbody class="stripes2">

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

              r9999
            
      {entries%shortlogentry}

        Alexander Plavin
    
hgweb: make stripes in log and search with CSS

              r19452
            
      </tbody>

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

              r9999
            
      </table>

        Dirkjan Ochtman
    
hgweb: add less/more links to shortlog/filelog nav

              r10246
            
      <div class="navigate">

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

              r18526
            
      <a href="{url|urlescape}shortlog/{rev}{lessvars%urlparameter}">less</a>

      <a href="{url|urlescape}shortlog/{rev}{morevars%urlparameter}">more</a>

        Nicolas Dumazet
    
hgweb: changenav: separate pages before and after the current position...

              r10254
            
      | rev {rev}: {changenav%navshort}

        Dirkjan Ochtman
    
hgweb: add less/more links to shortlog/filelog nav

              r10246
            
      </div>

        Alexander Plavin
    
paper: call ajaxScrollInit in shortlog...

              r19747
            
      <script type="text/javascript">

          ajaxScrollInit(

        Takumi IINO
    
hgweb: avoid invalid infinity scroll request when overwritten web.style...

              r20253
            
                  '{url|urlescape}shortlog/%next%{sessionvars%urlparameter}',

        Alexander Plavin
    
paper: call ajaxScrollInit in shortlog...

              r19747
            
                  '{nextentry%"{node}"}', <!-- NEXTHASH

        Alexander Plavin
    
hgweb: make infinite scroll handling more generic and extensible...

              r19781
            
                  function (htmlText, previousVal) \{

                      var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);

                      return m ? m[1] : null;

                  },

        Alexander Plavin
    
paper: call ajaxScrollInit in shortlog...

              r19747
            
                  '.bigtable > tbody:nth-of-type(2)',

        Matt Mackall
    
templater: fix escaping in nested string literals (issue4102)...

              r20066
            
                  '<tr class="%class%">\\

                  <td colspan="3" style="text-align: center;">%text%</td>\\

        Alexander Plavin
    
paper: call ajaxScrollInit in shortlog...

              r19747
            
                  </tr>'

          );

      </script>

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

              r9999
            
      </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}: log</title>
		<link rel="alternate" type="application/atom+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}atom-log" title="Atom feed for {repo\|escape}" />
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<link rel="alternate" type="application/rss+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}rss-log" title="RSS feed for {repo\|escape}" />
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</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>
		<li class="active">log</li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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>
		{archives%archiveentry}
		</ul>
Augie Fackler web: add a help view for getting hg help output	r12666	<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 web: add a help view for getting hg help output	r12666	</ul>
Angel Ezquerra hgweb: add (Atom) subscribe link to the main paper template pages...	r18200	<p>
		<div class="atom-logo">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}atom-log" title="subscribe to atom feed">
		<img class="atom-logo" src="{staticurl\|urlescape}feed-icon-14x14.png" alt="atom feed">
Angel Ezquerra hgweb: add (Atom) subscribe link to the main paper template pages...	r18200	</a>
		</div>
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>log</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}
Alexander Plavin hgweb: show current search query in the input field	r19396	<p><input name="rev" id="search1" type="text" size="30" value="{query\|escape}" /></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>

Dirkjan Ochtman hgweb: add less/more links to shortlog/filelog nav	r10246	<div class="navigate">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}shortlog/{rev}{lessvars%urlparameter}">less</a>
		<a href="{url\|urlescape}shortlog/{rev}{morevars%urlparameter}">more</a>
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	\| rev {rev}: {changenav%navshort}
Dirkjan Ochtman hgweb: add less/more links to shortlog/filelog nav	r10246	</div>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<table class="bigtable">
		<tr>
		<th class="age">age</th>
		<th class="author">author</th>
		<th class="description">description</th>
		</tr>
Alexander Plavin hgweb: make stripes in log and search with CSS	r19452	<tbody class="stripes2">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{entries%shortlogentry}
Alexander Plavin hgweb: make stripes in log and search with CSS	r19452	</tbody>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</table>

Dirkjan Ochtman hgweb: add less/more links to shortlog/filelog nav	r10246	<div class="navigate">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}shortlog/{rev}{lessvars%urlparameter}">less</a>
		<a href="{url\|urlescape}shortlog/{rev}{morevars%urlparameter}">more</a>
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	\| rev {rev}: {changenav%navshort}
Dirkjan Ochtman hgweb: add less/more links to shortlog/filelog nav	r10246	</div>

Alexander Plavin paper: call ajaxScrollInit in shortlog...	r19747	<script type="text/javascript">
		ajaxScrollInit(
Takumi IINO hgweb: avoid invalid infinity scroll request when overwritten web.style...	r20253	'{url\|urlescape}shortlog/%next%{sessionvars%urlparameter}',
Alexander Plavin paper: call ajaxScrollInit in shortlog...	r19747	'{nextentry%"{node}"}', <!-- NEXTHASH
Alexander Plavin hgweb: make infinite scroll handling more generic and extensible...	r19781	function (htmlText, previousVal) \{
		var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);
		return m ? m[1] : null;
		},
Alexander Plavin paper: call ajaxScrollInit in shortlog...	r19747	'.bigtable > tbody:nth-of-type(2)',
Matt Mackall templater: fix escaping in nested string literals (issue4102)...	r20066	'<tr class="%class%">\\
		<td colspan="3" style="text-align: center;">%text%</td>\\
Alexander Plavin paper: call ajaxScrollInit in shortlog...	r19747	</tr>'
		);
		</script>

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		</div>

		{footer}