upstream/mercurial-mirror Commit - r36340:f3fd4fe0

hgweb: show each obsfateentry on its own line...

av6 -

r36340:f3fd4fe0 default

parent child

mercurial/templates/gitweb/changeset.tmpl

0 +1 -1

             {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, '<tr><td>obsolete</td><td>{succsandmarkers%obsfateentry}</td></tr>')}
+            {if(obsolete, succsandmarkers%obsfateentry)}
             {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}

mercurial/templates/gitweb/map

0 +5 -1

             default = 'summary'
             mimetype = 'text/html; charset={encoding}'
             header = header.tmpl
             footer = footer.tmpl
             search = search.tmpl
             changelog = changelog.tmpl
             summary = summary.tmpl
             error = error.tmpl
             notfound = notfound.tmpl
             help = help.tmpl
             helptopics = helptopics.tmpl
             helpentry = '
               <tr><td>
                 <a href="{url|urlescape}help/{topic|escape}{sessionvars%urlparameter}">
                   {if(basename, '{basename|escape}', '{topic|escape}')}
                 </a>
               </td><td>
                 {summary|escape}
               </td></tr>'
             naventry = '<a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             navshortentry = '<a href="{url|urlescape}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             navgraphentry = '<a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             filenaventry = '<a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> '
             filedifflink = '<a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
             filenodelink = '
               <tr class="parity{parity}">
                 <td><a class="list" href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a></td>
                 <td></td>
                 <td class="link">
                   <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
                   <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
                   <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
                   <a href="{url|urlescape}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> |
                   <a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
                 </td>
               </tr>'
             filenolink = '
               <tr class="parity{parity}">
                 <td><a class="list" href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a></td>
                 <td></td>
                 <td class="link">
                   file |
                   annotate |
                   <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
                   <a href="{url|urlescape}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> |
                   <a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
                 </td>
               </tr>'
             nav = '{before%naventry} {after%naventry}'
             navshort = '{before%navshortentry}{after%navshortentry}'
             navgraph = '{before%navgraphentry}{after%navgraphentry}'
             filenav = '{before%filenaventry}{after%filenaventry}'
             fileellipses = '...'
             changelogentry = changelogentry.tmpl
             searchentry = changelogentry.tmpl
             changeset = changeset.tmpl
             manifest = manifest.tmpl
             direntry = '
               <tr class="parity{parity}">
                 <td style="font-family:monospace">drwxr-xr-x</td>
                 <td style="font-family:monospace"></td>
                 <td style="font-family:monospace"></td>
                 <td>
                   <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">{basename|escape}</a>
                   <a href="{url|urlescape}file/{symrev}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}">{emptydirs|escape}</a>
                 </td>
                 <td class="link">
                   <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a>
                 </td>
               </tr>'
             fileentry = '
               <tr class="parity{parity}">
                 <td style="font-family:monospace">{permissions|permissions}</td>
                 <td style="font-family:monospace" align=right>{date|isodate}</td>
                 <td style="font-family:monospace" align=right>{size}</td>
                 <td class="list">
                   <a class="list" href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">{basename|escape}</a>
                 </td>
                 <td class="link">
                   <a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
                   <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
                   <a href="{url|urlescape}annotate/{symrev}/{file|urlescape}{sessionvars%urlparameter}">annotate</a>
                 </td>
               </tr>'
             filerevision = filerevision.tmpl
             fileannotate = fileannotate.tmpl
             filediff = filediff.tmpl
             filecomparison = filecomparison.tmpl
             filelog = filelog.tmpl
             fileline = '
               <a href="#{lineid}"></a><span id="{lineid}">{strip(line|escape, '\r\n')}</span>'
             annotateline = '
               <tr id="{lineid}" style="font-family:monospace" class="parity{parity}{ifeq(node, originalnode, ' thisrev')}">
                 <td class="annotate linenr parity{blockparity}" style="text-align: right;">
                   {if(blockhead,
                       '<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
                          {rev}
                        </a>')}
                   <div class="annotate-info">
                     <div>
                       <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
                         {node|short}</a>
                       {desc|escape|firstline}
                     </div>
                     <div><em>{author|obfuscate}</em></div>
                     <div>parents: {parents%annotateparent}</div>
                     <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a>
                     <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a>
                   </div>
                 </td>
                 <td class="followlines-btn-parent"><pre><a class="linenr" href="#{lineid}">{linenumber}</a></pre></td>
                 <td><pre>{line|escape}</pre></td>
               </tr>'
             annotateparent = '
               <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}</a>'
             difflineplus = '
               <a href="#{lineid}"></a><span id="{lineid}" class="difflineplus">{strip(line|escape, '\r\n')}</span>'
             difflineminus = '
               <a href="#{lineid}"></a><span id="{lineid}" class="difflineminus">{strip(line|escape, '\r\n')}</span>'
             difflineat = '
               <a href="#{lineid}"></a><span id="{lineid}" class="difflineat">{strip(line|escape, '\r\n')}</span>'
             diffline = '
               <a href="#{lineid}"></a><span id="{lineid}">{strip(line|escape, '\r\n')}</span>'
             comparisonblock ='
               <tbody class="block">
               {lines}
               </tbody>'
             comparisonline = '
               <tr id="{lineid}" style="font-family:monospace">
                 <td class="{type}"><pre><a class="linenr" href="#{lineid}">{leftlinenumber}</a> {leftline|escape}</pre></td>
                 <td class="{type}"><pre><a class="linenr" href="#{lineid}">{rightlinenumber}</a> {rightline|escape}</pre></td>
               </tr>'
             changesetlink = '<a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>'
             changesetbranch = '<tr><td>branch</td><td>{name|escape}</td></tr>'
             changesetparent = '
               <tr>
                 <td>parent {rev}</td>
                 <td style="font-family:monospace">
                   {changesetlink}
                 </td>
               </tr>'
             changesetparentdiff = '
               <tr>
                 <td>parent {rev}</td>
                 <td style="font-family:monospace">
                   {changesetlink} {ifeq(node, basenode, '(current diff)', '({difffrom})')}
                 </td>
               </tr>'
             difffrom = '<a href="{url|urlescape}rev/{node|short}:{originalnode|short}{sessionvars%urlparameter}">diff</a>'
             filerevbranch = '<tr><td>branch</td><td>{name|escape}</td></tr>'
             filerevparent = '
               <tr>
                 <td>parent {rev}</td>
                 <td style="font-family:monospace">
                   <a class="list" href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
                     {rename%filerename}{node|short}
                   </a>
                 </td>
               </tr>'
             filerename = '{file|escape}@'
             filelogrename = '| <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">base</a>'
             fileannotateparent = '
               <tr>
                 <td>parent {rev}</td>
                 <td style="font-family:monospace">
                   <a class="list" href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
                     {rename%filerename}{node|short}
                   </a>
                 </td>
               </tr>'
             changesetchild = '
               <tr>
                 <td>child {rev}</td>
                 <td style="font-family:monospace">
                   <a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>
                 </td>
               </tr>'
             filerevchild = '
               <tr>
                 <td>child {rev}</td>
                 <td style="font-family:monospace">
                   <a class="list" href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td>
                 </tr>'
             fileannotatechild = '
               <tr>
                 <td>child {rev}</td>
                 <td style="font-family:monospace">
                   <a class="list" href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td>
                 </tr>'
             tags = tags.tmpl
             tagentry = '
               <tr class="parity{parity}">
                 <td class="age"><i class="age">{date|rfc822date}</i></td>
                 <td><a class="list" href="{url|urlescape}rev/{tag|revescape}{sessionvars%urlparameter}"><b>{tag|escape}</b></a></td>
                 <td class="link">
                   <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
                   <a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
                   <a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>
                 </td>
               </tr>'
             bookmarks = bookmarks.tmpl
             bookmarkentry = '
               <tr class="parity{parity}">
                 <td class="age"><i class="age">{date|rfc822date}</i></td>
                 <td><a class="list" href="{url|urlescape}rev/{bookmark|revescape}{sessionvars%urlparameter}"><b>{bookmark|escape}</b></a></td>
                 <td class="link">
                   <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
                   <a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
                   <a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>
                 </td>
               </tr>'
             branches = branches.tmpl
             branchentry = '
               <tr class="parity{parity}">
                 <td class="age"><i class="age">{date|rfc822date}</i></td>
                 <td class="{status}"><a class="list" href="{url|urlescape}shortlog/{branch|revescape}{sessionvars%urlparameter}"><b>{branch|escape}</b></a></td>
                 <td class="link">
                   <a href="{url|urlescape}changeset/{node|short}{sessionvars%urlparameter}">changeset</a> |
                   <a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
                   <a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>
                 </td>
               </tr>'
             diffblock = '<div class="diffblock"><pre class="sourcelines">{lines}</pre></div>'
             filediffparent = '
               <tr>
                 <td>parent {rev}</td>
                 <td style="font-family:monospace">
                   <a class="list" href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
                     {node|short}
                   </a>
                 </td>
               </tr>'
             filecompparent = '
               <tr>
                 <td>parent {rev}</td>
                 <td style="font-family:monospace">
                   <a class="list" href="{url|urlescape}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
                     {node|short}
                   </a>
                 </td>
               </tr>'
             filediffchild = '
               <tr>
                 <td>child {rev}</td>
                 <td style="font-family:monospace">
                   <a class="list" href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a>
                 </td>
               </tr>'
             filecompchild = '
               <tr>
                 <td>child {rev}</td>
                 <td style="font-family:monospace">
                   <a class="list" href="{url|urlescape}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a>
                 </td>
               </tr>'
             shortlog = shortlog.tmpl
             graph = graph.tmpl
             graphentry = graphentry.tmpl
             phasetag = '{ifeq(phase, 'public', '', '<span class="phasetag" title="{phase|escape}">{phase|escape}</span> ')}'
             obsoletetag = '{if(obsolete, '<span class="obsoletetag" title="obsolete">obsolete</span> ')}'
             instabilitytag = '<span class="instabilitytag" title="{instability|escape}">{instability|escape}</span> '
             tagtag = '<span class="tagtag" title="{name|escape}">{name|escape}</span> '
             branchtag = '<span class="branchtag" title="{name|escape}">{name|escape}</span> '
             inbranchtag = '<span class="inbranchtag" title="{name|escape}">{name|escape}</span> '
             bookmarktag = '<span class="bookmarktag" title="{name|escape}">{name|escape}</span> '
             alltags = '<span class="logtags">{phasetag}{obsoletetag}{instabilities%instabilitytag}{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>'
             successorlink = '<a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> '
             obsfatesuccessors = '{if(successors, ' as ')}{successors%successorlink}'
             obsfateverb = '{obsfateverb(successors, markers)}'
             obsfateoperations = '{if(obsfateoperations(markers), ' using {join(obsfateoperations(markers), ', ')}')}'
             obsfateusers = '{if(obsfateusers(markers), ' by {join(obsfateusers(markers)%'{user|obfuscate}', ', ')}')}'
             obsfatedate = '{if(obsfatedate(markers), ' {ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), '<span class="age">{min(obsfatedate(markers))|rfc822date}</span>', 'between <span class="age">{min(obsfatedate(markers))|rfc822date}</span> and <span class="age">{max(obsfatedate(markers))|rfc822date}</span>')}')}'
