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

rebase: move working parent and bookmark for obsoleted revs (BC)...

rebase: move working parent and bookmark for obsoleted revs (BC) Previously, obsoleted revs with successors in destination are completely ignored. That caused some inconvenience when working copy is obsoleted. Most commands avoid working copy being obsoleted, but `hg pull` is an exception. This patch makes rebase able to move bookmarks or working parent for those obsoleted revs. It does so by keeping the obsoleted revs in `state` and marking them as "skipped, rebased to desired destination" during run-time. This reverts part of the behavior change of and D24. Differential Revision: https://phab.mercurial-scm.org/D527

Gregory Szorc - - Load All Authors

File last commit:

r32759:265196cd default


                r34010:9422107a

default

Download file

             changeset.tmpl
        
                    60 lines
            
             | 2.5 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / 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}: changeset {rev}:{node|short}</title>

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

              r18526
            
          <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}"/>

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

              r9999
            
      </head>

      <body>

      <div id="container">

          <div class="page-header">

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

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

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

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

              r32759
            
              {searchform}

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

              r9999
            
              <ul class="page-nav">

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

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

        av6
    
hgweb: don't dereference symbolic revision in monoblue style...

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

        av6
    
hgweb: don't dereference symbolic revision in monoblue style...

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

        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>

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

              r9999
            
              </ul>

          </div>

          <ul class="submenu">

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

        av6
    
hgweb: don't dereference symbolic revision in monoblue style...

              r25604
            
              <li><a href="{url|urlescape}raw-rev/{symrev}">raw</a></li>

        Anton Shestakov
    
hgweb: move archive entries outside of <li> in monoblue style...

              r23784
            
              {archives%archiveentry}

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

              r9999
            
          </ul>

          <h2 class="no-link no-border">changeset</h2>

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

              r18526
            
          <h3 class="changeset"><a href="{url|urlescape}raw-rev/{node|short}">{desc|strip|escape|firstline|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a></h3>

        Anton Shestakov
    
hgweb: recreate old DOM structure for css in monoblue style...

              r24109
            
          <p class="changeset-age"><span class="age">{date|rfc822date}</span></p>

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

              r9999
            
          <dl class="overview">

              <dt>author</dt>

              <dd>{author|obfuscate}</dd>

              <dt>date</dt>

        Brodie Rao
    
hgweb: fix dynamic date calculation not working under Safari...

              r15375
            
              <dd>{date|rfc822date}</dd>

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

              r9999
            
              {branch%changesetbranch}

              <dt>changeset {rev}</dt>

        av6
    
hgweb: link to revision by node hash in gitweb & monoblue...

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

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

              r23740
            
              {ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}

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

              r9999
            
              {child%changesetchild}

          </dl>

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

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

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

              r9999
            
          <table>

          {files}

          </table>

        av6
    
monoblue: port code selection without line numbers from gitweb...

              r26314
            
          <div class="diff diffblocks">

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

              r9999
            
          {diff}

          </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}: changeset {rev}:{node\|short}</title>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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}"/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</head>

		<body>
		<div id="container">
		<div class="page-header">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / changeset</h1>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Gregory Szorc hgweb: consolidate search form for monoblue...	r32759	{searchform}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<ul class="page-nav">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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>
av6 hgweb: don't dereference symbolic revision in monoblue style...	r25604	<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>
av6 hgweb: don't dereference symbolic revision in monoblue style...	r25604	<li><a href="{url\|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a></li>
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>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		</div>

		<ul class="submenu">
		<li class="current">changeset</li>
av6 hgweb: don't dereference symbolic revision in monoblue style...	r25604	<li><a href="{url\|urlescape}raw-rev/{symrev}">raw</a></li>
Anton Shestakov hgweb: move archive entries outside of <li> in monoblue style...	r23784	{archives%archiveentry}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>

		<h2 class="no-link no-border">changeset</h2>

Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<h3 class="changeset"><a href="{url\|urlescape}raw-rev/{node\|short}">{desc\|strip\|escape\|firstline\|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a></h3>
Anton Shestakov hgweb: recreate old DOM structure for css in monoblue style...	r24109	<p class="changeset-age"><span class="age">{date\|rfc822date}</span></p>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<dl class="overview">
		<dt>author</dt>
		<dd>{author\|obfuscate}</dd>
		<dt>date</dt>
Brodie Rao hgweb: fix dynamic date calculation not working under Safari...	r15375	<dd>{date\|rfc822date}</dd>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{branch%changesetbranch}
		<dt>changeset {rev}</dt>
av6 hgweb: link to revision by node hash in gitweb & monoblue...	r25616	<dd><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></dd>
Anton Shestakov hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...	r23740	{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{child%changesetchild}
		</dl>

Angel Ezquerra hgweb: apply the websub filter to revision descriptions...	r18628	<p class="description">{desc\|strip\|escape\|websub\|addbreaks\|nonempty}</p>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<table>
		{files}
		</table>

av6 monoblue: port code selection without line numbers from gitweb...	r26314	<div class="diff diffblocks">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{diff}
		</div>

		{footer}