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

unshelve: disable unshelve during merge (issue5123)...

unshelve: disable unshelve during merge (issue5123) As stated in the issue5123, unshelve can destroy the second parent of the context when tried to unshelve with an uncommitted merge. This patch makes unshelve to abort when called with an uncommitted merge. See how shelve.mergefiles works. Commit structure looks like this: ``` ... -> pctx -> tmpwctx -> shelvectx / / second merge parent pctx = parent before merging working context(first merge parent) tmpwctx = commited working directory after merge(with two parents) shelvectx = shelved context ``` shelve.mergefiles first updates to pctx then it reverts shelvectx to pctx with: ``` cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), *pathtofiles(repo, files), **{'no_backup': True}) ``` Reverting tmpwctx files that were merged from second parent to pctx makes them added because they are not in pctx. Changing this revert operation is crucial to restore parents after unshelve. This is a complicated issue as this is not fixing a regression. Thus, for the time being, unshelve during an uncommitted merge can be aborted. (Details taken from http://mercurial.808500.n3.nabble.com/PATCH-V3-shelve-restore-parents-after-unshelve-issue5123-tt4036858.html#a4037408) Differential Revision: https://phab.mercurial-scm.org/D6169

av6 - - Load All Authors

File last commit:

r35672:59c842a3 default


                r42217:03f6480b

default

Download file

             shortlog.tmpl
        
                    89 lines
            
             | 2.6 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>

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

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

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

              r9999
            
      </ul>

      <ul>

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

              r25606
            
      <li><a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li>

      <li><a href="{url|urlescape}file/{symrev}{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
            
      <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">

        Anton Shestakov
    
hgweb: close <img> elements...

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

        Gregory Szorc
    
hgweb: consolidate search form for paper...

              r32758
            
      {searchform}

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

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

              r10246
            
      <div class="navigate">

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

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

      <a href="{url|urlescape}shortlog/{symrev}{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">

        Anton Shestakov
    
hgweb: replace implicit <tbody> with explicit <thead> where appropriate...

              r24054
            
      <thead>

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

              r9999
            
       <tr>

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

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

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

       </tr>

        Anton Shestakov
    
hgweb: replace implicit <tbody> with explicit <thead> where appropriate...

              r24054
            
      </thead>

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

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

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

      <a href="{url|urlescape}shortlog/{symrev}{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>

        Gregory Szorc
    
hgweb: support Content Security Policy...

              r30766
            
      <script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}>

        Alexander Plavin
    
paper: call ajaxScrollInit in shortlog...

              r19747
            
          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

        av6
    
hgweb: remove unused second argument of nextPageVarGet()...

              r35672
            
                  function (htmlText) \{

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

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

                      return m ? m[1] : null;

                  },

        Yuya Nishihara
    
hgweb: bring back infinite scroll in shortlog of paper style...

              r24952
            
                  '.bigtable > tbody',

        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>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<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>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		<ul>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<li><a href="{url\|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li>
		<li><a href="{url\|urlescape}file/{symrev}{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	<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">
Anton Shestakov hgweb: close <img> elements...	r23830	<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>

Gregory Szorc hgweb: consolidate search form for paper...	r32758	{searchform}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Dirkjan Ochtman hgweb: add less/more links to shortlog/filelog nav	r10246	<div class="navigate">
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<a href="{url\|urlescape}shortlog/{symrev}{lessvars%urlparameter}">less</a>
		<a href="{url\|urlescape}shortlog/{symrev}{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">
Anton Shestakov hgweb: replace implicit <tbody> with explicit <thead> where appropriate...	r24054	<thead>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<tr>
		<th class="age">age</th>
		<th class="author">author</th>
		<th class="description">description</th>
		</tr>
Anton Shestakov hgweb: replace implicit <tbody> with explicit <thead> where appropriate...	r24054	</thead>
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">
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<a href="{url\|urlescape}shortlog/{symrev}{lessvars%urlparameter}">less</a>
		<a href="{url\|urlescape}shortlog/{symrev}{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>

Gregory Szorc hgweb: support Content Security Policy...	r30766	<script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}>
Alexander Plavin paper: call ajaxScrollInit in shortlog...	r19747	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
av6 hgweb: remove unused second argument of nextPageVarGet()...	r35672	function (htmlText) \{
Alexander Plavin hgweb: make infinite scroll handling more generic and extensible...	r19781	var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);
		return m ? m[1] : null;
		},
Yuya Nishihara hgweb: bring back infinite scroll in shortlog of paper style...	r24952	'.bigtable > tbody',
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}