-            obsfateentry = '{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}'
+            obsfateentry = '
+              <tr>
+                <td>obsolete</td>
+                <td>{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}</td>
+              </tr>'
             shortlogentry = '
               <tr class="parity{parity}">
                 <td class="age"><i class="age">{date|rfc822date}</i></td>
                 <td><i>{author|person}</i></td>
                 <td>
                   <a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
                     <b>{desc|strip|firstline|escape|nonempty}</b>
                     {alltags}
                   </a>
                 </td>
                 <td class="link" nowrap>
                   <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
                   <a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>
                 </td>
               </tr>'
             filelogentry = '
               <tr class="parity{if(patch, '1', '{parity}')}">
                 <td class="age"><i class="age">{date|rfc822date}</i></td>
                 <td><i>{author|person}</i></td>
                 <td>
                   <a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
                     <b>{desc|strip|firstline|escape|nonempty}</b>
                     {alltags}
                   </a>
                 </td>
                 <td class="link">
                   <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
                   <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
                   <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a>
                   {rename%filelogrename}
                 </td>
               </tr>
               {if(patch, '<tr><td colspan="4">{diff}</td></tr>')}'
             archiveentry = ' | <a href="{url|urlescape}archive/{symrev}{extension}{ifeq(path,'/','',path|urlescape)}">{type|escape}</a> '
             indexentry = '
               <tr class="parity{parity}">
                 <td>
                   <a class="list" href="{url|urlescape}{sessionvars%urlparameter}">
                     <b>{name|escape}</b>
                   </a>
                 </td>
                 <td>{description}</td>
                 <td>{contact|obfuscate}</td>
                 <td class="age">{lastchange|rfc822date}</td>
                 <td class="indexlinks">{archives%indexarchiveentry}</td>
                 <td>{if(isdirectory, '',
                         '<div class="rss_logo">
                             <a href="{url|urlescape}rss-log">RSS</a> <a href="{url|urlescape}atom-log">Atom</a>
                         </div>'
                         )}
                 </td>
               </tr>\n'
             indexarchiveentry = ' <a href="{url|urlescape}archive/{node|short}{extension}">{type|escape}</a> '
             index = index.tmpl
             urlparameter = '{separator}{name}={value|urlescape}'
             hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'
             breadcrumb = '&gt; <a href="{url|urlescape}">{name|escape}</a> '
             searchform = '
               <div class="search">
                 <form id="searchform" action="{url|urlescape}log">
                   {sessionvars%hiddenformentry}
                   <input name="rev" type="text" value="{query|escape}" size="40" />
                   <div id="hint">{searchhint}</div>
                 </form>
               </div>'
             searchhint = 'Find changesets by keywords (author, files, the commit message), revision
               number or hash, or <a href="{url|urlescape}help/revsets">revset expression</a>.'
             diffoptsform = '
               <form id="diffopts-form"
                 data-ignorews="{if(get(diffopts, 'ignorews'), '1', '0')}"
                 data-ignorewsamount="{if(get(diffopts, 'ignorewsamount'), '1', '0')}"
                 data-ignorewseol="{if(get(diffopts, 'ignorewseol'), '1', '0')}"
                 data-ignoreblanklines="{if(get(diffopts, 'ignoreblanklines'), '1', '0')}">
                 <span>Ignore whitespace changes - </span>
                 <span>Everywhere:</span>
                 <input id="ignorews-checkbox" type="checkbox" />
                 <span>Within whitespace:</span>
                 <input id="ignorewsamount-checkbox" type="checkbox" />
                 <span>At end of lines:</span>
                 <input id="ignorewseol-checkbox" type="checkbox" />
               </form>'

mercurial/templates/monoblue/changeset.tmpl

0 +1 -1

             {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, '<dt>obsolete</dt><dd>{succsandmarkers%obsfateentry}</dd>')}
+                    {if(obsolete, succsandmarkers%obsfateentry)}
                     {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}

mercurial/templates/monoblue/map

