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

filemerge: return whether the file is deleted for nomerge internal tools...

filemerge: return whether the file is deleted for nomerge internal tools We're going to support the filemerge code resolving change/delete conflicts in upcoming patches. Some of these resolutions require that the dirstate be modified. Modifying the dirstate directly from in here would be (a) a pretty bad layering violation and (b) wrong because all dirstate removals should happen before adds. So in this and upcoming patches we're instead going to pass whether the file is deleted up to merge.mergestate, then in there figure out what dirstate action needs to be taken.

av6 - - Load All Authors

File last commit:

r25871:20ed5677 stable


                r27032:28ee7af4

default

Download file

             index.tmpl
        
                    27 lines
            
             | 720 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / index.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>Mercurial repositories index</title>

      </head>

      <body>

      <div class="page_header">

          <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>

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

      </div>

      <table cellspacing="0">

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

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

              <td>&nbsp;</td>

              <td>&nbsp;</td>

          </tr>

          {entries%indexentry}

      </table>

      <div class="page_footer">

      {motd}

      </div>

      <script type="text/javascript">process_dates()</script>

      </body>

      </html>

	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

				{header}
				<title>Mercurial repositories index</title>
				</head>
				<body>

				<div class="page_header">
				<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
				<a href="/">Mercurial</a> {pathdef%breadcrumb}
				</div>

				<table cellspacing="0">
				<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>
				<td><a href="?sort={sort_lastchange}">Last modified</a></td>
				<td> </td>
				<td> </td>
				</tr>
				{entries%indexentry}
				</table>
				<div class="page_footer">
				{motd}
				</div>
				<script type="text/javascript">process_dates()</script>
				</body>
				</html>