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

rebase: filter out descendants of divergence-causing commits earlier...

rebase: filter out descendants of divergence-causing commits earlier `hg rebase` treats obsolete commits differently depending what has happened to the commit: 1) Obsolete commit without non-obsolete successors: Skipped, and a note is printed ("it has no successor"). 2) Obsolete commit with a successor in the destination (ancestor of it): Skipped, and a note is printed ("already in destination"). 3) Obsolete commit with a successor in the rebase set: The commit and its descendants are skipped, and a note is printed ("not rebasing <commit> and its descendants as this would cause divergence"), unless `allowdivergence` config set. 4) Obsolete commit with a successor elsewhere: Error ("this rebase will cause divergences"), unless `allowdivergence` config set. Before this patch, we did all those checks up front, except for (3), which was checked later. The later check consisted of two parts: 1) filtering out of descendants, and 2) conditionally printing message if the `allowdivergence` config was not set. This patch makes it so we do the filtering early. A consequence of filtering out divergence-causing commits earlier is that we rebase commits in slightly different order, which has some impact on tests. Differential Revision: https://phab.mercurial-scm.org/D10249

Gregory Szorc - - Load All Authors

File last commit:

r37849:82ae4f47 @22 stable


                r47590:535de0e3

default

Download file

             changeset.tmpl
        
                    95 lines
            
             | 2.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / changeset.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {header}

      <title>{repo|escape}: {node|short}</title>

      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

        Steven Stallion
    
hgweb: support alternate logo url...

              r13964
            
      <a href="{logourl}">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
      <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </div>

      <ul>

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

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

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

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
       <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>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </ul>

      <ul>

       <li class="active">changeset</li>

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

              r25606
            
       <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>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </ul>

      <ul>

       {archives%archiveentry}

      </ul>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      <ul>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      </ul>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </div>

      <div class="main">

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb: add a "URL breadcrumb" to the index and repository pages...

              r18258
            
      <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>

        av6
    
hgweb: link to revision by node hash in paper & coal...

              r25617
            
      <h3>

       changeset {rev}:<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>

        av6
    
hgweb: move changeset "tags" to a template in map file (paper and coal)...

              r35055
            
       {alltags}

        av6
    
hgweb: link to revision by node hash in paper & coal...

              r25617
            
      </h3>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
        Gregory Szorc
    
hgweb: consolidate search form for paper...

              r32758
            
      {searchform}

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
        Angel Ezquerra
    
hgweb: apply the websub filter to revision descriptions...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      <table id="changesetEntry">

      <tr>

       <th class="author">author</th>

       <td class="author">{author|obfuscate}</td>

      </tr>

      <tr>

       <th class="date">date</th>

        Anton Shestakov
    
hgweb: clearly outline <tr> block in paper/changeset.tmpl...

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

      </tr>

        av6
    