0 +3 -1

             default = 'summary'
             mimetype = 'text/html; charset={encoding}'
             header = header.tmpl
             footer = footer.tmpl
             search = search.tmpl
             changelog = changelog.tmpl
             summary = summary.tmpl
             error = error.tmpl
             notfound = notfound.tmpl
             help = help.tmpl
             helptopics = helptopics.tmpl
             helpentry = '
               <tr><td>
                 <a href="{url|urlescape}help/{topic|escape}{sessionvars%urlparameter}">
                   {if(basename, '{basename|escape}', '{topic|escape}')}
                 </a>
               </td><td>
                 {summary|escape}
               </td></tr>'
             naventry = '<a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             navshortentry = '<a href="{url|urlescape}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             navgraphentry = '<a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             filenaventry = '<a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> '
             filedifflink = '<a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
             filenodelink = '
               <tr class="parity{parity}">
                 <td><a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a></td>
                 <td></td>
                 <td>
                   <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
                   <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
                   <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
                   <a href="{url|urlescape}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> |
                   <a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
                 </td>
               </tr>'
             filenolink = '
               <tr class="parity{parity}">
                 <td><a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a></td>
                 <td></td>
                 <td>
                   file |
                   annotate |
                   <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
                   <a href="{url|urlescape}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> |
                   <a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
                 </td>
               </tr>'
             nav = '{before%naventry} {after%naventry}'
             navshort = '{before%navshortentry}{after%navshortentry}'
             navgraph = '{before%navgraphentry}{after%navgraphentry}'
             filenav = '{before%filenaventry}{after%filenaventry}'
             fileellipses = '...'
             changelogentry = changelogentry.tmpl
             searchentry = changelogentry.tmpl
             changeset = changeset.tmpl
             manifest = manifest.tmpl
             direntry = '
               <tr class="parity{parity}">
                 <td>drwxr-xr-x</td>
                 <td></td>
                 <td></td>
                 <td>
                   <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">{basename|escape}</a>
                   <a href="{url|urlescape}file/{symrev}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}">{emptydirs|escape}</a>
                 </td>
                 <td><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a></td>
               </tr>'
             fileentry = '
               <tr class="parity{parity}">
                 <td>{permissions|permissions}</td>
                 <td>{date|isodate}</td>
                 <td>{size}</td>
                 <td><a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">{basename|escape}</a></td>
                 <td>
                   <a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
                   <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
                   <a href="{url|urlescape}annotate/{symrev}/{file|urlescape}{sessionvars%urlparameter}">annotate</a>
                 </td>
               </tr>'
             filerevision = filerevision.tmpl
             fileannotate = fileannotate.tmpl
             filediff = filediff.tmpl
             filecomparison = filecomparison.tmpl
             filelog = filelog.tmpl
             fileline = '
               <a href="#{lineid}"></a><span id="{lineid}">{strip(line|escape, '\r\n')}</span>'
             annotateline = '
               <tr id="{lineid}" class="parity{parity}{ifeq(node, originalnode, ' thisrev')}">
                 <td class="annotate linenr parity{blockparity}">
                   {if(blockhead,
                       '<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
                          {rev}
                        </a>')}
                   <div class="annotate-info">
                     <div>
                       <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
                         {node|short}</a>
                       {desc|escape|firstline}
                     </div>
                     <div><em>{author|obfuscate}</em></div>
                     <div>parents: {parents%annotateparent}</div>
                     <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a>
                     <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a>
                   </div>
                 </td>
                 <td class="lineno">
                   <a href="#{lineid}">{linenumber}</a>
                 </td>
                 <td class="source">{line|escape}</td>
               </tr>'
             annotateparent = '
               <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}</a>'
             difflineplus = '
               <a href="#{lineid}"></a><span id="{lineid}" class="difflineplus">{strip(line|escape, '\r\n')}</span>'
             difflineminus = '
               <a href="#{lineid}"></a><span id="{lineid}" class="difflineminus">{strip(line|escape, '\r\n')}</span>'
             difflineat = '
               <a href="#{lineid}"></a><span id="{lineid}" class="difflineat">{strip(line|escape, '\r\n')}</span>'
             diffline = '
               <a href="#{lineid}"></a><span id="{lineid}">{strip(line|escape, '\r\n')}</span>'
             comparisonblock ='
               <tbody class="block">
               {lines}
               </tbody>'
             comparisonline = '
               <tr id="{lineid}">
                 <td class="source {type}"><a class="linenr" href="#{lineid}">{leftlinenumber}</a> {leftline|escape}</td>
                 <td class="source {type}"><a class="linenr" href="#{lineid}">{rightlinenumber}</a> {rightline|escape}</td>
               </tr>'
             changesetlink = '<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>'
             changesetbranch = '<dt>branch</dt><dd>{name|escape}</dd>'
             changesetparent = '
               <dt>parent {rev}</dt>
               <dd>{changesetlink}</dd>'
             changesetparentdiff = '
               <dt>parent {rev}</dt>
               <dd>{changesetlink} {ifeq(node, basenode, '(current diff)', '({difffrom})')}</dd>'
             difffrom = '<a href="{url|urlescape}rev/{node|short}:{originalnode|short}{sessionvars%urlparameter}">diff</a>'
             filerevbranch = '<dt>branch</dt><dd>{name|escape}</dd>'
             filerevparent = '
               <dt>parent {rev}</dt>
               <dd>
                 <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
                   {rename%filerename}{node|short}
                 </a>
               </dd>'
             filerename = '{file|escape}@'
             filelogrename = '| <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">base</a>'
             fileannotateparent = '
               <dt>parent {rev}</dt>
               <dd>
                 <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
                   {rename%filerename}{node|short}
                 </a>
               </dd>'
             changesetchild = '
               <dt>child {rev}</dt>
               <dd><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd>'
             filerevchild = '
               <dt>child {rev}</dt>
               <dd>
                 <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a>
               </dd>'
             fileannotatechild = '
               <dt>child {rev}</dt>
               <dd>
                 <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a>
               </dd>'
             tags = tags.tmpl
             tagentry = '
               <tr class="parity{parity}">
                 <td class="nowrap age">{date|rfc822date}</td>
                 <td><a href="{url|urlescape}rev/{tag|revescape}{sessionvars%urlparameter}">{tag|escape}</a></td>
                 <td class="nowrap">
                   <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
                   <a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
                   <a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>
                 </td>
               </tr>'
             bookmarks = bookmarks.tmpl
             bookmarkentry = '
               <tr class="parity{parity}">
                 <td class="nowrap age">{date|rfc822date}</td>
                 <td><a href="{url|urlescape}rev/{bookmark|revescape}{sessionvars%urlparameter}">{bookmark|escape}</a></td>
                 <td class="nowrap">
                   <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
                   <a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
                   <a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>
                 </td>
               </tr>'
             branches = branches.tmpl
             branchentry = '
               <tr class="parity{parity}">
                 <td class="nowrap age">{date|rfc822date}</td>
                 <td class="{status}"><a href="{url|urlescape}shortlog/{branch|revescape}{sessionvars%urlparameter}">{branch|escape}</a></td>
                 <td class="nowrap">
                   <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
                   <a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
                   <a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>
                 </td>
               </tr>'
             diffblock = '<div class="diffblock"><pre class="sourcelines">{lines}</pre></div>'
             filediffparent = '
               <dt>parent {rev}</dt>
               <dd><a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></dd>'
             filecompparent = '
               <dt>parent {rev}</dt>
               <dd><a href="{url|urlescape}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></dd>'
             filediffchild = '
               <dt>child {rev}</dt>
               <dd><a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></dd>'
             filecompchild = '
               <dt>child {rev}</dt>
               <dd><a href="{url|urlescape}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></dd>'
             shortlog = shortlog.tmpl
             phasetag = '{ifeq(phase, 'public', '', '<span class="phasetag" title="{phase|escape}">{phase|escape}</span> ')}'
             obsoletetag = '{if(obsolete, '<span class="obsoletetag" title="obsolete">obsolete</span> ')}'
             instabilitytag = '<span class="instabilitytag" title="{instability|escape}">{instability|escape}</span> '
             tagtag = '<span class="tagtag" title="{name|escape}">{name|escape}</span> '
             branchtag = '<span class="branchtag" title="{name|escape}">{name|escape}</span> '
             inbranchtag = '<span class="inbranchtag" title="{name|escape}">{name|escape}</span> '
             bookmarktag = '<span class="bookmarktag" title="{name|escape}">{name|escape}</span> '
             alltags = '<span class="logtags">{phasetag}{obsoletetag}{instabilities%instabilitytag}{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>'
             successorlink = '<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> '
             obsfatesuccessors = '{if(successors, ' as ')}{successors%successorlink}'
             obsfateverb = '{obsfateverb(successors, markers)}'
             obsfateoperations = '{if(obsfateoperations(markers), ' using {join(obsfateoperations(markers), ', ')}')}'
             obsfateusers = '{if(obsfateusers(markers), ' by {join(obsfateusers(markers)%'{user|obfuscate}', ', ')}')}'
             obsfatedate = '{if(obsfatedate(markers), ' {ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), '<span class="age">{min(obsfatedate(markers))|rfc822date}</span>', 'between <span class="age">{min(obsfatedate(markers))|rfc822date}</span> and <span class="age">{max(obsfatedate(markers))|rfc822date}</span>')}')}'
