upstream/mercurial-mirror Files · mercurial/templates/gitweb/changelogentry.tmpl

rebase: stop relying on having two parents to resume rebase...

rebase: stop relying on having two parents to resume rebase I'm about to make it so we don't have two parents when a rebase is interrupted (unless we're just rebasing on a merge commit). The code for detecting if we're resuming a rebase relied on having two parents, so this patch rewrites that to instead set a boolean when we resume. Note that `self.resume` in the new condition implies `not self.inmemory` (rebase cannot be resumed in memory), so that's why that part can be omitted. Differential Revision: https://phab.mercurial-scm.org/D7826

av6 - - Load All Authors

File last commit:

r35052:e9a8a941 default


                r44820:b42ce825

default

Download file

             changelogentry.tmpl
        
                    16 lines
            
             | 489 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / changelogentry.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <div>

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

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

        {desc|strip|firstline|escape|nonempty}

        {alltags}

       </a>

      </div>

      <div class="title_text">

      <div class="log_link">

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

      </div>

      <i>{author|obfuscate} [{date|rfc822date}] rev {rev}</i><br/>

      </div>

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

      </div>

	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

				<div>
				<a class="title" href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">
				<span class="age">{date\|rfc822date}</span>
				{desc\|strip\|firstline\|escape\|nonempty}
				{alltags}
				</a>
				</div>
				<div class="title_text">
				<div class="log_link">
				<a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">changeset</a><br/>
				</div>
				<i>{author\|obfuscate} [{date\|rfc822date}] rev {rev}</i><br/>
				</div>
				<div class="log_body description">{desc\|strip\|escape\|websub\|nonempty}

				</div>