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

dirstate: fix restoration of "merged" state after a remove...

dirstate: fix restoration of "merged" state after a remove Before this change, "merged" file that get removed and re-added later were recorded as "from_p2" instead. This came from 8fe74328f700, a 2014 changeset that start explicitly doing so for reason I have not been able to fully grasp. The graft test mentioned in the description are still happy after this changeset. So this changeset restore what seems to be the intended behavior. Restoring information as it was before the removal. Differential Revision: https://phab.mercurial-scm.org/D11429

Gregory Szorc - - Load All Authors

File last commit:

r32762:2d93d215 default


                r48803:87b3010c

default

Download file

             bookmarks.tmpl
        
                    35 lines
            
             | 1.2 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / bookmarks.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Yuya Nishihara
    
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)

              r13864
            
      {header}

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

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

        av6
    
gitweb: describe feed type in links on /branches, /tags and /bookmarks

              r27549
            
         href="{url|urlescape}atom-bookmarks" title="Atom feed for {repo|escape}: bookmarks"/>

        Yuya Nishihara
    
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)

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

        av6
    
gitweb: describe feed type in links on /branches, /tags and /bookmarks

              r27549
            
         href="{url|urlescape}rss-bookmarks" title="RSS feed for {repo|escape}: bookmarks"/>

        Yuya Nishihara
    
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)

              r13864
            
      </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} / bookmarks

        Yuya Nishihara
    
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)

              r13864
            
      </div>

      <div class="page_nav">

        Gregory Szorc
    
hgweb: refresh styling of gitweb's search form...

              r32762
            
      <div>

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

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

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

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

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

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

        Yuya Nishihara
    
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)

              r13864
            
      bookmarks |

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

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

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

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

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

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

        Gregory Szorc
    
hgweb: refresh styling of gitweb's search form...

              r32762
            
      </div>

      {searchform}

        Yuya Nishihara
    
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)

              r13864
            
      </div>

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

      <table cellspacing="0">

      {entries%bookmarkentry}

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

Yuya Nishihara hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)	r13864	{header}
		<title>{repo\|escape}: Bookmarks</title>
		<link rel="alternate" type="application/atom+xml"
av6 gitweb: describe feed type in links on /branches, /tags and /bookmarks	r27549	href="{url\|urlescape}atom-bookmarks" title="Atom feed for {repo\|escape}: bookmarks"/>
Yuya Nishihara hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)	r13864	<link rel="alternate" type="application/rss+xml"
av6 gitweb: describe feed type in links on /branches, /tags and /bookmarks	r27549	href="{url\|urlescape}rss-bookmarks" title="RSS feed for {repo\|escape}: bookmarks"/>
Yuya Nishihara hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)	r13864	</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} / bookmarks
Yuya Nishihara hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)	r13864	</div>

		<div class="page_nav">
Gregory Szorc hgweb: refresh styling of gitweb's search form...	r32762	<div>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a> \|
		<a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> \|
		<a href="{url\|urlescape}log{sessionvars%urlparameter}">changelog</a> \|
		<a href="{url\|urlescape}graph{sessionvars%urlparameter}">graph</a> \|
		<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a> \|
Yuya Nishihara hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)	r13864	bookmarks \|
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a> \|
av6 hgweb: don't point file links at tip hash where it doesn't make sense...	r25526	<a href="{url\|urlescape}file{sessionvars%urlparameter}">files</a> \|
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
Gregory Szorc hgweb: refresh styling of gitweb's search form...	r32762	</div>
		{searchform}
Yuya Nishihara hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)	r13864	</div>

		<div class="title"> </div>
		<table cellspacing="0">
		{entries%bookmarkentry}
		</table>

		{footer}