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

dirstate: fix restoration of "merged" state after a remove...

dirstate: fix restoration of "merged" state after a remove Before this change, "merged" file that get removed and re-added later were recorded as "from_p2" instead. This came from 8fe74328f700, a 2014 changeset that start explicitly doing so for reason I have not been able to fully grasp. The graft test mentioned in the description are still happy after this changeset. So this changeset restore what seems to be the intended behavior. Restoring information as it was before the removal. Differential Revision: https://phab.mercurial-scm.org/D11429

av6 - - Load All Authors

File last commit:

r35672:59c842a3 default


                r48803:87b3010c

default

Download file

             shortlog.tmpl
        
                    89 lines
            
             | 2.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / shortlog.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

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

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

      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

      <a href="{logourl}">

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

      </div>

      <ul>

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

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

      </ul>

      <ul>

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

      </ul>

      <ul>

      {archives%archiveentry}

      </ul>

      <ul>

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

      </ul>

      <div class="atom-logo">

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

      </a>

      </div>

      </div>

      <div class="main">

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

      <h3>log</h3>

      {searchform}

      <div class="navigate">

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

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

      | rev {rev}: {changenav%navshort}

      </div>

      <table class="bigtable">

      <thead>

       <tr>

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

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

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

       </tr>

      </thead>

      <tbody class="stripes2">

      {entries%shortlogentry}

      </tbody>

      </table>

      <div class="navigate">

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

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

      | rev {rev}: {changenav%navshort}

      </div>

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

          ajaxScrollInit(

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

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

                  function (htmlText) \{

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

                      return m ? m[1] : null;

                  },

                  '.bigtable > tbody',

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

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

                  </tr>'

          );

      </script>

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

				{header}
				<title>{repo\|escape}: log</title>
				<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}" />
				</head>
				<body>

				<div class="container">
				<div class="menu">
				<div class="logo">
				<a href="{logourl}">
				<img src="{staticurl\|urlescape}{logoimg}" alt="mercurial" /></a>
				</div>
				<ul>
				<li class="active">log</li>
				<li><a href="{url\|urlescape}graph/{symrev}{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>
				</ul>
				<ul>
				<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>
				</ul>
				<ul>
				{archives%archiveentry}
				</ul>
				<ul>
				<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
				</ul>
				<div class="atom-logo">
				<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" />
				</a>
				</div>
				</div>

				<div class="main">
				<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
				<h3>log</h3>

				{searchform}

				<div class="navigate">
				<a href="{url\|urlescape}shortlog/{symrev}{lessvars%urlparameter}">less</a>
				<a href="{url\|urlescape}shortlog/{symrev}{morevars%urlparameter}">more</a>
				\| rev {rev}: {changenav%navshort}
				</div>

				<table class="bigtable">
				<thead>
				<tr>
				<th class="age">age</th>
				<th class="author">author</th>
				<th class="description">description</th>
				</tr>
				</thead>
				<tbody class="stripes2">
				{entries%shortlogentry}
				</tbody>
				</table>

				<div class="navigate">
				<a href="{url\|urlescape}shortlog/{symrev}{lessvars%urlparameter}">less</a>
				<a href="{url\|urlescape}shortlog/{symrev}{morevars%urlparameter}">more</a>
				\| rev {rev}: {changenav%navshort}
				</div>

				<script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}>
				ajaxScrollInit(
				'{url\|urlescape}shortlog/%next%{sessionvars%urlparameter}',
				'{nextentry%"{node}"}', <!-- NEXTHASH
				function (htmlText) \{
				var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);
				return m ? m[1] : null;
				},
				'.bigtable > tbody',
				'<tr class="%class%">\\
				<td colspan="3" style="text-align: center;">%text%</td>\\
				</tr>'
				);
				</script>

				</div>
				</div>

				{footer}