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

rebase: use dirstateguard instead of dirstate.invalidate...

rebase: use dirstateguard instead of dirstate.invalidate Before this patch, "rebase.concludenode()" uses "dirstate.invalidate()" as a kind of "restore .hg/dirstate to the original status" during a failure. But it just discards changes in memory, and doesn't actually restore ".hg/dirstate". Then, it can't work as expected, if "dirstate.write()" is executed while processing. This patch uses "dirstateguard" instead of "dirstate.invalidate()" to restore ".hg/dirstate" during a failure even if "dirstate.write()" is executed before a failure. This patch also removes "beginparentchage()" and "endparentchange()", because "dirstateguard" makes them useless. This is a part of preparations to fix the issue that the recent (in memory) dirstate isn't visible to external processes (e.g. "precommit" hook). After this patch, the changed dirstate becomes visible to external "precommit" hooks during "hg rebase" in "test-largefiles-misc.t", because "dirstateguard()" writes it out. But this content isn't yet correct, because: - "normal3" should be marked as "A"(dded) at committing It is newly added in the changeset being rebased. - but it is marked as "M"(odified) The result of "repo.setparents()" after "dirstateguard()" isn't yet written out before "precommit". So, merging is still in progress for "hg status" in it. This causes marking the file newly added on "other" branch as "A". This will be fixed by subsequent patch.

Anton Shestakov - - Load All Authors

File last commit:

r24054:fdf7794b default


                r24998:c8a97fa7

default

Download file

             search.tmpl
        
                    66 lines
            
             | 1.8 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>

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

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

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

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

              r9999
            
      {sessionvars%hiddenformentry}

        Alexander Plavin
    
hgweb: show current search query in the input field

              r19396
            
      <p><input name="rev" id="search1" type="text" size="30" value="{query|escape}"></p>

        Alexander Plavin
    
paper: define searchhint message in map file and use it in other templates

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

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

              r9999
            
      </form>

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

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

              r9999
            
      {entries}

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

Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<form class="search" action="{url\|urlescape}log">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{sessionvars%hiddenformentry}
Alexander Plavin hgweb: show current search query in the input field	r19396	<p><input name="rev" id="search1" type="text" size="30" value="{query\|escape}"></p>
Alexander Plavin paper: define searchhint message in map file and use it in other templates	r19795	<div id="hint">{searchhint}</div>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</form>

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">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{entries}
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}