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

filectx: add isabsent method...

filectx: add isabsent method This will indicate whether this filectx represents a file that is *not* in a changectx. This will be used by merge and filemerge code to know about when a conflict is a change/delete conflict. While this is kind of hacky, it is the least bad of all the alternatives. Other options considered but rejected include: - isinstance(fctx, ...) -- not very Pythonic, doesn't support duck typing - fctx.size() is None -- the 'size()' call on workingfilectxes causes a disk stat - fctx.filenode() == nullid -- the semantics around filenode are incredibly confusing. In particular, for workingfilectxes, filenode() is always None no matter whether the file is present on disk or in either parent. Having different behavior for None versus nullid in the merge code is just asking for pain. Thanks to Pierre-Yves David for early review feedback here.

Angel Ezquerra - - Load All Authors

File last commit:

r18628:52305554 default


                r26978:9b9d4bcc

default

Download file

             changelogentry.tmpl
        
                    14 lines
            
             | 586 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / changelogentry.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      <div>

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

              r18526
            
      <a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}"><span class="age">{date|rfc822date}</span>{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>

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

              r9999
            
      </div>

      <div class="title_text">

      <div class="log_link">

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

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

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

              r9999
            
      </div>

      <i>{author|obfuscate} [{date|rfc822date}] rev {rev}</i><br/>

      </div>

      <div class="log_body">

        Angel Ezquerra
    
hgweb: apply the websub filter to revision descriptions...

              r18628
            
      {desc|strip|escape|websub|addbreaks|nonempty}

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

              r9999
            
      <br/>

      <br/>

      </div>

	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	<div>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a class="title" href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}"><span class="age">{date\|rfc822date}</span>{desc\|strip\|firstline\|escape\|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		<div class="title_text">
		<div class="log_link">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">changeset</a><br/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		<i>{author\|obfuscate} [{date\|rfc822date}] rev {rev}</i><br/>
		</div>
		<div class="log_body">
Angel Ezquerra hgweb: apply the websub filter to revision descriptions...	r18628	{desc\|strip\|escape\|websub\|addbreaks\|nonempty}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<br/>
		<br/>
		</div>