hgweb: display fate of obsolete changesets...

              r35501
            
      {if(obsolete, '<tr>

       <th>obsolete</th>

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

              r36340
            
       <td>{join(succsandmarkers%obsfateentry, '<br>\n')}</td>

        av6
    
hgweb: display fate of obsolete changesets...

              r35501
            
      </tr>')}

        av6
    
hgweb: explain instabilities of unstable changesets

              r36973
            
      {if(instabilities, '<tr>

       <th>unstable</th>

       <td>{join(whyunstable%whyunstableentry, '<br>\n')}</td>

      </tr>')}

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      <tr>

       <th class="author">parents</th>

        Anton Shestakov
    
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...

              r23740
            
       <td class="author">{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}</td>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </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>

        Steven Brown
    
paper, coal: display diffstat on the changeset page...

              r14571
            
      <tr>

        <th class="diffstat">diffstat</th>

        <td class="diffstat">

          {diffsummary}

        Gregory Szorc
    
paper: add href="#" to links with click handlers...

              r37849
            
          <a id="diffstatexpand" class="diffstattoggle" href="#">[<tt>+</tt>]</a>

        Steven Brown
    
paper, coal: display diffstat on the changeset page...

              r14571
            
          <div id="diffstatdetails" style="display:none;">

        Gregory Szorc
    
paper: add href="#" to links with click handlers...

              r37849
            
            <a class="diffstattoggle" href="#">[<tt>-</tt>]</a>

        Anton Shestakov
    
hgweb: use css margin instead of empty <p> before diffstat table...

              r24042
            
            <table class="diffstat-table stripes2">{diffstat}</table>

        Steven Brown
    
paper, coal: display diffstat on the changeset page...

              r14571
            
          </div>

        </td>

      </tr>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </table>

      <div class="overflow">

        Gregory Szorc
    
paper: add href="#" to links with click handlers...

              r37849
            
      <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="#">on</a></div>

        Alexander Plavin
    
hgweb: file diff and changesets views behave like file source view...

              r19432
            
      <div class="sourcefirst"> line diff</div>

      <div class="stripes2 diffblocks">

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {diff}

      </div>

        Alexander Plavin
    
hgweb: file diff and changesets views behave like file source view...

              r19432
            
      </div>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </div>

      </div>

      {footer}

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<title>{repo\|escape}: {node\|short}</title>
		</head>
		<body>
		<div class="container">
		<div class="menu">
		<div class="logo">
Steven Stallion hgweb: support alternate logo url...	r13964	<a href="{logourl}">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<img src="{staticurl\|urlescape}{logoimg}" alt="mercurial" /></a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		<ul>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<li><a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">log</a></li>
		<li><a href="{url\|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		<ul>
		<li class="active">changeset</li>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<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>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		<ul>
		{archives%archiveentry}
		</ul>
Augie Fackler web: add a help view for getting hg help output	r12666	<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
Augie Fackler web: add a help view for getting hg help output	r12666	</ul>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="main">

Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
av6 hgweb: link to revision by node hash in paper & coal...	r25617	<h3>
		changeset {rev}:<a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a>
av6 hgweb: move changeset "tags" to a template in map file (paper and coal)...	r35055	{alltags}
av6 hgweb: link to revision by node hash in paper & coal...	r25617	</h3>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Gregory Szorc hgweb: consolidate search form for paper...	r32758	{searchform}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Angel Ezquerra hgweb: apply the websub filter to revision descriptions...	r18628	<div class="description">{desc\|strip\|escape\|websub\|nonempty}</div>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<table id="changesetEntry">
		<tr>
		<th class="author">author</th>
		<td class="author">{author\|obfuscate}</td>
		</tr>
		<tr>
		<th class="date">date</th>
Anton Shestakov hgweb: clearly outline <tr> block in paper/changeset.tmpl...	r24130	<td class="date age">{date\|rfc822date}</td>
		</tr>
av6 hgweb: display fate of obsolete changesets...	r35501	{if(obsolete, '<tr>
		<th>obsolete</th>
av6 hgweb: show each obsfateentry on its own line...	r36340	<td>{join(succsandmarkers%obsfateentry, '<br>\n')}</td>
av6 hgweb: display fate of obsolete changesets...	r35501	</tr>')}
av6 hgweb: explain instabilities of unstable changesets	r36973	{if(instabilities, '<tr>
		<th>unstable</th>
		<td>{join(whyunstable%whyunstableentry, '<br>\n')}</td>
		</tr>')}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<tr>
		<th class="author">parents</th>
Anton Shestakov hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...	r23740	<td class="author">{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}</td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</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>
Steven Brown paper, coal: display diffstat on the changeset page...	r14571	<tr>
		<th class="diffstat">diffstat</th>
		<td class="diffstat">
		{diffsummary}
Gregory Szorc paper: add href="#" to links with click handlers...	r37849	<a id="diffstatexpand" class="diffstattoggle" href="#">[<tt>+</tt>]</a>
Steven Brown paper, coal: display diffstat on the changeset page...	r14571	<div id="diffstatdetails" style="display:none;">
Gregory Szorc paper: add href="#" to links with click handlers...	r37849	<a class="diffstattoggle" href="#">[<tt>-</tt>]</a>
Anton Shestakov hgweb: use css margin instead of empty <p> before diffstat table...	r24042	<table class="diffstat-table stripes2">{diffstat}</table>
Steven Brown paper, coal: display diffstat on the changeset page...	r14571	</div>
		</td>
		</tr>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</table>

		<div class="overflow">
Gregory Szorc paper: add href="#" to links with click handlers...	r37849	<div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="#">on</a></div>
Alexander Plavin hgweb: file diff and changesets views behave like file source view...	r19432	<div class="sourcefirst"> line diff</div>
		<div class="stripes2 diffblocks">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{diff}
		</div>
Alexander Plavin hgweb: file diff and changesets views behave like file source view...	r19432	</div>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		</div>
		</div>
		{footer}