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

merge: don't auto-pick destination with `hg merge 'wdir()'`...

merge: don't auto-pick destination with `hg merge 'wdir()'` If the user doesn't specify a commit to merge with, we'll have `node==None` in `commands.merge()`. We'll then try to find a good commit to merge with. However, if the user, for some strange reason, runs `hg merge 'wdir()'`, we'll also have `node==None` and we'll do that same. That's clearly not the intent, so let's not do that. It turns out we'd instead crash on that command after this patch, so I added special handling of it too. Differential Revision: https://phab.mercurial-scm.org/D7996

Yuya Nishihara - - Load All Authors

File last commit:

r37418:47aea60d default


                r44638:1850066f

default

Download file

             search.tmpl
        
                    64 lines
            
             | 1.7 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / search.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

      <title>{repo|escape}: searching for {query|escape}</title>

      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

        Steven Stallion
    
hgweb: support alternate logo url...

              r13964
            
      <a href="{logourl}">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
      <img src="{staticurl|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial"></a>

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

              r9999
            
      </div>

      <ul>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        av6
    
hgweb: put help link in paper/search.tmpl separately for consistency...

              r25524
            
      </ul>

      <ul>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

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

              r9999
            
      </ul>

      </div>

      <div class="main">

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

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

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

              r9999
            
      <h3>searching for '{query|escape}'</h3>

        Alexander Plavin
    
paper: show current search mode name at search results

              r19766
            
      <p>

      Assuming {modedesc}.

        Alexander Plavin
    
hgweb: add link to force literal keyword search...

              r19768
            
      {if(showforcekw, '<a href="{url|urlescape}log?rev={query|urlescape}&forcekw=1">

      Use {showforcekw}</a> instead.')}

      {if(showunforcekw, '<a href="{url|urlescape}log?rev={query|urlescape}">

      Use {showunforcekw}</a> instead.')}

        Alexander Plavin
    
paper: show current search mode name at search results

              r19766
            
      </p>

        Gregory Szorc
    
hgweb: consolidate search form for paper...

              r32758
            
      {searchform}

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

              r9999
            
        Dirkjan Ochtman
    
hgweb: add less/more links for search logs (issue1972)

              r10247
            
      <div class="navigate">

        Anton Shestakov
    
templates: fix broken "less" & "more" links in paper style (issue4460)...

              r23377
            
      <a href="{url|urlescape}log{lessvars%urlparameter}">less</a>

      <a href="{url|urlescape}log{morevars%urlparameter}">more</a>

        Dirkjan Ochtman
    
hgweb: add less/more links for search logs (issue1972)

              r10247
            
      </div>

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

              r9999
            
      <table class="bigtable">

        Anton Shestakov
    
hgweb: replace implicit <tbody> with explicit <thead> where appropriate...

              r24054
            
      <thead>

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

              r9999
            
       <tr>

        <th class="age">age</th>

        <th class="author">author</th>

        <th class="description">description</th>

       </tr>

        Anton Shestakov
    
hgweb: replace implicit <tbody> with explicit <thead> where appropriate...

              r24054
            
      </thead>

        Alexander Plavin
    
hgweb: make stripes in log and search with CSS

              r19452
            
      <tbody class="stripes2">

        Yuya Nishihara
    
hgweb: fix search {entries} to not return results of template expansion...

              r37418
            
      {entries%changelogentry}

        Alexander Plavin
    
hgweb: make stripes in log and search with CSS

              r19452
            
      </tbody>

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

              r9999
            
      </table>

        Dirkjan Ochtman
    
hgweb: add less/more links for search logs (issue1972)

              r10247
            
      <div class="navigate">

        Anton Shestakov
    
templates: fix broken "less" & "more" links in paper style (issue4460)...

              r23377
            
      <a href="{url|urlescape}log{lessvars%urlparameter}">less</a>

      <a href="{url|urlescape}log{morevars%urlparameter}">more</a>

        Dirkjan Ochtman
    
hgweb: add less/more links for search logs (issue1972)

              r10247
            
      </div>

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

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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<title>{repo\|escape}: searching for {query\|escape}</title>
		</head>
		<body>

		<div class="container">
		<div class="menu">
		<div class="logo">
Steven Stallion hgweb: support alternate logo url...	r13964	<a href="{logourl}">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<img src="{staticurl\|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial"></a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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>
av6 hgweb: put help link in paper/search.tmpl separately for consistency...	r25524	</ul>
		<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		</div>

		<div class="main">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<h3>searching for '{query\|escape}'</h3>

Alexander Plavin paper: show current search mode name at search results	r19766	<p>
		Assuming {modedesc}.
Alexander Plavin hgweb: add link to force literal keyword search...	r19768	{if(showforcekw, '<a href="{url\|urlescape}log?rev={query\|urlescape}&forcekw=1">
		Use {showforcekw}</a> instead.')}
		{if(showunforcekw, '<a href="{url\|urlescape}log?rev={query\|urlescape}">
		Use {showunforcekw}</a> instead.')}
Alexander Plavin paper: show current search mode name at search results	r19766	</p>

Gregory Szorc hgweb: consolidate search form for paper...	r32758	{searchform}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Dirkjan Ochtman hgweb: add less/more links for search logs (issue1972)	r10247	<div class="navigate">
Anton Shestakov templates: fix broken "less" & "more" links in paper style (issue4460)...	r23377	<a href="{url\|urlescape}log{lessvars%urlparameter}">less</a>
		<a href="{url\|urlescape}log{morevars%urlparameter}">more</a>
Dirkjan Ochtman hgweb: add less/more links for search logs (issue1972)	r10247	</div>

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<table class="bigtable">
Anton Shestakov hgweb: replace implicit <tbody> with explicit <thead> where appropriate...	r24054	<thead>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<tr>
		<th class="age">age</th>
		<th class="author">author</th>
		<th class="description">description</th>
		</tr>
Anton Shestakov hgweb: replace implicit <tbody> with explicit <thead> where appropriate...	r24054	</thead>
Alexander Plavin hgweb: make stripes in log and search with CSS	r19452	<tbody class="stripes2">
Yuya Nishihara hgweb: fix search {entries} to not return results of template expansion...	r37418	{entries%changelogentry}
Alexander Plavin hgweb: make stripes in log and search with CSS	r19452	</tbody>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</table>

Dirkjan Ochtman hgweb: add less/more links for search logs (issue1972)	r10247	<div class="navigate">
Anton Shestakov templates: fix broken "less" & "more" links in paper style (issue4460)...	r23377	<a href="{url\|urlescape}log{lessvars%urlparameter}">less</a>
		<a href="{url\|urlescape}log{morevars%urlparameter}">more</a>
Dirkjan Ochtman hgweb: add less/more links for search logs (issue1972)	r10247	</div>

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		</div>

		{footer}