-            obsfateentry = '{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}'
+            obsfateentry = '
+              <dt>obsolete</dt>
+              <dd>{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}</dd>'
             shortlogentry = '
               <tr class="parity{parity}">
                 <td class="nowrap age">{date|rfc822date}</td>
                 <td>{author|person}</td>
                 <td>
                   <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
                     {desc|strip|firstline|escape|nonempty}
                     {alltags}
                   </a>
                 </td>
                 <td class="nowrap">
                   <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
                   <a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>
                 </td>
               </tr>'
             filelogentry = '
               <tr class="parity{parity}">
                 <td class="nowrap age">{date|rfc822date}</td>
                 <td>{author|person}</td>
                 <td>
                   <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
                     {desc|strip|firstline|escape|nonempty}
                     {alltags}
                   </a>
                 </td>
                 <td class="nowrap">
                   <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
                   <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
                   <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a>
                   {rename%filelogrename}
                 </td>
               </tr>'
             archiveentry = '<li><a href="{url|urlescape}archive/{symrev}{extension}{ifeq(path,'/','',path|urlescape)}">{type|escape}</a></li>'
             indexentry = '
               <tr class="parity{parity}">
                 <td><a href="{url|urlescape}{sessionvars%urlparameter}">{name|escape}</a></td>
                 <td>{description}</td>
                 <td>{contact|obfuscate}</td>
                 <td class="age">{lastchange|rfc822date}</td>
                 <td class="indexlinks">{archives%indexarchiveentry}</td>
                 <td>
                     {if(isdirectory, '',
                         '<div class="rss_logo">
                             <a href="{url|urlescape}rss-log">RSS</a> <a href="{url|urlescape}atom-log">Atom</a>
                         </div>'
                         )}
                 </td>
               </tr>\n'
             indexarchiveentry = '<a href="{url|urlescape}archive/{node|short}{extension}">{type|escape}</a> '
             index = index.tmpl
             urlparameter = '{separator}{name}={value|urlescape}'
             hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'
             graph = graph.tmpl
             graphentry = graphentry.tmpl
             breadcrumb = '&gt; <a href="{url|urlescape}">{name|escape}</a> '
             searchform = '
               <form action="{url|urlescape}log">
                 {sessionvars%hiddenformentry}
                 <dl class="search">
                   <dt><label>Search: </label></dt>
                   <dd><input type="text" name="rev" value="{query|escape}" /></dd>
                 </dl>
               </form>'

mercurial/templates/paper/changeset.tmpl

