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'}

tests/test-obsolete.t

0 +2 -2

               $ cat >> $HGRCPATH << EOF
               > [phases]
               > # public changeset are not obsolete
               > publish=false
               > [ui]
               > logtemplate="{rev}:{node|short} ({phase}{if(obsolete, ' *{obsolete}*')}{if(instabilities, ' {instabilities}')}) [{tags} {bookmarks}] {desc|firstline}{if(obsfate, " [{join(obsfate, "; ")}]")}\n"
               > EOF
               $ mkcommit() {
               >    echo "$1" > "$1"
               >    hg add "$1"
               >    hg ci -m "add $1"
               > }
               $ getid() {
               >    hg log -T "{node}\n" --hidden -r "desc('$1')"
               > }
               $ cat > debugkeys.py <<EOF
               > def reposetup(ui, repo):
               >     class debugkeysrepo(repo.__class__):
               >         def listkeys(self, namespace):
               >             ui.write('listkeys %s\n' % (namespace,))
               >             return super(debugkeysrepo, self).listkeys(namespace)
               >
               >     if repo.local():
               >         repo.__class__ = debugkeysrepo
               > EOF
               $ hg init tmpa
               $ cd tmpa
               $ mkcommit kill_me
             Checking that the feature is properly disabled
               $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
               abort: creating obsolete markers is not enabled on this repo
               [255]
             Enabling it
               $ cat >> $HGRCPATH << EOF
               > [experimental]
               > evolution=exchange
               > evolution.createmarkers=True
               > EOF
             Killing a single changeset without replacement
               $ hg debugobsolete 0
               abort: changeset references must be full hexadecimal node identifiers
               [255]
               $ hg debugobsolete '00'
               abort: changeset references must be full hexadecimal node identifiers
               [255]
               $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
               obsoleted 1 changesets
               $ hg debugobsolete
 b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'}
             (test that mercurial is not confused)
               $ hg up null --quiet # having 0 as parent prevents it to be hidden
               $ hg tip
               -1:000000000000 (public) [tip ]
               $ hg up --hidden tip --quiet
               updating to a hidden changeset 97b7c2d76b18
               (hidden revision '97b7c2d76b18' is pruned)
             Killing a single changeset with itself should fail
             (simple local safeguard)
               $ hg debugobsolete `getid kill_me` `getid kill_me`
               abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0
               [255]
               $ cd ..
             Killing a single changeset with replacement
             (and testing the format option)
               $ hg init tmpb
               $ cd tmpb
               $ mkcommit a
               $ mkcommit b
               $ mkcommit original_c
               $ hg up "desc('b')"
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ mkcommit new_c
               created new head
               $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
               $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c`  `getid new_c` -d '121 120'
               obsoleted 1 changesets
               $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
 :245bde4270cd add original_c
               $ hg debugrevlog -cd
               # rev p1rev p2rev start   end deltastart base   p1   p2 rawsize totalsize compression heads chainlen
 -1    -1     0    59          0    0    0    0      58        58           0     1        0
 0    -1    59   118         59   59    0    0      58       116           0     1        0
 1    -1   118   193        118  118   59    0      76       192           0     1        0
 1    -1   193   260        193  193   59    0      66       258           0     2        0
               $ hg debugobsolete
 bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
             (check for version number of the obsstore)
               $ dd bs=1 count=1 if=.hg/store/obsstore 2>/dev/null
               \x00 (no-eol) (esc)
             do it again (it read the obsstore before adding new changeset)
               $ hg up '.^'
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ mkcommit new_2_c
               created new head
               $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`
               obsoleted 1 changesets
               $ hg debugobsolete
 bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
               cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
             Register two markers with a missing node
               $ hg up '.^'
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ mkcommit new_3_c
               created new head
               $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337
               obsoleted 1 changesets
               $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`
               $ hg debugobsolete
 bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
               cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
               ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
             Test the --index option of debugobsolete command
               $ hg debugobsolete --index
 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
             Refuse pathological nullid successors
               $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000
               transaction abort!
               rollback completed
               abort: bad obsolescence marker detected: invalid successors nullid
               [255]
             Check that graphlog detect that a changeset is obsolete:
               $ hg log -G
               @  5:5601fb93a350 (draft) [tip ] add new_3_c
               |
               o  1:7c3bad9141dc (draft) [ ] add b
               |
               o  0:1f0dee641bb7 (draft) [ ] add a
             check that heads does not report them
               $ hg heads
 :5601fb93a350 (draft) [tip ] add new_3_c
               $ hg heads --hidden
 :5601fb93a350 (draft) [tip ] add new_3_c
 :ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350]
 :cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9]
 :245bde4270cd (draft *obsolete*) [ ] add original_c [rewritten as 3:cdbce2fbb163]
             check that summary does not report them
               $ hg init ../sink
               $ echo '[paths]' >> .hg/hgrc
               $ echo 'default=../sink' >> .hg/hgrc
               $ hg summary --remote
               parent: 5:5601fb93a350 tip
                add new_3_c
               branch: default
               commit: (clean)
               update: (current)
               phases: 3 draft
               remote: 3 outgoing
               $ hg summary --remote --hidden
               parent: 5:5601fb93a350 tip
                add new_3_c
               branch: default
               commit: (clean)
               update: 3 new changesets, 4 branch heads (merge)
               phases: 6 draft
               remote: 3 outgoing
             check that various commands work well with filtering
               $ hg tip
 :5601fb93a350 (draft) [tip ] add new_3_c
               $ hg log -r 6
               abort: unknown revision '6'!
               [255]
               $ hg log -r 4
               abort: hidden revision '4' was rewritten as: 5601fb93a350!
               (use --hidden to access hidden revisions)
               [255]
               $ hg debugrevspec 'rev(6)'
               $ hg debugrevspec 'rev(4)'
               $ hg debugrevspec 'null'
               -1
             Check that public changeset are not accounted as obsolete:
               $ hg --hidden phase --public 2
 new phase-divergent changesets
               $ hg log -G
               @  5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c
               |
               | o  2:245bde4270cd (public) [ ] add original_c
               |/
               o  1:7c3bad9141dc (public) [ ] add b
               |
               o  0:1f0dee641bb7 (public) [ ] add a
             And that bumped changeset are detected
             --------------------------------------
             If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also
             note that the bumped changeset (5:5601fb93a350) is not a direct successor of
             the public changeset
               $ hg log --hidden -r 'phasedivergent()'
 :5601fb93a350 (draft phase-divergent) [tip ] add new_3_c
             And that we can't push bumped changeset
               $ hg push ../tmpa -r 0 --force #(make repo related)
               pushing to ../tmpa
               searching for changes
               warning: repository is unrelated
               adding changesets
               adding manifests
               adding file changes
               added 1 changesets with 1 changes to 1 files (+1 heads)
               $ hg push ../tmpa
               pushing to ../tmpa
               searching for changes
               abort: push includes phase-divergent changeset: 5601fb93a350!
               [255]
             Fixing "bumped" situation
             We need to create a clone of 5 and add a special marker with a flag
               $ hg summary
               parent: 5:5601fb93a350 tip (phase-divergent)
                add new_3_c
               branch: default
               commit: (clean)
               update: 1 new changesets, 2 branch heads (merge)
               phases: 1 draft
               phase-divergent: 1 changesets
               $ hg up '5^'
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ hg revert -ar 5
               adding new_3_c
               $ hg ci -m 'add n3w_3_c'
               created new head
               $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c`
               obsoleted 1 changesets
               $ hg log -r 'phasedivergent()'
               $ hg log -G
               @  6:6f9641995072 (draft) [tip ] add n3w_3_c
               |
               | o  2:245bde4270cd (public) [ ] add original_c
               |/
               o  1:7c3bad9141dc (public) [ ] add b
               |
               o  0:1f0dee641bb7 (public) [ ] add a
             Basic exclusive testing
               $ hg log -G --hidden
               @  6:6f9641995072 (draft) [tip ] add n3w_3_c
               |
               | x  5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072]
               |/
               | x  4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350]
               |/
               | x  3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9]
               |/
               | o  2:245bde4270cd (public) [ ] add original_c
               |/
               o  1:7c3bad9141dc (public) [ ] add b
               |
               o  0:1f0dee641bb7 (public) [ ] add a
               $ hg debugobsolete --rev 6f9641995072
               1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
 bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
 fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
               $ hg debugobsolete --rev 6f9641995072 --exclusive
 fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               $ hg debugobsolete --rev 5601fb93a350 --hidden
               1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
 bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
               ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
               $ hg debugobsolete --rev 5601fb93a350 --hidden --exclusive
               $ hg debugobsolete --rev 5601fb93a350+6f9641995072 --hidden --exclusive
               1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
 fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               $ cd ..
             Revision 0 is hidden
             --------------------
               $ hg init rev0hidden
               $ cd rev0hidden
               $ mkcommit kill0
               $ hg up -q null
               $ hg debugobsolete `getid kill0`
               obsoleted 1 changesets
               $ mkcommit a
               $ mkcommit b
             Should pick the first visible revision as "repo" node
               $ hg archive ../archive-null
               $ cat ../archive-null/.hg_archival.txt
               repo: 1f0dee641bb7258c56bd60e93edfa2405381c41e
               node: 7c3bad9141dcb46ff89abf5f61856facd56e476c
               branch: default
               latesttag: null
               latesttagdistance: 2
               changessincelatesttag: 2
               $ cd ..
             Can disable transaction summary report
               $ hg init transaction-summary
               $ cd transaction-summary
               $ mkcommit a
               $ mkcommit b
               $ hg up -q null
               $ hg --config experimental.evolution.report-instabilities=false debugobsolete `getid a`
               obsoleted 1 changesets
               $ cd ..
             Exchange Test
             ============================
             Destination repo does not have any data
             ---------------------------------------
             Simple incoming test
               $ hg init tmpc
               $ cd tmpc
               $ hg incoming ../tmpb
               comparing with ../tmpb
 :1f0dee641bb7 (public) [ ] add a
 :7c3bad9141dc (public) [ ] add b
 :245bde4270cd (public) [ ] add original_c
 :6f9641995072 (draft) [tip ] add n3w_3_c
             Try to pull markers
             (extinct changeset are excluded but marker are pushed)
               $ hg pull ../tmpb
               pulling from ../tmpb
               requesting all changes
               adding changesets
               adding manifests
               adding file changes
               added 4 changesets with 4 changes to 4 files (+1 heads)
 new obsolescence markers
               new changesets 1f0dee641bb7:6f9641995072
               (run 'hg heads' to see heads, 'hg merge' to merge)
               $ hg debugobsolete
               1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
 bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
 fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
             Rollback//Transaction support
               $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
               $ hg debugobsolete
               1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
 bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
 fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
               aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'}
               $ hg rollback -n
               repository tip rolled back to revision 3 (undo debugobsolete)
               $ hg rollback
               repository tip rolled back to revision 3 (undo debugobsolete)
               $ hg debugobsolete
               1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
 bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
 fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
               $ cd ..
             Try to push markers
               $ hg init tmpd
               $ hg -R tmpb push tmpd
               pushing to tmpd
               searching for changes
               adding changesets
               adding manifests
               adding file changes
               added 4 changesets with 4 changes to 4 files (+1 heads)
 new obsolescence markers
               $ hg -R tmpd debugobsolete | sort
               1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
 bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
 fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
             Check obsolete keys are exchanged only if source has an obsolete store
               $ hg init empty
               $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd
               pushing to tmpd
               listkeys phases
               listkeys bookmarks
               no changes found
               listkeys phases
               [1]
             clone support
             (markers are copied and extinct changesets are included to allow hardlinks)
               $ hg clone tmpb clone-dest
               updating to branch default
 files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg -R clone-dest log -G --hidden
               @  6:6f9641995072 (draft) [tip ] add n3w_3_c
               |
               | x  5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072]
               |/
               | x  4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350]
               |/
               | x  3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9]
               |/
               | o  2:245bde4270cd (public) [ ] add original_c
               |/
               o  1:7c3bad9141dc (public) [ ] add b
               |
               o  0:1f0dee641bb7 (public) [ ] add a
               $ hg -R clone-dest debugobsolete
 bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
               cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
               ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
 fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
             Destination repo have existing data
             ---------------------------------------
             On pull
               $ hg init tmpe
               $ cd tmpe
               $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00
               $ hg pull ../tmpb
               pulling from ../tmpb
               requesting all changes
               adding changesets
               adding manifests
               adding file changes
               added 4 changesets with 4 changes to 4 files (+1 heads)
 new obsolescence markers
               new changesets 1f0dee641bb7:6f9641995072
               (run 'hg heads' to see heads, 'hg merge' to merge)
               $ hg debugobsolete
               1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
               1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
 bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
 fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
             On push
               $ hg push ../tmpc
               pushing to ../tmpc
               searching for changes
               no changes found
 new obsolescence markers
               [1]
               $ hg -R ../tmpc debugobsolete
               1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
 bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
 fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
               1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
             detect outgoing obsolete and unstable
             ---------------------------------------
               $ hg log -G
               o  3:6f9641995072 (draft) [tip ] add n3w_3_c
               |
               | o  2:245bde4270cd (public) [ ] add original_c
               |/
               o  1:7c3bad9141dc (public) [ ] add b
               |
               o  0:1f0dee641bb7 (public) [ ] add a
               $ hg up 'desc("n3w_3_c")'
 files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ mkcommit original_d
               $ mkcommit original_e
               $ hg debugobsolete --record-parents `getid original_d` -d '0 0'
               obsoleted 1 changesets
 new orphan changesets
               $ hg debugobsolete | grep `getid original_d`
 b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
               $ hg log -r 'obsolete()'
 :94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
               $ hg summary
               parent: 5:cda648ca50f5 tip (orphan)
                add original_e
               branch: default
               commit: (clean)
               update: 1 new changesets, 2 branch heads (merge)
               phases: 3 draft
               orphan: 1 changesets
               $ hg log -G -r '::orphan()'
               @  5:cda648ca50f5 (draft orphan) [tip ] add original_e
               |
               x  4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
               |
               o  3:6f9641995072 (draft) [ ] add n3w_3_c
               |
               o  1:7c3bad9141dc (public) [ ] add b
               |
               o  0:1f0dee641bb7 (public) [ ] add a
             refuse to push obsolete changeset
               $ hg push ../tmpc/ -r 'desc("original_d")'
               pushing to ../tmpc/
               searching for changes
               abort: push includes obsolete changeset: 94b33453f93b!
               [255]
             refuse to push unstable changeset
               $ hg push ../tmpc/
               pushing to ../tmpc/
               searching for changes
               abort: push includes orphan changeset: cda648ca50f5!
               [255]
             Test that extinct changeset are properly detected
               $ hg log -r 'extinct()'
             Don't try to push extinct changeset
               $ hg init ../tmpf
               $ hg out  ../tmpf
               comparing with ../tmpf
               searching for changes
 :1f0dee641bb7 (public) [ ] add a
 :7c3bad9141dc (public) [ ] add b
 :245bde4270cd (public) [ ] add original_c
 :6f9641995072 (draft) [ ] add n3w_3_c
 :94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
 :cda648ca50f5 (draft orphan) [tip ] add original_e
               $ hg push ../tmpf -f # -f because be push unstable too
               pushing to ../tmpf
               searching for changes
               adding changesets
               adding manifests
               adding file changes
               added 6 changesets with 6 changes to 6 files (+1 heads)
 new obsolescence markers
 new orphan changesets
             no warning displayed
               $ hg push ../tmpf
               pushing to ../tmpf
               searching for changes
               no changes found
               [1]
             Do not warn about new head when the new head is a successors of a remote one
               $ hg log -G
               @  5:cda648ca50f5 (draft orphan) [tip ] add original_e
               |
               x  4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
               |
               o  3:6f9641995072 (draft) [ ] add n3w_3_c
               |
               | o  2:245bde4270cd (public) [ ] add original_c
               |/
               o  1:7c3bad9141dc (public) [ ] add b
               |
               o  0:1f0dee641bb7 (public) [ ] add a
               $ hg up -q 'desc(n3w_3_c)'
               $ mkcommit obsolete_e
               created new head
               $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \
               > -u 'test <test@example.net>'
               obsoleted 1 changesets
               $ hg outgoing ../tmpf # parasite hg outgoing testin
               comparing with ../tmpf
               searching for changes
 :3de5eca88c00 (draft) [tip ] add obsolete_e
               $ hg push ../tmpf
               pushing to ../tmpf
               searching for changes
               adding changesets
               adding manifests
               adding file changes
               added 1 changesets with 1 changes to 1 files (+1 heads)
 new obsolescence markers
               obsoleted 1 changesets
             test relevance computation
             ---------------------------------------
             Checking simple case of "marker relevance".
             Reminder of the repo situation
               $ hg log --hidden --graph
               @  6:3de5eca88c00 (draft) [tip ] add obsolete_e
               |
               | x  5:cda648ca50f5 (draft *obsolete*) [ ] add original_e [rewritten as 6:3de5eca88c00 by test <test@example.net>]
               | |
               | x  4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
               |/
               o  3:6f9641995072 (draft) [ ] add n3w_3_c
               |
               | o  2:245bde4270cd (public) [ ] add original_c
               |/
               o  1:7c3bad9141dc (public) [ ] add b
               |
               o  0:1f0dee641bb7 (public) [ ] add a
             List of all markers
               $ hg debugobsolete
               1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
               1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
 bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
 fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
 b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
               cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob)
             List of changesets with no chain
               $ hg debugobsolete --hidden --rev ::2
             List of changesets that are included on marker chain
               $ hg debugobsolete --hidden --rev 6
               cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob)
             List of changesets with a longer chain, (including a pruned children)
               $ hg debugobsolete --hidden --rev 3
               1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
               1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
 bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
 fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
 b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
               ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
             List of both
               $ hg debugobsolete --hidden --rev 3::6
               1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
               1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
 bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
 fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
 b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
               ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
               cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob)
               cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
             List of all markers in JSON
               $ hg debugobsolete -Tjson
               [
                {
                 "date": [1339.0, 0],
                 "flag": 0,
                 "metadata": {"user": "test"},
                 "prednode": "1339133913391339133913391339133913391339",
                 "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"]
                },
                {
                 "date": [1339.0, 0],
                 "flag": 0,
                 "metadata": {"user": "test"},
                 "prednode": "1337133713371337133713371337133713371337",
                 "succnodes": ["5601fb93a350734d935195fee37f4054c529ff39"]
                },
                {
                 "date": [121.0, 120],
                 "flag": 12,
                 "metadata": {"user": "test"},
                 "prednode": "245bde4270cd1072a27757984f9cda8ba26f08ca",
                 "succnodes": ["cdbce2fbb16313928851e97e0d85413f3f7eb77f"]
                },
                {
                 "date": [1338.0, 0],
                 "flag": 1,
                 "metadata": {"user": "test"},
                 "prednode": "5601fb93a350734d935195fee37f4054c529ff39",
                 "succnodes": ["6f96419950729f3671185b847352890f074f7557"]
                },
                {
                 "date": [1338.0, 0],
                 "flag": 0,
                 "metadata": {"user": "test"},
                 "prednode": "ca819180edb99ed25ceafb3e9584ac287e240b00",
                 "succnodes": ["1337133713371337133713371337133713371337"]
                },
                {
                 "date": [1337.0, 0],
                 "flag": 0,
                 "metadata": {"user": "test"},
                 "prednode": "cdbce2fbb16313928851e97e0d85413f3f7eb77f",
                 "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"]
                },
                {
                 "date": [0.0, 0],
                 "flag": 0,
                 "metadata": {"user": "test"},
                 "parentnodes": ["6f96419950729f3671185b847352890f074f7557"],
                 "prednode": "94b33453f93bdb8d457ef9b770851a618bf413e1",
                 "succnodes": []
                },
                {
                 "date": *, (glob)
                 "flag": 0,
                 "metadata": {"user": "test <test@example.net>"},
                 "prednode": "cda648ca50f50482b7055c0b0c4c117bba6733d9",
                 "succnodes": ["3de5eca88c00aa039da7399a220f4a5221faa585"]
                }
               ]
             Template keywords
               $ hg debugobsolete -r6 -T '{succnodes % "{node|short}"} {date|shortdate}\n'
 de5eca88c00 ????-??-?? (glob)
               $ hg debugobsolete -r6 -T '{join(metadata % "{key}={value}", " ")}\n'
               user=test <test@example.net>
               $ hg debugobsolete -r6 -T '{metadata}\n{metadata}\n'
               'user': 'test <test@example.net>'
               'user': 'test <test@example.net>'
               $ hg debugobsolete -r6 -T '{succnodes}\n{succnodes}\n'
 de5eca88c00aa039da7399a220f4a5221faa585
 de5eca88c00aa039da7399a220f4a5221faa585
               $ hg debugobsolete -r6 -T '{flag} {get(metadata, "user")}\n'
 test <test@example.net>
             Test the debug output for exchange
             ----------------------------------
               $ hg pull ../tmpb --config 'experimental.obsmarkers-exchange-debug=True' # bundle2
               pulling from ../tmpb
               searching for changes
               no changes found
               obsmarker-exchange: 346 bytes received
             check hgweb does not explode
             ====================================
               $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg
               adding changesets
               adding manifests
               adding file changes
               added 62 changesets with 63 changes to 9 files (+60 heads)
               new changesets 50c51b361e60:c15e9edfca13
               (run 'hg heads .' to see heads, 'hg merge' to merge)
               $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`;
               > do
               >    hg debugobsolete $node
               > done
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               obsoleted 1 changesets
               $ hg up tip
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             #if serve
               $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
               $ cat hg.pid >> $DAEMON_PIDS
             check changelog view
               $ get-with-headers.py --headeronly localhost:$HGPORT 'shortlog/'
 Script output follows
             check graph view
               $ get-with-headers.py --headeronly localhost:$HGPORT 'graph'
 Script output follows
             check filelog view
               $ get-with-headers.py --headeronly localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar'
 Script output follows
               $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/68'
 Script output follows
               $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67'
 Not Found
               [1]
             check that web.view config option:
               $ killdaemons.py hg.pid
               $ cat >> .hg/hgrc << EOF
               > [web]
               > view=all
               > EOF
               $ wait
               $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
               $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67'
 Script output follows
               $ killdaemons.py hg.pid
             Checking _enable=False warning if obsolete marker exists
               $ echo '[experimental]' >> $HGRCPATH
               $ echo "evolution=" >> $HGRCPATH
               $ hg log -r tip
 :c15e9edfca13 (draft) [tip ] add celestine
             reenable for later test
               $ echo '[experimental]' >> $HGRCPATH
               $ echo "evolution.exchange=True" >> $HGRCPATH
               $ echo "evolution.createmarkers=True" >> $HGRCPATH
               $ rm hg.pid access.log errors.log
             #endif
             Several troubles on the same changeset (create an unstable and bumped changeset)
               $ hg debugobsolete `getid obsolete_e`
               obsoleted 1 changesets
 new orphan changesets
               $ hg debugobsolete `getid original_c` `getid babar`
 new phase-divergent changesets
               $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()'
               changeset:   7:50c51b361e60
               user:        test
               date:        Thu Jan 01 00:00:00 1970 +0000
               instability: orphan, phase-divergent
               summary:     add babar
             test the "obsolete" templatekw
               $ hg log -r 'obsolete()'
 :3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e [pruned]
             test the "troubles" templatekw
               $ hg log -r 'phasedivergent() and orphan()'
 :50c51b361e60 (draft orphan phase-divergent) [ ] add babar
             test the default cmdline template
               $ hg log -T default -r 'phasedivergent()'
               changeset:   7:50c51b361e60
               user:        test
               date:        Thu Jan 01 00:00:00 1970 +0000
               instability: orphan, phase-divergent
               summary:     add babar
               $ hg log -T default -r 'obsolete()'
               changeset:   6:3de5eca88c00
               parent:      3:6f9641995072
               user:        test
               date:        Thu Jan 01 00:00:00 1970 +0000
               obsolete:    pruned
               summary:     add obsolete_e
             test the obsolete labels
               $ hg log --config ui.logtemplate= --color=debug -r 'phasedivergent()'
               [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset:   7:50c51b361e60]
               [log.user|user:        test]
               [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
               [log.instability|instability: orphan, phase-divergent]
               [log.summary|summary:     add babar]
               $ hg log -T default -r 'phasedivergent()' --color=debug
               [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset:   7:50c51b361e60]
               [log.user|user:        test]
               [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
               [log.instability|instability: orphan, phase-divergent]
               [log.summary|summary:     add babar]
               $ hg log --config ui.logtemplate= --color=debug -r "obsolete()"
               [log.changeset changeset.draft changeset.obsolete|changeset:   6:3de5eca88c00]
               [log.parent changeset.draft|parent:      3:6f9641995072]
               [log.user|user:        test]
               [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
               [log.obsfate|obsolete:    pruned]
               [log.summary|summary:     add obsolete_e]
               $ hg log -T default -r 'obsolete()' --color=debug
               [log.changeset changeset.draft changeset.obsolete|changeset:   6:3de5eca88c00]
               [log.parent changeset.draft|parent:      3:6f9641995072]
               [log.user|user:        test]
               [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
               [log.obsfate|obsolete:    pruned]
               [log.summary|summary:     add obsolete_e]
             test summary output
               $ hg up -r 'phasedivergent() and orphan()'
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ hg summary
               parent: 7:50c51b361e60  (orphan, phase-divergent)
                add babar
               branch: default
               commit: (clean)
               update: 2 new changesets (update)
               phases: 4 draft
               orphan: 2 changesets
               phase-divergent: 1 changesets
               $ hg up -r 'obsolete()'
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ hg summary
               parent: 6:3de5eca88c00  (obsolete)
                add obsolete_e
               branch: default
               commit: (clean)
               update: 3 new changesets (update)
               phases: 4 draft
               orphan: 2 changesets
               phase-divergent: 1 changesets
             #if serve
               $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
               $ cat hg.pid >> $DAEMON_PIDS
             check obsolete changeset
               $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=paper' | grep '<span class="obsolete">'
                  <span class="phase">draft</span> <span class="obsolete">obsolete</span>
               $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=coal' | grep '<span class="obsolete">'
                  <span class="phase">draft</span> <span class="obsolete">obsolete</span>
               $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=gitweb' | grep '<span class="logtags">'
                 <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span>
               $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=monoblue' | grep '<span class="logtags">'
                       <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span>
               $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=spartan' | grep 'class="obsolete"'
-                <th class="obsolete">obsolete:</th>
+              <th class="obsolete">obsolete:</th>
-                <td class="obsolete">pruned by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
+              <td class="obsolete">pruned by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
             check changeset with instabilities
               $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=paper' | grep '<span class="instability">'
                  <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span>
               $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=coal' | grep '<span class="instability">'
                  <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span>
               $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=gitweb' | grep '<span class="logtags">'
                 <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> </span>
               $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=monoblue' | grep '<span class="logtags">'
                       <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> </span>
               $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=spartan' | grep 'class="instabilities"'
                 <th class="instabilities">instabilities:</th>
                 <td class="instabilities">orphan phase-divergent </td>
               $ killdaemons.py
               $ rm hg.pid access.log errors.log
             #endif
             Test incoming/outcoming with changesets obsoleted remotely, known locally
             ===============================================================================
             This test issue 3805
               $ hg init repo-issue3805
               $ cd repo-issue3805
               $ echo "base" > base
               $ hg ci -Am "base"
               adding base
               $ echo "foo" > foo
               $ hg ci -Am "A"
               adding foo
               $ hg clone . ../other-issue3805
               updating to branch default
 files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ echo "bar" >> foo
               $ hg ci --amend
               $ cd ../other-issue3805
               $ hg log -G
               @  1:29f0c6921ddd (draft) [tip ] A
               |
               o  0:d20a80d4def3 (draft) [ ] base
               $ hg log -G -R ../repo-issue3805
               @  2:323a9c3ddd91 (draft) [tip ] A
               |
               o  0:d20a80d4def3 (draft) [ ] base
               $ hg incoming
               comparing with $TESTTMP/tmpe/repo-issue3805
               searching for changes
 :323a9c3ddd91 (draft) [tip ] A
               $ hg incoming --bundle ../issue3805.hg
               comparing with $TESTTMP/tmpe/repo-issue3805
               searching for changes
 :323a9c3ddd91 (draft) [tip ] A
               $ hg outgoing
               comparing with $TESTTMP/tmpe/repo-issue3805
               searching for changes
 :29f0c6921ddd (draft) [tip ] A
             #if serve
               $ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
               $ cat hg.pid >> $DAEMON_PIDS
               $ hg incoming http://localhost:$HGPORT
               comparing with http://localhost:$HGPORT/
               searching for changes
 :323a9c3ddd91 (draft) [tip ] A
               $ hg outgoing http://localhost:$HGPORT
               comparing with http://localhost:$HGPORT/
               searching for changes
 :29f0c6921ddd (draft) [tip ] A
               $ killdaemons.py
             #endif
             This test issue 3814
             (nothing to push but locally hidden changeset)
               $ cd ..
               $ hg init repo-issue3814
               $ cd repo-issue3805
               $ hg push -r 323a9c3ddd91 ../repo-issue3814
               pushing to ../repo-issue3814
               searching for changes
               adding changesets
               adding manifests
               adding file changes
               added 2 changesets with 2 changes to 2 files
 new obsolescence markers
               $ hg out ../repo-issue3814
               comparing with ../repo-issue3814
               searching for changes
               no changes found
               [1]
             Test that a local tag blocks a changeset from being hidden
               $ hg tag -l visible -r 1 --hidden
               $ hg log -G
               @  2:323a9c3ddd91 (draft) [tip ] A
               |
               | x  1:29f0c6921ddd (draft *obsolete*) [visible ] A [rewritten using amend as 2:323a9c3ddd91]
               |/
               o  0:d20a80d4def3 (draft) [ ] base
             Test that removing a local tag does not cause some commands to fail
               $ hg tag -l -r tip tiptag
               $ hg tags
               tiptag                             2:323a9c3ddd91
               tip                                2:323a9c3ddd91
               visible                            1:29f0c6921ddd
               $ hg --config extensions.strip= strip -r tip --no-backup
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ hg tags
               visible                            1:29f0c6921ddd
               tip                                1:29f0c6921ddd
             Test bundle overlay onto hidden revision
               $ cd ..
               $ hg init repo-bundleoverlay
               $ cd repo-bundleoverlay
               $ echo "A" > foo
               $ hg ci -Am "A"
               adding foo
               $ echo "B" >> foo
               $ hg ci -m "B"
               $ hg up 0
 files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ echo "C" >> foo
               $ hg ci -m "C"
               created new head
               $ hg log -G
               @  2:c186d7714947 (draft) [tip ] C
               |
               | o  1:44526ebb0f98 (draft) [ ] B
               |/
               o  0:4b34ecfb0d56 (draft) [ ] A
               $ hg clone -r1 . ../other-bundleoverlay
               adding changesets
               adding manifests
               adding file changes
               added 2 changesets with 2 changes to 1 files
               new changesets 4b34ecfb0d56:44526ebb0f98
               updating to branch default
 files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ cd ../other-bundleoverlay
               $ echo "B+" >> foo
               $ hg ci --amend -m "B+"
               $ hg log -G --hidden
               @  2:b7d587542d40 (draft) [tip ] B+
               |
               | x  1:44526ebb0f98 (draft *obsolete*) [ ] B [rewritten using amend as 2:b7d587542d40]
               |/
               o  0:4b34ecfb0d56 (draft) [ ] A
               $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg
               comparing with ../repo-bundleoverlay
               searching for changes
 :44526ebb0f98 (draft) [ ] B
 :c186d7714947 (draft) [tip ] C
               $ hg log -G -R ../bundleoverlay.hg
               o  3:c186d7714947 (draft) [tip ] C
               |
               | @  2:b7d587542d40 (draft) [ ] B+
               |/
               o  0:4b34ecfb0d56 (draft) [ ] A
             #if serve
             Test issue 4506
               $ cd ..
               $ hg init repo-issue4506
               $ cd repo-issue4506
               $ echo "0" > foo
               $ hg add foo
               $ hg ci -m "content-0"
               $ hg up null
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ echo "1" > bar
               $ hg add bar
               $ hg ci -m "content-1"
               created new head
               $ hg up 0
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ hg graft 1
               grafting 1:1c9eddb02162 "content-1" (tip)
               $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'`
               obsoleted 1 changesets
               $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
               $ cat hg.pid >> $DAEMON_PIDS
               $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/1'
 Not Found
               [1]
               $ get-with-headers.py --headeronly localhost:$HGPORT 'file/tip/bar'
 Script output follows
               $ get-with-headers.py --headeronly localhost:$HGPORT 'annotate/tip/bar'
 Script output follows
               $ killdaemons.py
             #endif
             Test heads computation on pending index changes with obsolescence markers
               $ cd ..
               $ cat >$TESTTMP/test_extension.py  << EOF
               > from __future__ import absolute_import
               > from mercurial.i18n import _
               > from mercurial import cmdutil, registrar
               >
               > cmdtable = {}
               > command = registrar.command(cmdtable)
               > @command(b"amendtransient",[], _('hg amendtransient [rev]'))
               > def amend(ui, repo, *pats, **opts):
               >   opts['message'] = 'Test'
               >   opts['logfile'] = None
               >   cmdutil.amend(ui, repo, repo['.'], {}, pats, opts)
               >   ui.write('%s\n' % repo.changelog.headrevs())
               > EOF
               $ cat >> $HGRCPATH << EOF
               > [extensions]
               > testextension=$TESTTMP/test_extension.py
               > EOF
               $ hg init repo-issue-nativerevs-pending-changes
               $ cd repo-issue-nativerevs-pending-changes
               $ mkcommit a
               $ mkcommit b
               $ hg up ".^"
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               $ echo aa > a
               $ hg amendtransient
 new orphan changesets
               [1, 2]
             Test cache consistency for the visible filter
 ) We want to make sure that the cached filtered revs are invalidated when
             bookmarks change
               $ cd ..
               $ cat >$TESTTMP/test_extension.py  << EOF
               > from __future__ import absolute_import, print_function
               > import weakref
               > from mercurial import (
               >   bookmarks,
               >   cmdutil,
               >   extensions,
               >   repoview,
               > )
               > def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs):
               >  reporef = weakref.ref(bkmstoreinst._repo)
               >  def trhook(tr):
               >   repo = reporef()
               >   hidden1 = repoview.computehidden(repo)
               >   hidden = repoview.filterrevs(repo, 'visible')
               >   if sorted(hidden1) != sorted(hidden):
               >     print("cache inconsistency")
               >  bkmstoreinst._repo.currenttransaction().addpostclose('test_extension', trhook)
               >  orig(bkmstoreinst, *args, **kwargs)
               > def extsetup(ui):
               >   extensions.wrapfunction(bookmarks.bmstore, '_recordchange',
               >                           _bookmarkchanged)
               > EOF
               $ hg init repo-cache-inconsistency
               $ cd repo-issue-nativerevs-pending-changes
               $ mkcommit a
               a already tracked!
               $ mkcommit b
               $ hg id
 bedc178fce tip
               $ echo "hello" > b
               $ hg commit --amend -m "message"
               $ hg book bookb -r 13bedc178fce --hidden
               bookmarking hidden changeset 13bedc178fce
               (hidden revision '13bedc178fce' was rewritten as: a9b1f8652753)
               $ hg log -r 13bedc178fce
 :13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753]
               $ hg book -d bookb
               $ hg log -r 13bedc178fce
               abort: hidden revision '13bedc178fce' was rewritten as: a9b1f8652753!
               (use --hidden to access hidden revisions)
               [255]
             Empty out the test extension, as it isn't compatible with later parts
             of the test.
               $ echo > $TESTTMP/test_extension.py
             Test ability to pull changeset with locally applying obsolescence markers
             (issue4945)
               $ cd ..
               $ hg init issue4845
               $ cd issue4845
               $ echo foo > f0
               $ hg add f0
               $ hg ci -m '0'
               $ echo foo > f1
               $ hg add f1
               $ hg ci -m '1'
               $ echo foo > f2
               $ hg add f2
               $ hg ci -m '2'
               $ echo bar > f2
               $ hg commit --amend --config experimental.evolution.createmarkers=True
               $ hg log -G
               @  3:b0551702f918 (draft) [tip ] 2
               |
               o  1:e016b03fd86f (draft) [ ] 1
               |
               o  0:a78f55e5508c (draft) [ ] 0
               $ hg log -G --hidden
               @  3:b0551702f918 (draft) [tip ] 2
               |
               | x  2:e008cf283490 (draft *obsolete*) [ ] 2 [rewritten using amend as 3:b0551702f918]
               |/
               o  1:e016b03fd86f (draft) [ ] 1
               |
               o  0:a78f55e5508c (draft) [ ] 0
               $ hg strip --hidden -r 2 --config extensions.strip= --config devel.strip-obsmarkers=no
               saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-ede36964-backup.hg
               $ hg debugobsolete
               e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
               $ hg log -G
               @  2:b0551702f918 (draft) [tip ] 2
               |
               o  1:e016b03fd86f (draft) [ ] 1
               |
               o  0:a78f55e5508c (draft) [ ] 0
               $ hg log -G --hidden
               @  2:b0551702f918 (draft) [tip ] 2
               |
               o  1:e016b03fd86f (draft) [ ] 1
               |
               o  0:a78f55e5508c (draft) [ ] 0
               $ hg debugbundle .hg/strip-backup/e008cf283490-*-backup.hg
               Stream params: {Compression: BZ}
               changegroup -- {nbchanges: 1, version: 02}
                   e008cf2834908e5d6b0f792a9d4b0e2272260fb8
               phase-heads -- {}
                   e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft
               $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg
               pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg
               searching for changes
               no changes found
               $ hg debugobsolete
               e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
               $ hg log -G
               @  2:b0551702f918 (draft) [tip ] 2
               |
               o  1:e016b03fd86f (draft) [ ] 1
               |
               o  0:a78f55e5508c (draft) [ ] 0
               $ hg log -G --hidden
               @  2:b0551702f918 (draft) [tip ] 2
               |
               o  1:e016b03fd86f (draft) [ ] 1
               |
               o  0:a78f55e5508c (draft) [ ] 0
             Testing that strip remove markers:
               $ hg strip -r 1 --config extensions.strip=
 files updated, 0 files merged, 2 files removed, 0 files unresolved
               saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-65ede734-backup.hg
               $ hg debugobsolete
               $ hg log -G
               @  0:a78f55e5508c (draft) [tip ] 0
               $ hg log -G --hidden
               @  0:a78f55e5508c (draft) [tip ] 0
               $ hg debugbundle .hg/strip-backup/e016b03fd86f-*-backup.hg
               Stream params: {Compression: BZ}
               changegroup -- {nbchanges: 2, version: 02}
                   e016b03fd86fcccc54817d120b90b751aaf367d6
                   b0551702f918510f01ae838ab03a463054c67b46
               obsmarkers -- {}
                   version: 1 (92 bytes)
                   e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
               phase-heads -- {}
                   b0551702f918510f01ae838ab03a463054c67b46 draft
               $ hg unbundle .hg/strip-backup/e016b03fd86f-*-backup.hg
               adding changesets
               adding manifests
               adding file changes
               added 2 changesets with 2 changes to 2 files
 new obsolescence markers
               new changesets e016b03fd86f:b0551702f918
               (run 'hg update' to get a working copy)
               $ hg debugobsolete | sort
               e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
               $ hg log -G
               o  2:b0551702f918 (draft) [tip ] 2
               |
               o  1:e016b03fd86f (draft) [ ] 1
               |
               @  0:a78f55e5508c (draft) [ ] 0
               $ hg log -G --hidden
               o  2:b0551702f918 (draft) [tip ] 2
               |
               o  1:e016b03fd86f (draft) [ ] 1
               |
               @  0:a78f55e5508c (draft) [ ] 0
             Test that 'hg debugobsolete --index --rev' can show indices of obsmarkers when
             only a subset of those are displayed (because of --rev option)
               $ hg init doindexrev
               $ cd doindexrev
               $ echo a > a
               $ hg ci -Am a
               adding a
               $ hg ci --amend -m aa
               $ echo b > b
               $ hg ci -Am b
               adding b
               $ hg ci --amend -m bb
               $ echo c > c
               $ hg ci -Am c
               adding c
               $ hg ci --amend -m cc
               $ echo d > d
               $ hg ci -Am d
               adding d
               $ hg ci --amend -m dd --config experimental.evolution.track-operation=1
               $ hg debugobsolete --index --rev "3+7"
 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
               $ hg debugobsolete --index --rev "3+7" -Tjson
               [
                {
                 "date": [0.0, 0],
                 "flag": 0,
                 "index": 1,
                 "metadata": {"ef1": "1", "operation": "amend", "user": "test"},
                 "prednode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1",
                 "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"]
                },
                {
                 "date": [0.0, 0],
                 "flag": 0,
                 "index": 3,
                 "metadata": {"ef1": "1", "operation": "amend", "user": "test"},
                 "prednode": "4715cf767440ed891755448016c2b8cf70760c30",
                 "succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"]
                }
               ]
             Test the --delete option of debugobsolete command
               $ hg debugobsolete --index
 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
               $ hg debugobsolete --delete 1 --delete 3
               deleted 2 obsolescence markers
               $ hg debugobsolete
               cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
 ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
             Test adding changeset after obsmarkers affecting it
             (eg: during pull, or unbundle)
               $ mkcommit e
               $ hg bundle -r . --base .~1 ../bundle-2.hg
 changesets found
               $ getid .
               $ hg --config extensions.strip= strip -r .
 files updated, 0 files merged, 1 files removed, 0 files unresolved
               saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg
               $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b
               $ hg unbundle ../bundle-2.hg
               adding changesets
               adding manifests
               adding file changes
               added 1 changesets with 1 changes to 1 files
               (run 'hg update' to get a working copy)
               $ hg log -G
               @  7:7ae79c5d60f0 (draft) [tip ] dd
               |
               | o  6:4715cf767440 (draft) [ ] d
               |/
               o  5:29346082e4a9 (draft) [ ] cc
               |
               o  3:d27fb9b06607 (draft) [ ] bb
               |
               | o  2:6fdef60fcbab (draft) [ ] b
               |/
               o  1:f9bd49731b0b (draft) [ ] aa
               $ cd ..

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