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

discovery: properly filter changeset in 'peer.known' (issue4982)...

discovery: properly filter changeset in 'peer.known' (issue4982) The 'peer.known' call (handled at the repository level) was applying its own manual filtering (looking at phases) instead of relying on the repoview mechanism. This led to the discovery finding more "common" node that 'getbundle' was willing to recognised. From there, bad things happen, issue4982 is a symptom of it. While situations like described in issue4982 can still happen because of race conditions, fixing 'peer.known' is important for consistency in all cases. We update the code to use 'repoview' filtering. This lead to small changes in the tests for exchanging obsolescence marker because the discovery yields different results. The test affected in 'test-obsolete-changeset-exchange.t' is a test for issue4982 getting back to its expected state.

av6 - - Load All Authors

File last commit:

r26666:e901df65 default


                r27319:b64b6fdc

default

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}