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

subrepo: allows to drop courtesy phase sync (issue3781)...

subrepo: allows to drop courtesy phase sync (issue3781) Publishing server may contains draft changeset when they are created locally. As publishing is the default, it is actually fairly common. Because of this "inconsistency" phases synchronization may be done even to publishing server. This may cause severe issues for subrepo. It is possible to reference read-only repository as subrepo. Push in a super repo recursively push subrepo. Those pushes to potential read only repo are not optional, they are "suffered" not "choosed". This does not break because as the repo is untouched the push is supposed to be empty. If the reference repo locally contains draft changesets, a courtesy push is triggered to turn them public. As the repo is read only, the push fails (after possible prompt asking for credential). Failure of the sub-push aborts the whole subrepo push. This force the user to define a custom default-push for such subrepo. This changeset introduce a prevention of this error client side by skipping the courtesy phase synchronisation in problematic situation. The phases synchronisation is skipped when four conditions are gathered: - this is a subrepo push, (normal push to read-only repo) - and remote support phase - and remote is publishing - and no changesets was pushed (if we pushed changesets, repo is not read only) The internal config option used in this version is not definitive. It is here to demonstrate a working fix to the issue. In the future we probably wants to track subrepo changes and avoid pushing to untouched one. That will prevent any attempt to push to read-only or unreachable subrepo. Another fix to prevent courtesy push from older clients to push to newer server is also still needed.

Angel Ezquerra <angel.ezquerra at gmail.com> - - Load All Authors

File last commit:

r18258:bebb05a7 default


                r18520:751135cc

stable

Download file

             branches.tmpl
        
                    66 lines
            
             | 1.7 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / branches.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

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

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

        Angel Ezquerra
    
hgweb: add branches RSS and Atom feeds...

              r18045
            
         href="{url}atom-branches" title="Atom feed for {repo|escape}: branches" />

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

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

        Angel Ezquerra
    
hgweb: add branches RSS and Atom feeds...

              r18045
            
         href="{url}rss-branches" title="RSS feed for {repo|escape}: branches" />

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

              r9999
            
      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

        Steven Stallion
    
hgweb: support alternate logo url...

              r13964
            
      <a href="{logourl}">

        Angel Ezquerra
    
hgweb: add a "web/logoimg" setting to customize the web logo image...

              r14913
            
      <img src="{staticurl}{logoimg}" alt="mercurial" /></a>

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

              r9999
            
      </div>

      <ul>

      <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li>

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

      <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>

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

              r9999
            
      <li class="active">branches</li>

      </ul>

        Pradeepkumar Gayam
    
templates: fix inconsistency in 'help' link

              r12846
            
      <ul>

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

      </ul>

        Angel Ezquerra
    
hgweb: add (Atom) subscribe link to the main paper template pages...

              r18200
            
      <p>

      <div class="atom-logo">

      <a href="{url}atom-branches" title="subscribe to atom feed">

      <img class="atom-logo" src="{staticurl}feed-icon-14x14.png" alt="atom feed">

      </a>

      </div>

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

              r9999
            
      </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>branches</h3>

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

      {sessionvars%hiddenformentry}

      <p><input name="rev" id="search1" type="text" size="30" /></p>

      <div id="hint">find changesets by author, revision,

      files, or words in the commit message</div>

      </form>

      <table class="bigtable">

      <tr>

       <th>branch</th>

       <th>node</th>

      </tr>

        Matt Mackall
    
templater: use the parser.py parser to extend the templater syntax

              r13176
            
      {entries %

      ' <tr class="tagEntry parity{parity}">

          <td>

            <a href="{url}shortlog/{node|short}{sessionvars%urlparameter}" class="{status}">

              {branch|escape}

            </a>

          </td>

          <td class="node">

            {node|short}

          </td>

        </tr>'

      }

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

              r9999
            
      </table>

      </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}: branches</title>
		<link rel="alternate" type="application/atom+xml"
Angel Ezquerra hgweb: add branches RSS and Atom feeds...	r18045	href="{url}atom-branches" title="Atom feed for {repo\|escape}: branches" />
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<link rel="alternate" type="application/rss+xml"
Angel Ezquerra hgweb: add branches RSS and Atom feeds...	r18045	href="{url}rss-branches" title="RSS feed for {repo\|escape}: branches" />
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</head>
		<body>

		<div class="container">
		<div class="menu">
		<div class="logo">
Steven Stallion hgweb: support alternate logo url...	r13964	<a href="{logourl}">
Angel Ezquerra hgweb: add a "web/logoimg" setting to customize the web logo image...	r14913	<img src="{staticurl}{logoimg}" alt="mercurial" /></a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		<ul>
		<li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li>
		<li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li>
		<li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<li class="active">branches</li>
		</ul>
Pradeepkumar Gayam templates: fix inconsistency in 'help' link	r12846	<ul>
		<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
		</ul>
Angel Ezquerra hgweb: add (Atom) subscribe link to the main paper template pages...	r18200	<p>
		<div class="atom-logo">
		<a href="{url}atom-branches" title="subscribe to atom feed">
		<img class="atom-logo" src="{staticurl}feed-icon-14x14.png" alt="atom feed">
		</a>
		</div>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</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>branches</h3>

		<form class="search" action="{url}log">
		{sessionvars%hiddenformentry}
		<p><input name="rev" id="search1" type="text" size="30" /></p>
		<div id="hint">find changesets by author, revision,
		files, or words in the commit message</div>
		</form>

		<table class="bigtable">
		<tr>
		<th>branch</th>
		<th>node</th>
		</tr>
Matt Mackall templater: use the parser.py parser to extend the templater syntax	r13176	{entries %
		' <tr class="tagEntry parity{parity}">
		<td>
		<a href="{url}shortlog/{node\|short}{sessionvars%urlparameter}" class="{status}">
		{branch\|escape}
		</a>
		</td>
		<td class="node">
		{node\|short}
		</td>
		</tr>'
		}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</table>
		</div>
		</div>

		{footer}