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

ancestor: silence multiple ancestor warning outside of merge (issue4234)...

ancestor: silence multiple ancestor warning outside of merge (issue4234) The current situation is a bit of a layering violation as merge-specific knowledge is pushed down to lower layers and leaks merge assumptions into other code paths. Here, we simply silence the warning with a hack. Both the warning and the hack will probably go away in the near future when bid merge is made the default.

Alexander Plavin - - Load All Authors

File last commit:

r19795:ac08ff37 default


                r21203:9f12d866

stable

Download file

             help.tmpl
        
                    39 lines
            
             | 1.1 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / help.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>Help: {topic}</title>

      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

      <a href="{logourl}">

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

      </div>

      <ul>

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

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

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

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

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

      </ul>

      <ul>

       <li class="active"><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>

      </ul>

      </div>

      <div class="main">

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

      <h3>Help: {topic}</h3>

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

      {sessionvars%hiddenformentry}

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

      <div id="hint">{searchhint}</div>

      </form>

      <div id="doc">

      {rstdoc(doc, "html")}

      </div>

      </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>Help: {topic}</title>
				</head>
				<body>

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

				<div class="main">
				<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
				<h3>Help: {topic}</h3>

				<form class="search" action="{url\|urlescape}log">
				{sessionvars%hiddenformentry}
				<p><input name="rev" id="search1" type="text" size="30" /></p>
				<div id="hint">{searchhint}</div>
				</form>
				<div id="doc">
				{rstdoc(doc, "html")}
				</div>
				</div>
				</div>

				{footer}