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

localrepo: use changelog.hasnode instead of self.__contains__...

localrepo: use changelog.hasnode instead of self.__contains__ Before this patch, releasing the store lock implies the actions below, when the transaction is aborted: 1. "commithook()" scheduled in "localrepository.commit()" is invoked 2. "changectx.__init__()" is invoked via "self.__contains__()" 3. specified ID is examined against "repo.dirstate.p1()" 4. validation function is invoked in "dirstate.p1()" In subsequent patches, "dirstate.invalidate()" invocations for discarding changes are replaced with "dirstateguard", but discarding changes by "dirstateguard" is executed after releasing the store lock: resources are acquired in "wlock => dirstateguard => store lock" order, and are released in reverse order. This may cause that "dirstate.p1()" still refers to the changeset to be rolled-back at (4) above: pushing multiple patches by "hg qpush" is a typical case. When releasing the store lock, such changesets are: - not contained in "repo.changelog", if it is reloaded from ".hg/00changelog.i", as that file was already truncated by "transaction.abort()" - still contained in it, otherwise (this "dirty read" problem is discussed in "Transaction Plan" http://mercurial.selenic.com/wiki/TransactionPlan) Validation function shows "unknown working parent" warning in the former case, but reloading "repo.changelog" depends on the timestamp of ".hg/00changelog.i". This causes occasional test failures. In the case of scheduled "commithook()", it just wants to examine whether "node ID" of committed changeset is still valid or not. Other examinations implied in "changectx.__init__()" are meaningless. To avoid showing the "unknown working parent" warning irregularly, this patch uses "changelog.hasnode()" instead of "node in self" to examine existence of committed changeset.

Takumi IINO - - Load All Authors

File last commit:

r20254:3896debf default


                r24992:7df090c9

default

Download file

             shortlog.tmpl
        
                    58 lines
            
             | 1.9 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / shortlog.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

      <title>{repo|escape}: Shortlog</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} / shortlog

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

              r9999
            
      </div>

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

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

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

              r9999
            
      {sessionvars%hiddenformentry}

      <div class="search">

      <input type="text" name="rev"  />

      </div>

      </form>

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

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

              r9999
            
      shortlog |

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

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

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

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

      <a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |

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

        Nicolas Dumazet
    
hgweb: changenav: separate pages before and after the current position...

              r10254
            
      <br/>{changenav%navshort}<br/>

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

              r9999
            
      </div>

      <div class="title">&nbsp;</div>

        Takumi IINO
    
hgweb: infinite scroll support for gitweb style

              r20254
            
      <table class="shortlogtable" cellspacing="0">

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

              r9999
            
      {entries%shortlogentry}

      </table>

      <div class="page_nav">

        Nicolas Dumazet
    
hgweb: changenav: separate pages before and after the current position...

              r10254
            
      {changenav%navshort}

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

              r9999
            
      </div>

        Takumi IINO
    
hgweb: infinite scroll support for gitweb style

              r20254
            
      <script type="text/javascript">

          ajaxScrollInit(

                  '{url|urlescape}shortlog/%next%{sessionvars%urlparameter}',

                  '{nextentry%"{node}"}', <!-- NEXTHASH

                  function (htmlText, previousVal) \{

                      var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);

                      return m ? m[1] : null;

                  },

                  '.shortlogtable > tbody:nth-of-type(1)',

                  '<tr class="%class%">\

                  <td colspan="4" style="text-align: center;">%text%</td>\

                  </tr>'

          );

      </script>

        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}: Shortlog</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} / shortlog
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<form action="{url\|urlescape}log">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{sessionvars%hiddenformentry}
		<div class="search">
		<input type="text" name="rev" />
		</div>
		</form>
		<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> \|
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	shortlog \|
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}log/{rev}{sessionvars%urlparameter}">changelog</a> \|
		<a href="{url\|urlescape}graph{sessionvars%urlparameter}">graph</a> \|
		<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> \|
		<a href="{url\|urlescape}file/{node\|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} \|
		<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	<br/>{changenav%navshort}<br/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="title"> </div>
Takumi IINO hgweb: infinite scroll support for gitweb style	r20254	<table class="shortlogtable" cellspacing="0">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{entries%shortlogentry}
		</table>

		<div class="page_nav">
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	{changenav%navshort}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

Takumi IINO hgweb: infinite scroll support for gitweb style	r20254	<script type="text/javascript">
		ajaxScrollInit(
		'{url\|urlescape}shortlog/%next%{sessionvars%urlparameter}',
		'{nextentry%"{node}"}', <!-- NEXTHASH
		function (htmlText, previousVal) \{
		var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);
		return m ? m[1] : null;
		},
		'.shortlogtable > tbody:nth-of-type(1)',
		'<tr class="%class%">\
		<td colspan="4" style="text-align: center;">%text%</td>\
		</tr>'
		);
		</script>

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{footer}