upstream/mercurial-mirror Files · mercurial/templates/spartan/changelogentry.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/

av6 - - Load All Authors

File last commit:

r37042:7c18798f default


                r37119:656ac240

default

Download file

             changelogentry.tmpl
        
                    31 lines
            
             | 973 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / changelogentry.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      <table class="logEntry parity{parity}">

       <tr>

        FUJIWARA Katsunori
    
hgweb: align entries in "changelog" and "revisions" pages of "spartan" style...

              r21124
            
        <th class="label"><span class="age">{date|rfc822date}</span>:</th>

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

              r9999
            
        <th class="firstline">{desc|strip|firstline|escape|nonempty}</th>

       </tr>

       <tr>

        <th class="revision">changeset {rev}:</th>

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

              r18526
            
        <td class="node"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>

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

              r9999
            
       </tr>

       {parent%changelogparent}

       {child%changelogchild}

       {changelogtag}

       <tr>

        <th class="author">author:</th>

        <td class="author">{author|obfuscate}</td>

       </tr>

       <tr>

        <th class="date">date:</th>

        Brodie Rao
    
hgweb: fix dynamic date calculation not working under Safari...

              r15375
            
        <td class="date">{date|rfc822date}</td>

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

              r9999
            
       </tr>

        av6
    
hgweb: show commit phase if it's not public...

              r35064
            
       {ifeq(phase, 'public', '', '<tr>

        <th class="phase">phase:</th>

        <td class="phase">{phase|escape}</td>

       </tr>')}

        av6
    
hgweb: show each obsfateentry on its own line...

              r36340
            
       {if(obsolete, succsandmarkers%obsfateentry)}

        av6
    
hgweb: explain instabilities of unstable changesets (the rest of the themes)

              r37042
            
       {if(instabilities, whyunstable%whyunstableentry)}

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

              r9999
            
       <tr>

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

              r18526
            
        <th class="files"><a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>:</th>

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

              r9999
            
        <td class="files">{files}</td>

       </tr>

      </table>

	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	<table class="logEntry parity{parity}">
		<tr>
FUJIWARA Katsunori hgweb: align entries in "changelog" and "revisions" pages of "spartan" style...	r21124	<th class="label"><span class="age">{date\|rfc822date}</span>:</th>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<th class="firstline">{desc\|strip\|firstline\|escape\|nonempty}</th>
		</tr>
		<tr>
		<th class="revision">changeset {rev}:</th>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<td class="node"><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>
		{parent%changelogparent}
		{child%changelogchild}
		{changelogtag}
		<tr>
		<th class="author">author:</th>
		<td class="author">{author\|obfuscate}</td>
		</tr>
		<tr>
		<th class="date">date:</th>
Brodie Rao hgweb: fix dynamic date calculation not working under Safari...	r15375	<td class="date">{date\|rfc822date}</td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>
av6 hgweb: show commit phase if it's not public...	r35064	{ifeq(phase, 'public', '', '<tr>
		<th class="phase">phase:</th>
		<td class="phase">{phase\|escape}</td>
		</tr>')}
av6 hgweb: show each obsfateentry on its own line...	r36340	{if(obsolete, succsandmarkers%obsfateentry)}
av6 hgweb: explain instabilities of unstable changesets (the rest of the themes)	r37042	{if(instabilities, whyunstable%whyunstableentry)}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<tr>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<th class="files"><a href="{url\|urlescape}file/{node\|short}{sessionvars%urlparameter}">files</a>:</th>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<td class="files">{files}</td>
		</tr>
		</table>