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

amend: fix amend with copies in extras...

amend: fix amend with copies in extras If copy information is stored only in the commit extras and not in filelogs, then they get lost on amend if the file wasn't also modified in the working copy. That's because we create `filectx` object from the old commit in those cases, and the `.copysource()` of such objects read only from the filelog. This patch fixes it by always creating a new `memfilectx` in these cases, passing the calculated copy information to it. Differential Revision: https://phab.mercurial-scm.org/D12387

av6 - - Load All Authors

File last commit:

r37042:7c18798f default


                r49833:877d7e1a

stable

Download file

             changeset.tmpl
        
                    62 lines
            
             | 2.2 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / changeset.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: changeset {rev}:{node|short}</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="page_header">

      <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>

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

      </div>

      <div class="page_nav">

      <div>

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

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

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

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

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

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

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

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

      changeset |

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

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

      </div>

      {searchform}

      </div>

      <div>

       <a class="title" href="{url|urlescape}raw-rev/{node|short}">

        {desc|strip|escape|firstline|nonempty}

        {alltags}

       </a>

      </div>

      <div class="title_text">

      <table cellspacing="0">

      <tr><td>author</td><td>{author|obfuscate}</td></tr>

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

      {branch%changesetbranch}

      <tr>

       <td>changeset {rev}</td>

       <td style="font-family:monospace"><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>

      </tr>

      {if(obsolete, succsandmarkers%obsfateentry)}

      {if(instabilities, whyunstable%whyunstableentry)}

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

      {child%changesetchild}

      </table></div>

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

      <div class="list_head"></div>

      <div class="title_text">

      <table cellspacing="0">

      {files}

      </table></div>

      <div class="page_body diffblocks">{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 {rev}:{node\|short}</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="page_header">
				<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
				<a href="/">Mercurial</a> {pathdef%breadcrumb} / changeset
				</div>

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

				<div>
				<a class="title" href="{url\|urlescape}raw-rev/{node\|short}">
				{desc\|strip\|escape\|firstline\|nonempty}
				{alltags}
				</a>
				</div>
				<div class="title_text">
				<table cellspacing="0">
				<tr><td>author</td><td>{author\|obfuscate}</td></tr>
				<tr><td></td><td class="date age">{date\|rfc822date}</td></tr>
				{branch%changesetbranch}
				<tr>
				<td>changeset {rev}</td>
				<td style="font-family:monospace"><a class="list" href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>
				</tr>
				{if(obsolete, succsandmarkers%obsfateentry)}
				{if(instabilities, whyunstable%whyunstableentry)}
				{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}
				{child%changesetchild}
				</table></div>

				<div class="page_body description">{desc\|strip\|escape\|websub\|nonempty}</div>
				<div class="list_head"></div>
				<div class="title_text">
				<table cellspacing="0">
				{files}
				</table></div>

				<div class="page_body diffblocks">{diff}</div>

				{footer}