upstream/mercurial-mirror Files · mercurial/templates/gitweb/changelogentry.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.

Angel Ezquerra - - Load All Authors

File last commit:

r18628:52305554 default


                r26567:f18646cf

default

Download file

             changelogentry.tmpl
        
                    14 lines
            
             | 586 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}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></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">

      {desc|strip|escape|websub|addbreaks|nonempty}

      <br/>

      <br/>

      </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}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></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">
				{desc\|strip\|escape\|websub\|addbreaks\|nonempty}
				<br/>
				<br/>
				</div>