0 +1 -1

             {header}
             <title>{repo|escape}: {node|short}</title>
             </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><a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">log</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>
             </ul>
             <ul>
              <li class="active">changeset</li>
              <li><a href="{url|urlescape}raw-rev/{symrev}{sessionvars%urlparameter}">raw</a></li>
              <li><a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">browse</a></li>
             </ul>
             <ul>
              {archives%archiveentry}
             </ul>
             <ul>
              <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
             </ul>
             </div>
             <div class="main">
             <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
             <h3>
              changeset {rev}:<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>
              {alltags}
             </h3>
             {searchform}
             <div class="description">{desc|strip|escape|websub|nonempty}</div>
             <table id="changesetEntry">
             <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>
             {if(obsolete, '<tr>
              <th>obsolete</th>
-             <td>{succsandmarkers%obsfateentry}</td>
+             <td>{join(succsandmarkers%obsfateentry, '<br>\n')}</td>
             </tr>')}
             <tr>
              <th class="author">parents</th>
              <td class="author">{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}</td>
             </tr>
             <tr>
              <th class="author">children</th>
              <td class="author">{child%changesetchild}</td>
             </tr>
             <tr>
              <th class="files">files</th>
              <td class="files">{files}</td>
             </tr>
             <tr>
               <th class="diffstat">diffstat</th>
               <td class="diffstat">
                 {diffsummary}
                 <a id="diffstatexpand" href="javascript:toggleDiffstat()">[<tt>+</tt>]</a>
                 <div id="diffstatdetails" style="display:none;">
                   <a href="javascript:toggleDiffstat()">[<tt>-</tt>]</a>
                   <table class="diffstat-table stripes2">{diffstat}</table>
                 </div>
               </td>
             </tr>
             </table>
             <div class="overflow">
             <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
             <div class="sourcefirst"> line diff</div>
             <div class="stripes2 diffblocks">
             {diff}
             </div>
             </div>
             </div>
             </div>
             {footer}

mercurial/templates/spartan/changelogentry.tmpl

0 +1 -4

             <table class="logEntry parity{parity}">
              <tr>
               <th class="label"><span class="age">{date|rfc822date}</span>:</th>
               <th class="firstline">{desc|strip|firstline|escape|nonempty}</th>
              </tr>
              <tr>
               <th class="revision">changeset {rev}:</th>
               <td class="node"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
              </tr>
              {parent%changelogparent}
              {child%changelogchild}
              {changelogtag}
              <tr>
               <th class="author">author:</th>
               <td class="author">{author|obfuscate}</td>
              </tr>
              <tr>
               <th class="date">date:</th>
               <td class="date">{date|rfc822date}</td>
              </tr>
              {ifeq(phase, 'public', '', '<tr>
               <th class="phase">phase:</th>
               <td class="phase">{phase|escape}</td>
              </tr>')}
-             {if(obsolete, '<tr>
+             {if(obsolete, succsandmarkers%obsfateentry)}
-              <th class="obsolete">obsolete:</th>
-              <td class="obsolete">{succsandmarkers%obsfateentry}</td>
-             </tr>')}
              {ifeq(count(instabilities), '0', '', '<tr>
               <th class="instabilities">instabilities:</th>
               <td class="instabilities">{instabilities%"{instability} "|escape}</td>
              </tr>')}
              <tr>
               <th class="files"><a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>:</th>
               <td class="files">{files}</td>
              </tr>
             </table>

mercurial/templates/spartan/changeset.tmpl

0 +1 -4

             {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, '<tr>
+            {if(obsolete, succsandmarkers%obsfateentry)}
-             <th class="obsolete">obsolete:</th>
-             <td class="obsolete">{succsandmarkers%obsfateentry}</td>
-            </tr>')}
             {ifeq(count(instabilities), '0', '', '<tr>
              <th class="instabilities">instabilities:</th>
              <td class="instabilities">{instabilities%"{instability} "|escape}</td>
             </tr>')}
             <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}

mercurial/templates/spartan/map

0 +5 -1

             default = 'shortlog'
             mimetype = 'text/html; charset={encoding}'
             header = header.tmpl
             footer = footer.tmpl
             search = search.tmpl
             changelog = changelog.tmpl
             shortlog = shortlog.tmpl
             shortlogentry = shortlogentry.tmpl
             graph = graph.tmpl
             graphentry = graphentry.tmpl
             naventry = '<a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             navshortentry = '<a href="{url|urlescape}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             navgraphentry = '<a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
             filenaventry = '<a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> '
             filedifflink = '<a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
             filenodelink = '<a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
             filenolink = '{file|escape} '
             fileellipses = '...'
             changelogentry = changelogentry.tmpl
             searchentry = changelogentry.tmpl
             changeset = changeset.tmpl
             manifest = manifest.tmpl
             nav = '{before%naventry} {after%naventry}'
             navshort = '{before%navshortentry}{after%navshortentry}'
             navgraph = '{before%navgraphentry}{after%navgraphentry}'
             filenav = '{before%filenaventry}{after%filenaventry}'
             direntry = '
               <tr class="parity{parity}">
                 <td><tt>drwxr-xr-x</tt>&nbsp;
                 <td>&nbsp;
                 <td>&nbsp;
                 <td>
                   <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">{basename|escape}/</a>
                   <a href="{url|urlescape}file/{symrev}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}">
                     {emptydirs|urlescape}
                   </a>'
             fileentry = '
               <tr class="parity{parity}">
                 <td><tt>{permissions|permissions}</tt>&nbsp;
                 <td align=right><tt class="date">{date|isodate}</tt>&nbsp;
                 <td align=right><tt>{size}</tt>&nbsp;
                 <td><a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">{basename|escape}</a>'
             filerevision = filerevision.tmpl
             fileannotate = fileannotate.tmpl
             filediff = filediff.tmpl
             filelog = filelog.tmpl
             fileline = '<div class="parity{parity}"><a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a>&nbsp;{line|escape}</div>'
             filelogentry = filelogentry.tmpl
             # The &nbsp; ensures that all table cells have content (even if there
             # is an empty line in the annotated file), which in turn ensures that
             # all table rows have equal height.
             annotateline = '
               <tr class="parity{parity}{ifeq(node, originalnode, ' thisrev')}">
                 <td class="annotate parity{blockparity}">
                   {if(blockhead,
                       '<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
                          {rev}
                        </a>')}
                   <div class="annotate-info">
                     <div>
                       <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
                         {node|short}</a>
                       {desc|escape|firstline}
                     </div>
                     <div><em>{author|obfuscate}</em></div>
                     <div>parents: {parents%annotateparent}</div>
                     <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a>
                     <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a>
                   </div>
                 </td>
                 <td>
                   <a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a>
                 </td>
                 <td><pre>&nbsp;{line|escape}</pre></td>
               </tr>'
             annotateparent = '
               <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}</a>'
             difflineplus = '<span class="plusline"><a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a>{line|escape}</span>'
             difflineminus = '<span class="minusline"><a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a>{line|escape}</span>'
             difflineat = '<span class="atline"><a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a>{line|escape}</span>'
             diffline = '<a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a>{line|escape}'
             changesetlink = '<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>'
             changelogparent = '
               <tr>
                 <th class="parent">parent {rev}:</th>
                 <td class="parent">
                   {changesetlink}
                 </td>
               </tr>'
             changesetparent = '
               <tr>
                 <th class="parent">parent {rev}:</th>
                 <td class="parent">{changesetlink}</td>
               </tr>'
             changesetparentdiff = '
               <tr>
                 <th class="parent">parent {rev}:</th>
                 <td class="parent">{changesetlink} {ifeq(node, basenode, '(current diff)', '({difffrom})')}</td>
               </tr>'
             difffrom = '<a href="{url|urlescape}rev/{node|short}:{originalnode|short}{sessionvars%urlparameter}">diff</a>'
             filerevparent = '
               <tr>
                 <td class="metatag">parent:</td>
                 <td>
                   <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
                     {rename%filerename}{node|short}
                   </a>
                 </td>
               </tr>'
             filerename = '{file|escape}@'
             filelogrename = '
               <tr>
                 <th>base:</th>
                 <td>
                   <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
                     {file|escape}@{node|short}
                   </a>
                 </td>
               </tr>'
             fileannotateparent = '
               <tr>
                 <td class="metatag">parent:</td>
                 <td>
                   <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
                     {rename%filerename}{node|short}
                   </a>
                 </td>
               </tr>'
             changesetchild = '
               <tr>
                 <th class="child">child {rev}:</th>
                 <td class="child"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
               </tr>'
             changelogchild = '
               <tr>
                 <th class="child">child {rev}:</th>
                 <td class="child"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
               </tr>'
             filerevchild = '
               <tr>
                 <td class="metatag">child:</td>
                 <td><a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td>
               </tr>'
             fileannotatechild = '
               <tr>
                 <td class="metatag">child:</td>
                 <td><a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td>
               </tr>'
             tags = tags.tmpl
             tagentry = '
               <li class="tagEntry parity{parity}">
                 <tt class="node">{node}</tt>
                 <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{tag|escape}</a>
               </li>'
             branches = branches.tmpl
             branchentry = '
               <li class="tagEntry parity{parity}">
                 <tt class="node">{node}</tt>
                 <a href="{url|urlescape}shortlog/{node|short}{sessionvars%urlparameter}" class="{status}">{branch|escape}</a>
               </li>'
             diffblock = '<pre class="parity{parity}">{lines}</pre>'
             changelogtag = '<tr><th class="tag">tag:</th><td class="tag">{tag|escape}</td></tr>'
             changesettag = '<tr><th class="tag">tag:</th><td class="tag">{tag|escape}</td></tr>'
             successorlink = '<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> '
             obsfatesuccessors = '{if(successors, ' as ')}{successors%successorlink}'
             obsfateverb = '{obsfateverb(successors, markers)}'
             obsfateoperations = '{if(obsfateoperations(markers), ' using {join(obsfateoperations(markers), ', ')}')}'
             obsfateusers = '{if(obsfateusers(markers), ' by {join(obsfateusers(markers)%'{user|obfuscate}', ', ')}')}'
             obsfatedate = '{if(obsfatedate(markers), ' {ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), '<span class="age">{min(obsfatedate(markers))|rfc822date}</span>', 'between <span class="age">{min(obsfatedate(markers))|rfc822date}</span> and <span class="age">{max(obsfatedate(markers))|rfc822date}</span>')}')}'
-            obsfateentry = '{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}'
+            obsfateentry = '
+              <tr>
+                <th class="obsolete">obsolete:</th>
+                <td class="obsolete">{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}</td>
+              </tr>'
             filediffparent = '
               <tr>
                 <th class="parent">parent {rev}:</th>
                 <td class="parent"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
               </tr>'
             filediffchild = '
               <tr>
                 <th class="child">child {rev}:</th>
                 <td class="child"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
               </tr>'
             indexentry = '
               <tr class="parity{parity}">
                 <td><a href="{url|urlescape}{sessionvars%urlparameter}">{name|escape}</a></td>
                 <td>{description}</td>
                 <td>{contact|obfuscate}</td>
                 <td class="age">{lastchange|rfc822date}</td>
                 <td class="indexlinks">
                   <a href="{url|urlescape}rss-log">RSS</a>
                   <a href="{url|urlescape}atom-log">Atom</a>
                   {archives%archiveentry}
                 </td>
               </tr>'
             index = index.tmpl
             archiveentry = '<a href="{url|urlescape}archive/{symrev}{extension|urlescape}">{type|escape}</a> '
             notfound = notfound.tmpl
             error = error.tmpl
             urlparameter = '{separator}{name}={value|urlescape}'
             hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'
             breadcrumb = '&gt; <a href="{url|urlescape}">{name|escape}</a> '

tests/test-obsolete-divergent.t

0 +10 -5

             Test file dedicated to testing the divergent troubles from obsolete changeset.
             This is the most complex troubles from far so we isolate it in a dedicated
             file.
             Enable obsolete
               $ cat >> $HGRCPATH << EOF
               > [ui]
               > logtemplate = {rev}:{node|short} {desc}{if(obsfate, " [{join(obsfate, "; ")}]")}\n
               > [experimental]
               > evolution.createmarkers=True
               > [extensions]
               > drawdag=$TESTDIR/drawdag.py
               > [alias]
               > debugobsolete = debugobsolete -d '0 0'
               > [phases]
               > publish=False
               > EOF
               $ mkcommit() {
               >    echo "$1" > "$1"
               >    hg add "$1"
               >    hg ci -m "$1"
               > }
               $ getid() {
               >    hg log --hidden -r "desc('$1')" -T '{node}\n'
               > }
             setup repo
               $ hg init reference
               $ cd reference
               $ mkcommit base
               $ mkcommit A_0
               $ hg up 0
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ mkcommit A_1
               created new head
               $ hg up 0
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ mkcommit A_2
               created new head
               $ hg up 0
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ cd ..
               $ newcase() {
               >    hg clone -u 0 -q reference $1
               >    cd $1
               > }
             direct divergence
             -----------------
             A_1 have two direct and divergent successors A_1 and A_1
               $ newcase direct
               $ hg debugobsolete `getid A_0` `getid A_1`
               obsoleted 1 changesets
               $ hg debugobsolete `getid A_0` `getid A_2`
 new content-divergent changesets
               $ hg log -G --hidden
               *  3:392fd25390da A_2
               |
               | *  2:82623d38b9ba A_1
               |/
               | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
               |/
               @  0:d20a80d4def3 base
               $ hg debugsuccessorssets --hidden 'all()'
               d20a80d4def3
                   d20a80d4def3
 dc284c1f8
 d38b9ba
 fd25390da
 d38b9ba
 d38b9ba
 fd25390da
 fd25390da
               $ hg log -r 'contentdivergent()'
 :82623d38b9ba A_1
 :392fd25390da A_2
               $ hg debugsuccessorssets 'all()' --closest
               d20a80d4def3
                   d20a80d4def3
 d38b9ba
 d38b9ba
 fd25390da
 fd25390da
               $ hg debugsuccessorssets 'all()' --closest --hidden
               d20a80d4def3
                   d20a80d4def3
 dc284c1f8
 d38b9ba
 fd25390da
 d38b9ba
 d38b9ba
 fd25390da
 fd25390da
             check that mercurial refuse to push
               $ hg init ../other
               $ hg push ../other
               pushing to ../other
               searching for changes
               abort: push includes content-divergent changeset: 392fd25390da!
               [255]
               $ cd ..
             indirect divergence with known changeset
             -------------------------------------------
               $ newcase indirect_known
               $ hg debugobsolete `getid A_0` `getid A_1`
               obsoleted 1 changesets
               $ hg debugobsolete `getid A_0` `getid A_2`
 new content-divergent changesets
               $ mkcommit A_3
               created new head
               $ hg debugobsolete `getid A_2` `getid A_3`
               obsoleted 1 changesets
               $ hg log -G --hidden
               @  4:01f36c5a8fda A_3
               |
               | x  3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda]
               |/
               | *  2:82623d38b9ba A_1
               |/
               | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
               |/
               o  0:d20a80d4def3 base
               $ hg debugsuccessorssets --hidden 'all()'
               d20a80d4def3
                   d20a80d4def3
 dc284c1f8
 d38b9ba
 f36c5a8fda
 d38b9ba
 d38b9ba
 fd25390da
 f36c5a8fda
 f36c5a8fda
 f36c5a8fda
               $ hg log -r 'contentdivergent()'
 :82623d38b9ba A_1
 :01f36c5a8fda A_3
               $ hg debugsuccessorssets 'all()' --closest
               d20a80d4def3
                   d20a80d4def3
 d38b9ba
 d38b9ba
 f36c5a8fda
 f36c5a8fda
               $ hg debugsuccessorssets 'all()' --closest --hidden
               d20a80d4def3
                   d20a80d4def3
 dc284c1f8
 d38b9ba
 fd25390da
 d38b9ba
 d38b9ba
 fd25390da
 fd25390da
 f36c5a8fda
 f36c5a8fda
               $ cd ..
             indirect divergence with known changeset
             -------------------------------------------
               $ newcase indirect_unknown
               $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
               obsoleted 1 changesets
               $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
               $ hg debugobsolete `getid A_0` `getid A_2`
 new content-divergent changesets
               $ hg log -G --hidden
               *  3:392fd25390da A_2
               |
               | *  2:82623d38b9ba A_1
               |/
               | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
               |/
               @  0:d20a80d4def3 base
               $ hg debugsuccessorssets --hidden 'all()'
               d20a80d4def3
                   d20a80d4def3
 dc284c1f8
 d38b9ba
 fd25390da
 d38b9ba
 d38b9ba
 fd25390da
 fd25390da
               $ hg log -r 'contentdivergent()'
 :82623d38b9ba A_1
 :392fd25390da A_2
               $ hg debugsuccessorssets 'all()' --closest
               d20a80d4def3
                   d20a80d4def3
 d38b9ba
 d38b9ba
 fd25390da
 fd25390da
               $ hg debugsuccessorssets 'all()' --closest --hidden
               d20a80d4def3
                   d20a80d4def3
 dc284c1f8
 d38b9ba
 fd25390da
 d38b9ba
 d38b9ba
 fd25390da
 fd25390da
               $ cd ..
             do not take unknown node in account if they are final
             -----------------------------------------------------
               $ newcase final-unknown
               $ hg debugobsolete `getid A_0` `getid A_1`
               obsoleted 1 changesets
               $ hg debugobsolete `getid A_1` `getid A_2`
               obsoleted 1 changesets
               $ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
               $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc
               $ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd
               $ hg debugsuccessorssets --hidden 'desc('A_0')'
 dc284c1f8
 fd25390da
               $ hg debugsuccessorssets 'desc('A_0')' --closest
               $ hg debugsuccessorssets 'desc('A_0')' --closest --hidden
 dc284c1f8
 d38b9ba
               $ cd ..
             divergence that converge again is not divergence anymore
             -----------------------------------------------------
               $ newcase converged_divergence
               $ hg debugobsolete `getid A_0` `getid A_1`
               obsoleted 1 changesets
               $ hg debugobsolete `getid A_0` `getid A_2`
 new content-divergent changesets
               $ mkcommit A_3
               created new head
               $ hg debugobsolete `getid A_1` `getid A_3`
               obsoleted 1 changesets
               $ hg debugobsolete `getid A_2` `getid A_3`
               obsoleted 1 changesets
               $ hg log -G --hidden
               @  4:01f36c5a8fda A_3
               |
               | x  3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda]
               |/
               | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda]
               |/
               | x  1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
               |/
               o  0:d20a80d4def3 base
               $ hg debugsuccessorssets --hidden 'all()'
               d20a80d4def3
                   d20a80d4def3
 dc284c1f8
 f36c5a8fda
 d38b9ba
 f36c5a8fda
 fd25390da
 f36c5a8fda
 f36c5a8fda
 f36c5a8fda
               $ hg log -r 'contentdivergent()'
               $ hg debugsuccessorssets 'all()' --closest
               d20a80d4def3
                   d20a80d4def3
 f36c5a8fda
 f36c5a8fda
               $ hg debugsuccessorssets 'all()' --closest --hidden
               d20a80d4def3
                   d20a80d4def3
 dc284c1f8
 d38b9ba
 fd25390da
 d38b9ba
 d38b9ba
 fd25390da
 fd25390da
 f36c5a8fda
 f36c5a8fda
               $ cd ..
             split is not divergences
             -----------------------------
               $ newcase split
               $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
               obsoleted 1 changesets
               $ hg log -G --hidden
               o  3:392fd25390da A_2
               |
               | o  2:82623d38b9ba A_1
               |/
               | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da]
               |/
               @  0:d20a80d4def3 base
               $ hg debugsuccessorssets --hidden 'all()'
               d20a80d4def3
                   d20a80d4def3
 dc284c1f8
 d38b9ba 392fd25390da
 d38b9ba
 d38b9ba
 fd25390da
 fd25390da
               $ hg log -r 'contentdivergent()'
               $ hg debugsuccessorssets 'all()' --closest
               d20a80d4def3
                   d20a80d4def3
 d38b9ba
 d38b9ba
 fd25390da
 fd25390da
               $ hg debugsuccessorssets 'all()' --closest --hidden
               d20a80d4def3
                   d20a80d4def3
 dc284c1f8
 d38b9ba 392fd25390da
 d38b9ba
 d38b9ba
 fd25390da
 fd25390da
             Even when subsequent rewriting happen
               $ mkcommit A_3
               created new head
               $ hg debugobsolete `getid A_1` `getid A_3`
               obsoleted 1 changesets
               $ hg up 0
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ mkcommit A_4
               created new head
               $ hg debugobsolete `getid A_2` `getid A_4`
               obsoleted 1 changesets
               $ hg up 0
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ mkcommit A_5
               created new head
               $ hg debugobsolete `getid A_4` `getid A_5`
               obsoleted 1 changesets
               $ hg log -G --hidden
               @  6:e442cfc57690 A_5
               |
               | x  5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690]
               |/
               | o  4:01f36c5a8fda A_3
               |/
               | x  3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a]
               |/
               | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda]
               |/
               | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da]
               |/
               o  0:d20a80d4def3 base
               $ hg debugsuccessorssets --hidden 'all()'
               d20a80d4def3
                   d20a80d4def3
 dc284c1f8
 f36c5a8fda e442cfc57690
 d38b9ba
 f36c5a8fda
 fd25390da
                   e442cfc57690
 f36c5a8fda
 f36c5a8fda
 a411f0d7a0a
                   e442cfc57690
               e442cfc57690
                   e442cfc57690
               $ hg debugsuccessorssets 'all()' --closest
               d20a80d4def3
                   d20a80d4def3
 f36c5a8fda
 f36c5a8fda
               e442cfc57690
                   e442cfc57690
               $ hg debugsuccessorssets 'all()' --closest --hidden
               d20a80d4def3
                   d20a80d4def3
 dc284c1f8
 d38b9ba 392fd25390da
 d38b9ba
 d38b9ba
 fd25390da
 fd25390da
 f36c5a8fda
 f36c5a8fda
 a411f0d7a0a
                   e442cfc57690
               e442cfc57690
                   e442cfc57690
               $ hg log -r 'contentdivergent()'
             Check more complex obsolescence graft (with divergence)
               $ mkcommit B_0; hg up 0
 files updated, 0 files merged, 2 files removed, 0 files unresolved
               $ hg debugobsolete `getid B_0` `getid A_2`
               obsoleted 1 changesets
               $ mkcommit A_7; hg up 0
               created new head
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ mkcommit A_8; hg up 0
               created new head
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ hg debugobsolete `getid A_5` `getid A_7` `getid A_8`
               obsoleted 1 changesets
               $ mkcommit A_9; hg up 0
               created new head
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ hg debugobsolete `getid A_5` `getid A_9`
 new content-divergent changesets
               $ hg log -G --hidden
               *  10:bed64f5d2f5a A_9
               |
               | *  9:14608b260df8 A_8
               |/
               | *  8:7ae126973a96 A_7
               |/
               | x  7:3750ebee865d B_0 [rewritten as 3:392fd25390da]
               | |
               | x  6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8]
               |/
               | x  5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690]
               |/
               | *  4:01f36c5a8fda A_3
               |/
               | x  3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a]
               |/
               | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda]
               |/
               | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da]
               |/
               @  0:d20a80d4def3 base
               $ hg debugsuccessorssets --hidden 'all()'
               d20a80d4def3
                   d20a80d4def3
 dc284c1f8
 f36c5a8fda bed64f5d2f5a
 f36c5a8fda 7ae126973a96 14608b260df8
 d38b9ba
 f36c5a8fda
 fd25390da
                   bed64f5d2f5a
 ae126973a96 14608b260df8
 f36c5a8fda
 f36c5a8fda
 a411f0d7a0a
                   bed64f5d2f5a
 ae126973a96 14608b260df8
               e442cfc57690
                   bed64f5d2f5a
 ae126973a96 14608b260df8
 ebee865d
                   bed64f5d2f5a
 ae126973a96 14608b260df8
 ae126973a96
 ae126973a96
 b260df8
 b260df8
               bed64f5d2f5a
                   bed64f5d2f5a
               $ hg debugsuccessorssets 'all()' --closest
               d20a80d4def3
                   d20a80d4def3
 f36c5a8fda
 f36c5a8fda
 ae126973a96
 ae126973a96
 b260df8
 b260df8
               bed64f5d2f5a
                   bed64f5d2f5a
               $ hg debugsuccessorssets 'all()' --closest --hidden
               d20a80d4def3
                   d20a80d4def3
 dc284c1f8
 d38b9ba 392fd25390da
 d38b9ba
 d38b9ba
 fd25390da
 fd25390da
 f36c5a8fda
 f36c5a8fda
 a411f0d7a0a
                   e442cfc57690
               e442cfc57690
                   e442cfc57690
 ebee865d
 fd25390da
 ae126973a96
 ae126973a96
 b260df8
 b260df8
               bed64f5d2f5a
                   bed64f5d2f5a
               $ hg log -r 'contentdivergent()'
 :01f36c5a8fda A_3
 :7ae126973a96 A_7
 :14608b260df8 A_8
 :bed64f5d2f5a A_9
             fix the divergence
               $ mkcommit A_A; hg up 0
               created new head
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ hg debugobsolete `getid A_9` `getid A_A`
               obsoleted 1 changesets
               $ hg debugobsolete `getid A_7` `getid A_A`
               obsoleted 1 changesets
               $ hg debugobsolete `getid A_8` `getid A_A`
               obsoleted 1 changesets
               $ hg log -G --hidden
               o  11:a139f71be9da A_A
               |
               | x  10:bed64f5d2f5a A_9 [rewritten as 11:a139f71be9da]
               |/
               | x  9:14608b260df8 A_8 [rewritten as 11:a139f71be9da]
               |/
               | x  8:7ae126973a96 A_7 [rewritten as 11:a139f71be9da]
               |/
               | x  7:3750ebee865d B_0 [rewritten as 3:392fd25390da]
               | |
               | x  6:e442cfc57690 A_5 [rewritten as 10:bed64f5d2f5a; split as 8:7ae126973a96, 9:14608b260df8]
               |/
               | x  5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690]
               |/
               | o  4:01f36c5a8fda A_3
               |/
               | x  3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a]
               |/
               | x  2:82623d38b9ba A_1 [rewritten as 4:01f36c5a8fda]
               |/
               | x  1:007dc284c1f8 A_0 [split as 2:82623d38b9ba, 3:392fd25390da]
               |/
               @  0:d20a80d4def3 base
               $ hg debugsuccessorssets --hidden 'all()'
               d20a80d4def3
                   d20a80d4def3
 dc284c1f8
 f36c5a8fda a139f71be9da
 d38b9ba
 f36c5a8fda
 fd25390da
                   a139f71be9da
 f36c5a8fda
 f36c5a8fda
 a411f0d7a0a
                   a139f71be9da
               e442cfc57690
                   a139f71be9da
 ebee865d
                   a139f71be9da
 ae126973a96
                   a139f71be9da
 b260df8
                   a139f71be9da
               bed64f5d2f5a
                   a139f71be9da
               a139f71be9da
                   a139f71be9da
               $ hg debugsuccessorssets 'all()' --closest
               d20a80d4def3
                   d20a80d4def3
 f36c5a8fda
 f36c5a8fda
               a139f71be9da
                   a139f71be9da
               $ hg debugsuccessorssets 'all()' --closest --hidden
               d20a80d4def3
                   d20a80d4def3
 dc284c1f8
 d38b9ba 392fd25390da
 d38b9ba
 d38b9ba
 fd25390da
 fd25390da
 f36c5a8fda
 f36c5a8fda
 a411f0d7a0a
                   e442cfc57690
               e442cfc57690
                   e442cfc57690
 ebee865d
 fd25390da
 ae126973a96
                   a139f71be9da
 b260df8
                   a139f71be9da
               bed64f5d2f5a
                   a139f71be9da
               a139f71be9da
                   a139f71be9da
               $ hg log -r 'contentdivergent()'
             #if serve
               $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid --config web.view=all \
               >   -A access.log -E errors.log
               $ cat hg.pid >> $DAEMON_PIDS
             check an obsolete changeset that was rewritten and also split
               $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=paper' | egrep 'rewritten|split'
