Mercurial > hg
view mercurial/templates/monoblue/changeset.tmpl @ 44805:02bf61bb4a70
copy: to find copy source, walk parent of revision we're marking copies in
As shown in the previous patch, `hg cp --after --at-rev . src dst`
fails if `src` is not in `.`. It seems obvious that you should always
walk the *parent* of the revision you're marking copies in, but that's
not how it was done for the working copy, and I didn't think to change
it when marking copies in a non-working-copy commit.
This patch fixes that by walking the parent commit instead, but only
if we're marking copies for a non-working-copy commit. We need to
leave the working-copy code unchanged because it depends on the weird
behavior of `workingctx.walk()`. With these changes, there's very
little overlap between the working-copy version and the
non-working-copy version of `walkpats()`, but I've refrained from
cleaning that up on the stable branch.
Differential Revision: https://phab.mercurial-scm.org/D8494
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 06 May 2020 10:33:56 -0700 |
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 id="container"> <div class="page-header"> <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / changeset</h1> {searchform} <ul class="page-nav"> <li><a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a></li> <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li> <li><a href="{url|urlescape}changelog{sessionvars%urlparameter}">changelog</a></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> <li><a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a></li> <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li> </ul> </div> <ul class="submenu"> <li class="current">changeset</li> <li><a href="{url|urlescape}raw-rev/{symrev}">raw</a></li> {archives%archiveentry} </ul> <h2 class="no-link no-border">changeset</h2> <h3 class="changeset"> <a href="{url|urlescape}raw-rev/{node|short}"> {desc|strip|escape|firstline|nonempty} {alltags} </a> </h3> <p class="changeset-age"><span class="age">{date|rfc822date}</span></p> <dl class="overview"> <dt>author</dt> <dd>{author|obfuscate}</dd> <dt>date</dt> <dd class="date age">{date|rfc822date}</dd> {branch%changesetbranch} <dt>changeset {rev}</dt> <dd><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd> {if(obsolete, succsandmarkers%obsfateentry)} {if(instabilities, whyunstable%whyunstableentry)} {ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)} {child%changesetchild} </dl> <p class="description">{desc|strip|escape|websub|addbreaks|nonempty}</p> <table> {files} </table> <div class="diff diffblocks"> {diff} </div> {footer}