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

copies: detect files as `touched/salvaged` if they only existed on one side...

copies: detect files as `touched/salvaged` if they only existed on one side The file cannot be merged if there was content to merge on the other side. So the previous record was wrong. In the general case, the file existed only on one side and got touched during the merge. So it should detected as touched. They are a special case where the merge manually prevent the file to be deleted. In this case the file is marked as `salvaged`. The result of this `salvaged` recording, copy-tracing-wise, is the same as recording it as `merged`. This is probably why they were recorded as `merged` in the first place. Differential Revision: https://phab.mercurial-scm.org/D10219

av6 - - Load All Authors

File last commit:

r35052:e9a8a941 default


                r47570:c52c3c4c

default

Download file

             changelogentry.tmpl
        
                    11 lines
            
             | 467 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / changelogentry.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        av6
    
hgweb: split long lines in gitweb and monoblue (changeset summary and tags)

              r35051
            
      <h3 class="changelog">

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

              {desc|strip|firstline|escape|nonempty}

        av6
    
hgweb: move changeset "tags" to a template in map file (gitweb and monoblue)...

              r35052
            
              {alltags}

        av6
    
hgweb: split long lines in gitweb and monoblue (changeset summary and tags)

              r35051
            
          </a>

      </h3>

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

              r9999
            
      <ul class="changelog-entry">

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

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

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

              r9999
            
          <li>by <span class="name">{author|obfuscate}</span> <span class="revdate">[{date|rfc822date}] rev {rev}</span></li>

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

              r18628
            
          <li class="description">{desc|strip|escape|websub|addbreaks|nonempty}</li>

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

              r9999
            
      </ul>

	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

av6 hgweb: split long lines in gitweb and monoblue (changeset summary and tags)	r35051	<h3 class="changelog">
		<a class="title" href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">
		{desc\|strip\|firstline\|escape\|nonempty}
av6 hgweb: move changeset "tags" to a template in map file (gitweb and monoblue)...	r35052	{alltags}
av6 hgweb: split long lines in gitweb and monoblue (changeset summary and tags)	r35051	</a>
		</h3>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<ul class="changelog-entry">
Brodie Rao hgweb: fix dynamic date calculation not working under Safari...	r15375	<li class="age">{date\|rfc822date}</li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<li>by <span class="name">{author\|obfuscate}</span> <span class="revdate">[{date\|rfc822date}] rev {rev}</span></li>
Angel Ezquerra hgweb: apply the websub filter to revision descriptions...	r18628	<li class="description">{desc\|strip\|escape\|websub\|addbreaks\|nonempty}</li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>