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

strip: invalidate phase cache after stripping changeset (issue5235)...

strip: invalidate phase cache after stripping changeset (issue5235) When we remove a changeset from the changelog, the phase cache must be invalidated, otherwise it could refer to changesets that are no longer in the repo. To reproduce the failure, I created an extension querying the phase cache after the strip transaction is over. To do that, I stripped two commits with a bookmark on one of them to force another transaction (we open a transaction for moving bookmarks) after the strip transaction. Without the fix in this patch, the test leads to a stacktrace showing the issue: repair.strip(ui, repo, revs, backup) File "/Users/lcharignon/facebook-hg-rpms/hg-crew/mercurial/repair.py", line 205, in strip tr.close() File "/Users/lcharignon/facebook-hg-rpms/hg-crew/mercurial/transaction.py", line 44, in _active return func(self, *args, **kwds) File "/Users/lcharignon/facebook-hg-rpms/hg-crew/mercurial/transaction.py", line 490, in close self._postclosecallback[cat](self) File "$TESTTMP/crashstrip2.py", line 4, in test [repo.changelog.node(r) for r in repo.revs("not public()")] File "/Users/lcharignon/facebook-hg-rpms/hg-crew/mercurial/changelog.py", line 337, in node return super(changelog, self).node(rev) File "/Users/lcharignon/facebook-hg-rpms/hg-crew/mercurial/revlog.py", line 377, in node return self.index[rev][7] IndexError: revlog index out of range The situation was encountered in inhibit (evolve's repo) where we would crash following the volatile set invalidation submitted by Augie in e6f490e328635312ee214a12bc7fd3c7d46bf9ce. Before his patch the issue was masked as we were not accessing the phasecache after stripping a revision. This bug uncovered another but in histedit (see explanation in issue5235). I changed the histedit test accordingly to avoid fixing two things at once.

av6 - - Load All Authors

File last commit:

r26666:e901df65 default


                r29196:bf7b8157

stable

Download file

             changeset.tmpl
        
                    57 lines
            
             | 2.2 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / changeset.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

      <title>{repo|escape}: changeset {rev}:{node|short}</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} / changeset

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

              r9999
            
      </div>

      <div class="page_nav">

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

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

        av6
    
hgweb: don't dereference symbolic revision in gitweb style...

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

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

        av6
    
gitweb: don't drop current revision context on graph page...

              r26666
            
      <a href="{url|urlescape}graph/{symrev}{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 dereference symbolic revision in gitweb style...

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

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

              r9999
            
      changeset |

        av6
    
hgweb: don't dereference symbolic revision in gitweb style...

              r25605
            
      <a href="{url|urlescape}raw-rev/{symrev}">raw</a> {archives%archiveentry} |

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

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

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      <br/>

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

              r9999
            
      </div>

      <div>

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

              r18526
            
      <a class="title" href="{url|urlescape}raw-rev/{node|short}">{desc|strip|escape|firstline|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>

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

              r9999
            
      </div>

      <div class="title_text">

      <table cellspacing="0">

      <tr><td>author</td><td>{author|obfuscate}</td></tr>

        Brodie Rao
    
hgweb: fix dynamic date calculation not working under Safari...

              r15375
            
      <tr><td></td><td class="date age">{date|rfc822date}</td></tr>

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

              r9999
            
      {branch%changesetbranch}

        av6
    
hgweb: link to revision by node hash in gitweb & monoblue...

              r25616
            
      <tr>

       <td>changeset {rev}</td>

       <td style="font-family:monospace"><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>

      </tr>

        Anton Shestakov
    
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...

              r23740
            
      {ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}

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

              r9999
            
      {child%changesetchild}

      </table></div>

      <div class="page_body">

        Angel Ezquerra
    
hgweb: apply the websub filter to revision descriptions...

              r18628
            
      {desc|strip|escape|websub|addbreaks|nonempty}

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

              r9999
            
      </div>

      <div class="list_head"></div>

      <div class="title_text">

      <table cellspacing="0">

      {files}

      </table></div>

        av6
    
gitweb: port code selection without line numbers from paper...

              r26288
            
      <div class="page_body diffblocks">{diff}</div>

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

              r9999
            
      {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}: changeset {rev}:{node\|short}</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} / changeset
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="page_nav">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a> \|
av6 hgweb: don't dereference symbolic revision in gitweb style...	r25605	<a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a> \|
		<a href="{url\|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> \|
av6 gitweb: don't drop current revision context on graph page...	r26666	<a href="{url\|urlescape}graph/{symrev}{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 dereference symbolic revision in gitweb style...	r25605	<a href="{url\|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a> \|
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	changeset \|
av6 hgweb: don't dereference symbolic revision in gitweb style...	r25605	<a href="{url\|urlescape}raw-rev/{symrev}">raw</a> {archives%archiveentry} \|
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
Augie Fackler web: add a help view for getting hg help output	r12666	<br/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a class="title" href="{url\|urlescape}raw-rev/{node\|short}">{desc\|strip\|escape\|firstline\|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		<div class="title_text">
		<table cellspacing="0">
		<tr><td>author</td><td>{author\|obfuscate}</td></tr>
Brodie Rao hgweb: fix dynamic date calculation not working under Safari...	r15375	<tr><td></td><td class="date age">{date\|rfc822date}</td></tr>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{branch%changesetbranch}
av6 hgweb: link to revision by node hash in gitweb & monoblue...	r25616	<tr>
		<td>changeset {rev}</td>
		<td style="font-family:monospace"><a class="list" href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>
		</tr>
Anton Shestakov hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...	r23740	{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{child%changesetchild}
		</table></div>

		<div class="page_body">
Angel Ezquerra hgweb: apply the websub filter to revision descriptions...	r18628	{desc\|strip\|escape\|websub\|addbreaks\|nonempty}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		<div class="list_head"></div>
		<div class="title_text">
		<table cellspacing="0">
		{files}
		</table></div>

av6 gitweb: port code selection without line numbers from paper...	r26288	<div class="page_body diffblocks">{diff}</div>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		{footer}