-               <td>rewritten as <a href="/rev/bed64f5d2f5a?style=paper">bed64f5d2f5a</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>split as <a href="/rev/7ae126973a96?style=paper">7ae126973a96</a> <a href="/rev/14608b260df8?style=paper">14608b260df8</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
+               <td>rewritten as <a href="/rev/bed64f5d2f5a?style=paper">bed64f5d2f5a</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span><br>
+              split as <a href="/rev/7ae126973a96?style=paper">7ae126973a96</a> <a href="/rev/14608b260df8?style=paper">14608b260df8</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
               $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=coal' | egrep 'rewritten|split'
-               <td>rewritten as <a href="/rev/bed64f5d2f5a?style=coal">bed64f5d2f5a</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>split as <a href="/rev/7ae126973a96?style=coal">7ae126973a96</a> <a href="/rev/14608b260df8?style=coal">14608b260df8</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
+               <td>rewritten as <a href="/rev/bed64f5d2f5a?style=coal">bed64f5d2f5a</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span><br>
+              split as <a href="/rev/7ae126973a96?style=coal">7ae126973a96</a> <a href="/rev/14608b260df8?style=coal">14608b260df8</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
               $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=gitweb' | egrep 'rewritten|split'
-              <tr><td>obsolete</td><td>rewritten as <a class="list" href="/rev/bed64f5d2f5a?style=gitweb">bed64f5d2f5a</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>split as <a class="list" href="/rev/7ae126973a96?style=gitweb">7ae126973a96</a> <a class="list" href="/rev/14608b260df8?style=gitweb">14608b260df8</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td></tr>
+              <td>rewritten as <a class="list" href="/rev/bed64f5d2f5a?style=gitweb">bed64f5d2f5a</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
+              <td>split as <a class="list" href="/rev/7ae126973a96?style=gitweb">7ae126973a96</a> <a class="list" href="/rev/14608b260df8?style=gitweb">14608b260df8</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
               $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=monoblue' | egrep 'rewritten|split'
