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

revert: remove dangerous `parents` argument from `cmdutil.revert()`...

revert: remove dangerous `parents` argument from `cmdutil.revert()` As we found out the hard way (thanks to spectral@ for figuring it out!), `cmdutil.revert()`'s `parents` argument must be `repo.dirstate.parents()` or things may go wrong. We had an extension that passed in the target commit as the first parent. The `hg split` command from the evolve extension seems to have made the same mistake, but I haven't looked carefully. The problem is that `cmdutil._performrevert()` calls `dirstate.normal()` on reverted files if the commit to revert to equals the first parent. So if you pass in `ctx=foo` and `parents=(foo.node(), nullid)`, then `dirstate.normal()` will be called for the revert files, even though they might not be clean in the working copy. There doesn't seem to be any reason, other than a tiny performance benefit, to passing the `parents` around instead of looking them up again in `cmdutil._performrevert()`, so that's what this patch does. Differential Revision: https://phab.mercurial-scm.org/D8925

Gregory Szorc - - Load All Authors

File last commit:

r38769:0f948d82 @91 stable


                r45935:8c466bcb

default

Download file

             error.tmpl
        
                    37 lines
            
             | 1.3 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / error.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

      <title>{repo|escape}: Error</title>

      <link rel="alternate" type="application/atom+xml"

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

              r18526
            
         href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>

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

              r9999
            
      <link rel="alternate" type="application/rss+xml"

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

              r18526
            
         href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>

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

              r9999
            
      </head>

      <body>

      <div class="page_header">

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

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

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

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

              r9999
            
      </div>

      <div class="page_nav">

        Gregory Szorc
    
hgweb: refresh styling of gitweb's search form...

              r32762
            
      <div>

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

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

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

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

        Gregory Szorc
    
gitweb: add link to graph...

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

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

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

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

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

        av6
    
hgweb: don't point file links at tip hash where it doesn't make sense...

              r25526
            
      <a href="{url|urlescape}file{sessionvars%urlparameter}">files</a> |

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

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

        Gregory Szorc
    
hgweb: refresh styling of gitweb's search form...

              r32762
            
      </div>

      {searchform}

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

              r9999
            
      </div>

      <div class="page_body">

      <br/>

      <i>An error occurred while processing your request</i><br/>

      <br/>

      {error|escape}

      </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}: Error</title>
		<link rel="alternate" type="application/atom+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}atom-log" title="Atom feed for {repo\|escape}"/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<link rel="alternate" type="application/rss+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}rss-log" title="RSS feed for {repo\|escape}"/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</head>
		<body>

		<div class="page_header">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
		<a href="/">Mercurial</a> {pathdef%breadcrumb} / error
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="page_nav">
Gregory Szorc hgweb: refresh styling of gitweb's search form...	r32762	<div>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a> \|
		<a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> \|
		<a href="{url\|urlescape}log{sessionvars%urlparameter}">changelog</a> \|
Gregory Szorc gitweb: add link to graph...	r38769	<a href="{url\|urlescape}graph{sessionvars%urlparameter}">graph</a> \|
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a> \|
		<a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> \|
		<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a> \|
av6 hgweb: don't point file links at tip hash where it doesn't make sense...	r25526	<a href="{url\|urlescape}file{sessionvars%urlparameter}">files</a> \|
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
Gregory Szorc hgweb: refresh styling of gitweb's search form...	r32762	</div>
		{searchform}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="page_body">
		<br/>
		<i>An error occurred while processing your request</i><br/>
		<br/>
		{error\|escape}
		</div>

		{footer}