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

context: skip path conflicts by default when clearing unknown file (issue5776)...

context: skip path conflicts by default when clearing unknown file (issue5776) Prior to adding path conflict checking in 989e884d1be9, the test-audit-path.t tests failed as shown here (but it was globbed away). made it fail with a message about the destination manifest containing a conflict (though the no-symlink case wasn't updated). When the path conflict checking was gated behind an experimental config in 2a774cae3a03^::2a774cae3a03, the update started erroneously succeeding here. It turns out that the child of is the origin of this change when path conflict checking is disabled, as shown by grafting the experimental config range on top of it. What's happening here is merge.batchget() is writing the symlink 'back' to wdir (but as a regular file for the no-symlink case), and then tries to write 'back/test', but calls wctx['back/test'].clearunknown() first. The code that's gated here was removing the newly written 'back' file, allowing 'back/test' to succeed. I tried checking for the dir components of 'back/test' in dirstate, and skipping removal if present. But that didn't work because the dirstate isn't updated after each file is written out. This is the last persistent test failure on Windows, so the testbot should start turning green now. \o/

Gregory Szorc - - Load All Authors

File last commit:

r32759:265196cd default


                r37119:656ac240

default

Download file

             bookmarks.tmpl
        
                    32 lines
            
             | 1.4 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / bookmarks.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r13860
            
      {header}

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

        av6
    
monoblue: correct feed links on /branches, /tags and /bookmarks

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

          <link rel="alternate" type="application/rss+xml" href="{url|urlescape}rss-bookmarks" title="RSS feed for {repo|escape}: bookmarks"/>

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

              r13860
            
      </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} / bookmarks</h1>

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

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

              r32759
            
              {searchform}

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

              r13860
            
              <ul class="page-nav">

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

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

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

                  <li><a href="{url|urlescape}changelog{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>

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

              r13860
            
                  <li class="current">bookmarks</li>

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

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

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

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

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

              r13860
            
              </ul>

          </div>

          <h2 class="no-link no-border">bookmarks</h2>

          <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 monoblue theme (based on 38c9837b1f75)	r13860	{header}
		<title>{repo\|escape}: Bookmarks</title>
av6 monoblue: correct feed links on /branches, /tags and /bookmarks	r27550	<link rel="alternate" type="application/atom+xml" href="{url\|urlescape}atom-bookmarks" title="Atom feed for {repo\|escape}: bookmarks"/>
		<link rel="alternate" type="application/rss+xml" href="{url\|urlescape}rss-bookmarks" title="RSS feed for {repo\|escape}: bookmarks"/>
Yuya Nishihara hgweb: add separate bookmarks listing to monoblue theme (based on 38c9837b1f75)	r13860	</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} / bookmarks</h1>
Yuya Nishihara hgweb: add separate bookmarks listing to monoblue theme (based on 38c9837b1f75)	r13860
Gregory Szorc hgweb: consolidate search form for monoblue...	r32759	{searchform}
Yuya Nishihara hgweb: add separate bookmarks listing to monoblue theme (based on 38c9837b1f75)	r13860
		<ul class="page-nav">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
		<li><a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
		<li><a href="{url\|urlescape}changelog{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>
Yuya Nishihara hgweb: add separate bookmarks listing to monoblue theme (based on 38c9837b1f75)	r13860	<li class="current">bookmarks</li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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>
Anton Shestakov hgweb: don't mix tabs and spaces in monoblue templates	r24129	<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
Yuya Nishihara hgweb: add separate bookmarks listing to monoblue theme (based on 38c9837b1f75)	r13860	</ul>
		</div>

		<h2 class="no-link no-border">bookmarks</h2>
		<table cellspacing="0">
		{entries%bookmarkentry}
		</table>

		{footer}