Mercurial > hg
view mercurial/templates/gitweb/changeset.tmpl @ 45276:cb6a72dc0511
merge: pass commitinfo to applyupdates() and get it stored in mergestate
This patch passes the commitinfo calulcated in manifestmerge() to applyupdates()
so that it can be read there and stored in mergestate. On commit, we can read
mergestate for such information and act accordingly.
This patch also makes ACTION_GET_OTHER_AND_STORE not required anymore. Next
patch will remove the messy code surrounding it.
Differential Revision: https://phab.mercurial-scm.org/D8743
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Tue, 14 Jul 2020 16:31:52 +0530 |
parents | 7c18798fc24d |
children |
line wrap: on
line source
{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}