upstream/mercurial-mirror Files · mercurial/templates/spartan/changeset.tmpl

merge: respect parents order when using `graft` on a merge...

merge: respect parents order when using `graft` on a merge The previous code did not record the index of the replaced parent. It was always using the "graft" destination as `p1`. This could switch parents order in some situation (eg: some of the evolve evolving merge case). Recording and using the information fixes the issue in evolve. We are not aware of core commands calling graft in that fashion, so we could not build a simple test case for it using core commands.

av6 - - Load All Authors

File last commit:

r37042:7c18798f default


                r43185:a4ca0610

stable

Download file

             changeset.tmpl
        
                    58 lines
            
             | 1.7 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / changeset.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: changeset {node|short}</title>

      </head>

      <body>

      <div class="buttons">

      <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a>

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

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

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

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

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

      <a href="{url|urlescape}raw-rev/{symrev}">raw</a>

      {archives%archiveentry}

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

      </div>

      <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / changeset: {desc|strip|escape|firstline|nonempty}</h2>

      <table id="changesetEntry">

      <tr>

       <th class="changeset">changeset {rev}:</th>

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

      </tr>

      {ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}

      {child%changesetchild}

      {changesettag}

      <tr>

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

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

      </tr>

      <tr>

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

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

      </tr>

      {ifeq(phase, 'public', '', '<tr>

       <th class="phase">phase:</th>

       <td class="phase">{phase|escape}</td>

      </tr>')}

      {if(obsolete, succsandmarkers%obsfateentry)}

      {if(instabilities, whyunstable%whyunstableentry)}

      <tr>

       <th class="files">files:</th>

       <td class="files">{files}</td>

      </tr>

      <tr>

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

       <td class="description">{desc|strip|escape|websub|addbreaks|nonempty}</td>

      </tr>

      </table>

      <div id="changesetDiff">

      {diff}

      </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}: changeset {node\|short}</title>
				</head>
				<body>

				<div class="buttons">
				<a href="{url\|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a>
				<a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a>
				<a href="{url\|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a>
				<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a>
				<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a>
				<a href="{url\|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a>
				<a href="{url\|urlescape}raw-rev/{symrev}">raw</a>
				{archives%archiveentry}
				<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
				</div>

				<h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / changeset: {desc\|strip\|escape\|firstline\|nonempty}</h2>

				<table id="changesetEntry">
				<tr>
				<th class="changeset">changeset {rev}:</th>
				<td class="changeset"><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>
				</tr>
				{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}
				{child%changesetchild}
				{changesettag}
				<tr>
				<th class="author">author:</th>
				<td class="author">{author\|obfuscate}</td>
				</tr>
				<tr>
				<th class="date">date:</th>
				<td class="date age">{date\|rfc822date}</td>
				</tr>
				{ifeq(phase, 'public', '', '<tr>
				<th class="phase">phase:</th>
				<td class="phase">{phase\|escape}</td>
				</tr>')}
				{if(obsolete, succsandmarkers%obsfateentry)}
				{if(instabilities, whyunstable%whyunstableentry)}
				<tr>
				<th class="files">files:</th>
				<td class="files">{files}</td>
				</tr>
				<tr>
				<th class="description">description:</th>
				<td class="description">{desc\|strip\|escape\|websub\|addbreaks\|nonempty}</td>
				</tr>
				</table>

				<div id="changesetDiff">
				{diff}
				</div>

				{footer}