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

merge: disallow merge abort in case of an unfinished operation (issue6160)...

merge: disallow merge abort in case of an unfinished operation (issue6160) This patch disallows `hg merge --abort` in case an operation of higher precedence i.e unshelve, rebase, histedit are in unfinished states. This is done so as to avoid partial abort of these operations in case merge abort is called at an interrupted step. The patch adds a `cmdutil.getunfinishedstate` function which checks for operations under progress and returns a `statecheck` object for it. Differential Revision: https://phab.mercurial-scm.org/D6607

av6 - - Load All Authors

File last commit:

r35055:9acc0360 default


                r42780:b8d54f46

default

Download file

             filelogentry.tmpl
        
                    9 lines
            
             | 333 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / filelogentry.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Alexander Plavin
    
hgweb: make stripes in file log with CSS

              r19454
            
       <tr>

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

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

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

              r9999
            
        <td class="author">{author|person}</td>

        Anton Shestakov
    
hgweb: split some long lines in paper, gitweb and monoblue styles...

              r25108
            
        <td class="description">

         <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>

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

              r35055
            
         {alltags}{rename%filelogrename}

        Anton Shestakov
    
hgweb: split some long lines in paper, gitweb and monoblue styles...

              r25108
            
        </td>

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

              r9999
            
       </tr>

        Denis Laxalde
    
hgweb: add a "patch" query parameter to filelog command...

              r31661
            
       {if(patch, '<tr><td colspan="3">{diff}</td></tr>')}

	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

Alexander Plavin hgweb: make stripes in file log with CSS	r19454	<tr>
Brodie Rao hgweb: fix dynamic date calculation not working under Safari...	r15375	<td class="age">{date\|rfc822date}</td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<td class="author">{author\|person}</td>
Anton Shestakov hgweb: split some long lines in paper, gitweb and monoblue styles...	r25108	<td class="description">
		<a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{desc\|strip\|firstline\|escape\|nonempty}</a>
av6 hgweb: move changeset "tags" to a template in map file (paper and coal)...	r35055	{alltags}{rename%filelogrename}
Anton Shestakov hgweb: split some long lines in paper, gitweb and monoblue styles...	r25108	</td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>
Denis Laxalde hgweb: add a "patch" query parameter to filelog command...	r31661	{if(patch, '<tr><td colspan="3">{diff}</td></tr>')}