upstream/mercurial-mirror Files · mercurial/templates/spartan/fileannotate.tmpl

merge: add a config to allow conflict-free merge of changes on adjacent lines...

merge: add a config to allow conflict-free merge of changes on adjacent lines This change adds a config to make it no longer a conflict to merge changes made on adjacent lines. The reason these changes are considered a conflict is that there's no region of text at the relevant position (sync region) that's kept unchanged by both sides of the merge. The problem can be solved by making the sync regions being a bit more powerful: we can keep a 0-length sync region if we find that a block unchanged by one side is ajacent to a block unchanged by the other side. Since these 0-length sync regions are emitted using the ~same algorithm as the normal non-empty sync regions, this change involves no arbitrary decisions and I expect it to work pretty well. 0-length sync regions do create an ambiguity in a special case where two pairs of adjacent regions "meet" at the same point. This corresponds to an insertion made at the same place by the two sides of the merge, and this still results in a conflict.

Gregory Szorc - - Load All Authors

File last commit:

r30708:011122b3 default


                r52974:a021da4e

default

Download file

             fileannotate.tmpl
        
                    51 lines
            
             | 1.7 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / fileannotate.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

      <title>{repo|escape}: {file|escape} annotate</title>

      </head>

      <body>

      <div class="buttons">

        av6
    
hgweb: don't dereference symbolic revision in spartan style...

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

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

        av6
    
spartan: don't drop current revision in log/graph links...

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

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

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

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

        av6
    
hgweb: don't dereference symbolic revision in spartan style...

              r25603
            
      <a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a>

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

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

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

        Gregory Szorc
    
hgweb: link to raw-file on annotation page (BC)...

              r30708
            
      <a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a>

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

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

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

              r9999
            
      </div>

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb, spartan: add "URL breadcrumbs"...

              r18259
            
      <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / annotate {file|escape}</h2>

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

              r9999
            
      <table>

      <tr>

       <td class="metatag">changeset {rev}:</td>

        Anton Shestakov
    
hgweb: clearly outline <tr> block in gitweb and spartan styles...

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

      </tr>

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

              r9999
            
      {parent%fileannotateparent}

      {child%fileannotatechild}

      <tr>

       <td class="metatag">author:</td>

        Anton Shestakov
    
hgweb: clearly outline <tr> block in gitweb and spartan styles...

              r24999
            
       <td>{author|obfuscate}</td>

      </tr>

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

              r9999
            
      <tr>

       <td class="metatag">date:</td>

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

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

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

              r9999
            
      </tr>

      <tr>

       <td class="metatag">permissions:</td>

       <td>{permissions|permissions}</td>

      </tr>

      <tr>

        <td class="metatag">description:</td>

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

              r18628
            
        <td>{desc|strip|escape|websub|addbreaks|nonempty}</td>

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

              r9999
            
      </tr>

      </table>

      <table cellspacing="0" cellpadding="0">

      {annotate%annotateline}

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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<title>{repo\|escape}: {file\|escape} annotate</title>
		</head>
		<body>

		<div class="buttons">
av6 hgweb: don't dereference symbolic revision in spartan style...	r25603	<a href="{url\|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a>
		<a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a>
av6 spartan: don't drop current revision in log/graph links...	r25794	<a href="{url\|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a>
		<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a>
av6 hgweb: don't dereference symbolic revision in spartan style...	r25603	<a href="{url\|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a>
		<a href="{url\|urlescape}file/{symrev}{path\|urlescape}{sessionvars%urlparameter}">files</a>
		<a href="{url\|urlescape}file/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">file</a>
		<a href="{url\|urlescape}log/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">revisions</a>
Gregory Szorc hgweb: link to raw-file on annotation page (BC)...	r30708	<a href="{url\|urlescape}raw-file/{symrev}/{file\|urlescape}">raw</a>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

Angel Ezquerra <angel.ezquerra at gmail.com> hgweb, spartan: add "URL breadcrumbs"...	r18259	<h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / annotate {file\|escape}</h2>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<table>
		<tr>
		<td class="metatag">changeset {rev}:</td>
Anton Shestakov hgweb: clearly outline <tr> block in gitweb and spartan styles...	r24999	<td><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>
		</tr>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{parent%fileannotateparent}
		{child%fileannotatechild}
		<tr>
		<td class="metatag">author:</td>
Anton Shestakov hgweb: clearly outline <tr> block in gitweb and spartan styles...	r24999	<td>{author\|obfuscate}</td>
		</tr>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<tr>
		<td class="metatag">date:</td>
Brodie Rao hgweb: fix dynamic date calculation not working under Safari...	r15375	<td class="date age">{date\|rfc822date}</td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>
		<tr>
		<td class="metatag">permissions:</td>
		<td>{permissions\|permissions}</td>
		</tr>
		<tr>
		<td class="metatag">description:</td>
Angel Ezquerra hgweb: apply the websub filter to revision descriptions...	r18628	<td>{desc\|strip\|escape\|websub\|addbreaks\|nonempty}</td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>
		</table>

		<table cellspacing="0" cellpadding="0">
		{annotate%annotateline}
		</table>

		{footer}