-                      <dt>obsolete</dt><dd>rewritten as <a href="/rev/bed64f5d2f5a?style=monoblue">bed64f5d2f5a</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>split as <a href="/rev/7ae126973a96?style=monoblue">7ae126973a96</a> <a href="/rev/14608b260df8?style=monoblue">14608b260df8</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></dd>
+              <dd>rewritten as <a href="/rev/bed64f5d2f5a?style=monoblue">bed64f5d2f5a</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></dd>
+              <dd>split as <a href="/rev/7ae126973a96?style=monoblue">7ae126973a96</a> <a href="/rev/14608b260df8?style=monoblue">14608b260df8</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></dd>
               $ get-with-headers.py localhost:$HGPORT 'rev/e442cfc57690?style=spartan' | egrep 'rewritten|split'
-               <td class="obsolete">rewritten as <a href="/rev/bed64f5d2f5a?style=spartan">bed64f5d2f5a</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span>split as <a href="/rev/7ae126973a96?style=spartan">7ae126973a96</a> <a href="/rev/14608b260df8?style=spartan">14608b260df8</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
+              <td class="obsolete">rewritten as <a href="/rev/bed64f5d2f5a?style=spartan">bed64f5d2f5a</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
+              <td class="obsolete">split as <a href="/rev/7ae126973a96?style=spartan">7ae126973a96</a> <a href="/rev/14608b260df8?style=spartan">14608b260df8</a>  by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
               $ killdaemons.py
             #endif
               $ cd ..
             Subset does not diverge
             ------------------------------
             Do not report divergent successors-set if it is a subset of another
             successors-set. (report [A,B] not [A] + [A,B])
               $ newcase subset
               $ hg debugobsolete `getid A_0` `getid A_2`
               obsoleted 1 changesets
               $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
               $ hg debugsuccessorssets --hidden 'desc('A_0')'
 dc284c1f8
 d38b9ba 392fd25390da
               $ hg debugsuccessorssets 'desc('A_0')' --closest
               $ hg debugsuccessorssets 'desc('A_0')' --closest --hidden
 dc284c1f8
 d38b9ba 392fd25390da
               $ cd ..
             Use scmutil.cleanupnodes API to create divergence
               $ hg init cleanupnodes
               $ cd cleanupnodes
               $ hg debugdrawdag <<'EOS'
               >   B1  B3 B4
               >   |     \|
               >   A      Z
               > EOS
               $ hg update -q B1
               $ echo 3 >> B
               $ hg commit --amend -m B2
               $ cat > $TESTTMP/scmutilcleanup.py <<EOF
               > from mercurial import registrar, scmutil
               > cmdtable = {}
               > command = registrar.command(cmdtable)
               > @command('cleanup')
               > def cleanup(ui, repo):
               >     def node(expr):
               >         unfi = repo.unfiltered()
               >         rev = unfi.revs(expr).first()
               >         return unfi.changelog.node(rev)
               >     with repo.wlock(), repo.lock(), repo.transaction('delayedstrip'):
               >         mapping = {node('desc(B1)'): [node('desc(B3)')],
               >                    node('desc(B3)'): [node('desc(B4)')]}
               >         scmutil.cleanupnodes(repo, mapping, 'test')
               > EOF
               $ rm .hg/localtags
               $ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
 new content-divergent changesets
               $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)'
               @  5:1a2a9b5b0030 B2 content-divergent
               |
               | *  4:70d5a63ca112 B4 content-divergent
               | |
               | o  1:48b9aae0607f Z
               |
               o  0:426bada5c675 A
               $ hg debugobsolete
               a178212c3433c4e77b573f6011e29affb8aefa33 1a2a9b5b0030632400aa78e00388c20f99d3ec44 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
               a178212c3433c4e77b573f6011e29affb8aefa33 ad6478fb94ecec98b86daae98722865d494ac561 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'test', 'user': 'test'}
               ad6478fb94ecec98b86daae98722865d494ac561 70d5a63ca112acb3764bc1d7320ca90ea688d671 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'test', 'user': 'test'}

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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