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

merge: make 'nothing to merge' aborts consistent...

merge: make 'nothing to merge' aborts consistent Makes the 'nothing to merge' abort messages in commands.py consistent with those in merge.py. Also makes commands.merge() and merge.update() use hints. The tests show the changes.

Angel Ezquerra - - Load All Authors

File last commit:

r14913:44382887 default


                r15619:6c8573dd

default

Download file

             manifest.tmpl
        
                    58 lines
            
             | 1.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / manifest.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: {node|short} {path|escape}</title>

      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

      <a href="{logourl}">

      <img src="{staticurl}{logoimg}" alt="mercurial" /></a>

      </div>

      <ul>

      <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>

      <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>

      <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>

      <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>

      <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>

      </ul>

      <ul>

      <li><a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a></li>

      <li class="active">browse</li>

      </ul>

      <ul>

      {archives%archiveentry}

      </ul>

      <ul>

       <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>

      </ul>

      </div>

      <div class="main">

      <h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2>

      <h3>directory {path|escape} @ {rev}:{node|short} {tags%changelogtag}</h3>

      <form class="search" action="{url}log">

      {sessionvars%hiddenformentry}

      <p><input name="rev" id="search1" type="text" size="30" /></p>

      <div id="hint">find changesets by author, revision,

      files, or words in the commit message</div>

      </form>

      <table class="bigtable">

      <tr>

        <th class="name">name</th>

        <th class="size">size</th>

        <th class="permissions">permissions</th>

      </tr>

      <tr class="fileline parity{upparity}">

        <td class="name"><a href="{url}file/{node|short}{up|urlescape}{sessionvars%urlparameter}">[up]</a></td>

        <td class="size"></td>

        <td class="permissions">drwxr-xr-x</td>

      </tr>

      {dentries%direntry}

      {fentries%fileentry}

      </table>

      </div>

      </div>

      {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

				{header}
				<title>{repo\|escape}: {node\|short} {path\|escape}</title>
				</head>
				<body>

				<div class="container">
				<div class="menu">
				<div class="logo">
				<a href="{logourl}">
				<img src="{staticurl}{logoimg}" alt="mercurial" /></a>
				</div>
				<ul>
				<li><a href="{url}shortlog/{node\|short}{sessionvars%urlparameter}">log</a></li>
				<li><a href="{url}graph/{node\|short}{sessionvars%urlparameter}">graph</a></li>
				<li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
				<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
				<li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
				</ul>
				<ul>
				<li><a href="{url}rev/{node\|short}{sessionvars%urlparameter}">changeset</a></li>
				<li class="active">browse</li>
				</ul>
				<ul>
				{archives%archiveentry}
				</ul>
				<ul>
				<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
				</ul>
				</div>

				<div class="main">
				<h2><a href="{url}{sessionvars%urlparameter}">{repo\|escape}</a></h2>
				<h3>directory {path\|escape} @ {rev}:{node\|short} {tags%changelogtag}</h3>

				<form class="search" action="{url}log">
				{sessionvars%hiddenformentry}
				<p><input name="rev" id="search1" type="text" size="30" /></p>
				<div id="hint">find changesets by author, revision,
				files, or words in the commit message</div>
				</form>

				<table class="bigtable">
				<tr>
				<th class="name">name</th>
				<th class="size">size</th>
				<th class="permissions">permissions</th>
				</tr>
				<tr class="fileline parity{upparity}">
				<td class="name"><a href="{url}file/{node\|short}{up\|urlescape}{sessionvars%urlparameter}">[up]</a></td>
				<td class="size"></td>
				<td class="permissions">drwxr-xr-x</td>
				</tr>
				{dentries%direntry}
				{fentries%fileentry}
				</table>
				</div>
				</div>
				{footer}