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

reabase: call rewriteutil.precheck() a bit later...

reabase: call rewriteutil.precheck() a bit later We now filter out descendants of divergence-causing commits in `_handleskippingobsolete()`. The filtered-out commits are removed from the rebase set (`destmap` and `state`). We should therefore call `rewriteutil.precheck()` after `_handleskippingobsolete()`. This patch does that. It hasn't mattered so far because `rewriteutil.precheck()` doesn't yet check for divergence, but it will soon. This affects one test where we now fail because the user is trying to rebase an ancestor instead of failing because they tried to rebase a public commit. We have several similar tests just after, where we still fail because of the phase, so that seems fine. The difference in behavior also seems fine to me. Differential Revision: https://phab.mercurial-scm.org/D10258

Gregory Szorc - - Load All Authors

File last commit:

r32758:cba4461a default


                r47592:80cac993

default

Download file

             helptopics.tmpl
        
                    48 lines
            
             | 1.3 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / helptopics.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r12666
            
      {header}

      <title>Help: {title}</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>

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

              r12666
            
      </div>

      <ul>

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

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

      <li><a href="{url|urlescape}graph{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>

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

              r12666
            
      </ul>

      <ul>

        Gregory Szorc
    
templates: support linking to main help page...

              r27580
            
      {if(subindex,

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

        '<li class="active">help</li>'

      )}

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

              r12666
            
      </ul>

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

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

              r32758
            
      {searchform}

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

              r12666
            
      <table class="bigtable">

        av6
    
hgweb: make anchor name actually match its href on help index page

              r30019
            
      <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>

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

              r12666
            
      {topics % helpentry}

        Gregory Szorc
    
templates: make earlycommands and othercommands optional...

              r27578
            
      {if(earlycommands, '

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

              r12666
            
      <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>

      {earlycommands % helpentry}

        Gregory Szorc
    
templates: make earlycommands and othercommands optional...

              r27578
            
      ')}

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

              r12666
            
        Gregory Szorc
    
templates: make earlycommands and othercommands optional...

              r27578
            
      {if(othercommands, '

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

              r12666
            
      <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>

      {othercommands % helpentry}

        Gregory Szorc
    
templates: make earlycommands and othercommands optional...

              r27578
            
      ')}

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

              r12666
            
      </table>

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

Augie Fackler web: add a help view for getting hg help output	r12666	{header}
		<title>Help: {title}</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>
Augie Fackler web: add a help view for getting hg help output	r12666	</div>
		<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">log</a></li>
		<li><a href="{url\|urlescape}graph{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>
Augie Fackler web: add a help view for getting hg help output	r12666	</ul>
		<ul>
Gregory Szorc templates: support linking to main help page...	r27580	{if(subindex,
		'<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>',
		'<li class="active">help</li>'
		)}
Augie Fackler web: add a help view for getting hg help output	r12666	</ul>
		</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>
Gregory Szorc hgweb: consolidate search form for paper...	r32758	{searchform}
Augie Fackler web: add a help view for getting hg help output	r12666	<table class="bigtable">
av6 hgweb: make anchor name actually match its href on help index page	r30019	<tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
Augie Fackler web: add a help view for getting hg help output	r12666	{topics % helpentry}

Gregory Szorc templates: make earlycommands and othercommands optional...	r27578	{if(earlycommands, '
Augie Fackler web: add a help view for getting hg help output	r12666	<tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
		{earlycommands % helpentry}
Gregory Szorc templates: make earlycommands and othercommands optional...	r27578	')}
Augie Fackler web: add a help view for getting hg help output	r12666
Gregory Szorc templates: make earlycommands and othercommands optional...	r27578	{if(othercommands, '
Augie Fackler web: add a help view for getting hg help output	r12666	<tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
		{othercommands % helpentry}
Gregory Szorc templates: make earlycommands and othercommands optional...	r27578	')}

Augie Fackler web: add a help view for getting hg help output	r12666	</table>
		</div>
		</div>

		{footer}