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

filemerge: call premerge directly from main merge function...

filemerge: call premerge directly from main merge function The merge code currently does (in pseudocode): for f in tomerge: premerge f merge f We'd like to change this to look more like: for f in tomerge: premerge f for f in tomerge: merge f This makes sure as many files are resolved as possible before prompting for the others. This restructuring is also necessary for custom merge drivers. This function separates out the premerge step from the merge step. In future patches we'll actually turn these into separate steps in the merge driver. The 'if r:' occurrences will be cleaned up in subsequent patches.

Anton Shestakov - - Load All Authors

File last commit:

r25108:09ec4220 default


                r26567:f18646cf

default

Download file

             shortlogentry.tmpl
        
                    8 lines
            
             | 352 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / shortlogentry.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Alexander Plavin
    
hgweb: make stripes in log and search with CSS

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

         {inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{bookmarks%changelogtag}

        </td>

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

              r9999
            
       </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 log and search with CSS	r19452	<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>
		{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{bookmarks%changelogtag}
		</td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>