upstream/mercurial-mirror Files · mercurial/templates/spartan/index.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 <angel.ezquerra at gmail.com> - - Load All Authors

File last commit:

r18258:bebb05a7 default


                r26567:f18646cf

default

Download file

             index.tmpl
        
                    19 lines
            
             | 472 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / index.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

      <title>Mercurial repositories index</title>

      </head>

      <body>

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb: add a "URL breadcrumb" to the index and repository pages...

              r18258
            
      <h2><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>

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

              r9999
            
      <table>

          <tr>

              <td><a href="?sort={sort_name}">Name</a></td>

              <td><a href="?sort={sort_description}">Description</a></td>

              <td><a href="?sort={sort_contact}">Contact</a></td>

        Dan Villiom Podlaski Christiansen
    
templates: rename `Last change' column in hgwebdir repository list....

              r10301
            
              <td><a href="?sort={sort_lastchange}">Last modified</a></td>

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

              r9999
            
              <td>&nbsp;</td>

          </tr>

          {entries%indexentry}

      </table>

      {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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<title>Mercurial repositories index</title>
		</head>
		<body>

Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h2><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<table>
		<tr>
		<td><a href="?sort={sort_name}">Name</a></td>
		<td><a href="?sort={sort_description}">Description</a></td>
		<td><a href="?sort={sort_contact}">Contact</a></td>
Dan Villiom Podlaski Christiansen templates: rename `Last change' column in hgwebdir repository list....	r10301	<td><a href="?sort={sort_lastchange}">Last modified</a></td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<td> </td>
		</tr>
		{entries%indexentry}
		</table>

		{footer}