upstream/mercurial-mirror Files · mercurial/templates/monoblue/summary.tmpl

unshelve: disable unshelve during merge (issue5123)...

unshelve: disable unshelve during merge (issue5123) As stated in the issue5123, unshelve can destroy the second parent of the context when tried to unshelve with an uncommitted merge. This patch makes unshelve to abort when called with an uncommitted merge. See how shelve.mergefiles works. Commit structure looks like this: ``` ... -> pctx -> tmpwctx -> shelvectx / / second merge parent pctx = parent before merging working context(first merge parent) tmpwctx = commited working directory after merge(with two parents) shelvectx = shelved context ``` shelve.mergefiles first updates to pctx then it reverts shelvectx to pctx with: ``` cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), *pathtofiles(repo, files), **{'no_backup': True}) ``` Reverting tmpwctx files that were merged from second parent to pctx makes them added because they are not in pctx. Changing this revert operation is crucial to restore parents after unshelve. This is a complicated issue as this is not fixing a regression. Thus, for the time being, unshelve during an uncommitted merge can be aborted. (Details taken from http://mercurial.808500.n3.nabble.com/PATCH-V3-shelve-restore-parents-after-unshelve-issue5123-tt4036858.html#a4037408) Differential Revision: https://phab.mercurial-scm.org/D6169

Yuya Nishihara - - Load All Authors

File last commit:

r37419:7d94fe3e default


                r42217:03f6480b

default

Download file

             summary.tmpl
        
                    71 lines
            
             | 2.8 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / summary.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

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

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

              r18526
            
          <link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>

          <link rel="alternate" type="application/rss+xml" 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 id="container">

          <div class="page-header">

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

              r18258
            
              <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / summary</h1>

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

              r9999
            
        Gregory Szorc
    
hgweb: consolidate search form for monoblue...

              r32759
            
              {searchform}

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

              r9999
            
              <ul class="page-nav">

                  <li class="current">summary</li>

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

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

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

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

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

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

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

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

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

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

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

        av6
    
monoblue: add archive links on summary page

              r26114
            
                  {archives%archiveentry}

        Anton Shestakov
    
hgweb: don't mix tabs and spaces in monoblue templates

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

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

              r9999
            
              </ul>

          </div>

          <h2 class="no-link no-border">Mercurial Repository Overview</h2>

          <dl class="overview">

              <dt>name</dt>

              <dd>{repo|escape}</dd>

              <dt>description</dt>

              <dd>{desc}</dd>

              <dt>owner</dt>

              <dd>{owner|obfuscate}</dd>

              <dt>last change</dt>

        av6
    
hgweb: show changeset age in more places (gitweb and monoblue)...

              r35136
            
              <dd class="date age">{lastchange|rfc822date}</dd>

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

              r9999
            
          </dl>

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

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

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

              r9999
            
          <table>

        Yuya Nishihara
    
hgweb: fix summary {tags} and {shortlog} to not forcibly expand template...

              r37419
            
      {shortlog%shortlogentry}

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

              r9999
            
              <tr class="light">

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

              r18526
            
                  <td colspan="4"><a class="list" href="{url|urlescape}shortlog{sessionvars%urlparameter}">...</a></td>

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

              r9999
            
              </tr>

          </table>

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

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

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

              r9999
            
          <table>

        Yuya Nishihara
    
hgweb: fix summary {tags} and {shortlog} to not forcibly expand template...

              r37419
            
      {tags%tagentry}

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

              r9999
            
              <tr class="light">

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

              r18526
            
                  <td colspan="3"><a class="list" href="{url|urlescape}tags{sessionvars%urlparameter}">...</a></td>

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

              r9999
            
              </tr>

          </table>

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

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

        Yuya Nishihara
    
hgweb: add bookmarks listing to summary page of gitweb/monoblue styles

              r13924
            
          <table>

          {bookmarks%bookmarkentry}

              <tr class="light">

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

              r18526
            
                  <td colspan="3"><a class="list" href="{url|urlescape}bookmarks{sessionvars%urlparameter}">...</a></td>

        Yuya Nishihara
    
hgweb: add bookmarks listing to summary page of gitweb/monoblue styles

              r13924
            
              </tr>

          </table>

        av6
    
monoblue: link to branches on summary page...

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

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

              r9999
            
          <table>

          {branches%branchentry}

              <tr class="light">

        av6
    
monoblue: tweak branch table's last row's cell colspan on summary page...

              r29983
            
                <td colspan="3"><a class="list" href="{url|urlescape}branches{sessionvars%urlparameter}">...</a></td>

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

              r9999
            
              </tr>

          </table>

      {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}: Summary</title>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<link rel="alternate" type="application/atom+xml" href="{url\|urlescape}atom-log" title="Atom feed for {repo\|escape}"/>
		<link rel="alternate" type="application/rss+xml" 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 id="container">
		<div class="page-header">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / summary</h1>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Gregory Szorc hgweb: consolidate search form for monoblue...	r32759	{searchform}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<ul class="page-nav">
		<li class="current">summary</li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
		<li><a href="{url\|urlescape}log{sessionvars%urlparameter}">changelog</a></li>
av6 hgweb: don't point graph links at tip hash where it doesn't make sense...	r25525	<li><a href="{url\|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
		<li><a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
		<li><a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
av6 hgweb: don't point file links at tip hash where it doesn't make sense...	r25526	<li><a href="{url\|urlescape}file{sessionvars%urlparameter}">files</a></li>
av6 monoblue: add archive links on summary page	r26114	{archives%archiveentry}
Anton Shestakov hgweb: don't mix tabs and spaces in monoblue templates	r24129	<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		</div>

		<h2 class="no-link no-border">Mercurial Repository Overview</h2>
		<dl class="overview">
		<dt>name</dt>
		<dd>{repo\|escape}</dd>
		<dt>description</dt>
		<dd>{desc}</dd>
		<dt>owner</dt>
		<dd>{owner\|obfuscate}</dd>
		<dt>last change</dt>
av6 hgweb: show changeset age in more places (gitweb and monoblue)...	r35136	<dd class="date age">{lastchange\|rfc822date}</dd>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</dl>

Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<h2><a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">Changes</a></h2>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<table>
Yuya Nishihara hgweb: fix summary {tags} and {shortlog} to not forcibly expand template...	r37419	{shortlog%shortlogentry}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<tr class="light">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<td colspan="4"><a class="list" href="{url\|urlescape}shortlog{sessionvars%urlparameter}">...</a></td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>
		</table>

Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<h2><a href="{url\|urlescape}tags{sessionvars%urlparameter}">Tags</a></h2>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<table>
Yuya Nishihara hgweb: fix summary {tags} and {shortlog} to not forcibly expand template...	r37419	{tags%tagentry}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<tr class="light">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<td colspan="3"><a class="list" href="{url\|urlescape}tags{sessionvars%urlparameter}">...</a></td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>
		</table>

Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<h2><a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">Bookmarks</a></h2>
Yuya Nishihara hgweb: add bookmarks listing to summary page of gitweb/monoblue styles	r13924	<table>
		{bookmarks%bookmarkentry}
		<tr class="light">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<td colspan="3"><a class="list" href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">...</a></td>
Yuya Nishihara hgweb: add bookmarks listing to summary page of gitweb/monoblue styles	r13924	</tr>
		</table>

av6 monoblue: link to branches on summary page...	r25873	<h2><a href="{url\|urlescape}branches{sessionvars%urlparameter}">Branches</a></h2>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<table>
		{branches%branchentry}
		<tr class="light">
av6 monoblue: tweak branch table's last row's cell colspan on summary page...	r29983	<td colspan="3"><a class="list" href="{url\|urlescape}branches{sessionvars%urlparameter}">...</a></td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>
		</table>
		{footer}