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

filemerge: add support for partial conflict resolution by external tool...

filemerge: add support for partial conflict resolution by external tool A common class of merge conflicts is in imports/#includes/etc. It's relatively easy to write a tool that can resolve these conflicts, perhaps by naively just unioning the statements and leaving any cleanup to other tools to do later [1]. Such specialized tools cannot generally resolve all conflicts in a file, of course. Let's therefore call them "partial merge tools". Note that the internal simplemerge algorithm is such a partial merge tool - one that only resolves trivial "conflicts" where one side is unchanged or both sides change in the same way. One can also imagine having smarter language-aware partial tools that merge the AST. It may be useful for such tools to interactively let the user resolve any conflicts it can't resolve itself. However, having the option of implementing it as a partial merge tool means that the developer doesn't *need* to create a UI for it. Instead, the user can resolve any remaining conflicts with their regular merge tool (e.g. `:merge3` or `meld). We don't currently have a way to let the user define such partial merge tools. That's what this patch addresses. It lets the user configure partial merge tools to run. Each tool can be configured to run only on files matching certain patterns (e.g. "*.py"). The tool takes three inputs (local, base, other) and resolves conflicts by updating these in place. For example, let's say the inputs are these: base: ``` import sys def main(): print('Hello') ``` local: ``` import os import sys def main(): print('Hi') ``` other: ``` import re import sys def main(): print('Howdy') ``` A partial merge tool could now resolve the conflicting imports by replacing the import statements in *all* files by the following snippet, while leaving the remainder of the files unchanged. ``` import os import re import sys ``` As a result, simplemerge and any regular merge tool that runs after the partial merge tool(s) will consider the imports to be non-conflicting and will only present the conflict in `main()` to the user. Differential Revision: https://phab.mercurial-scm.org/D12356

Gregory Szorc - - Load All Authors

File last commit:

r34392:6797f1fb default


                r49838:f3aafd78

default

Download file

             fileannotate.tmpl
        
                    85 lines
            
             | 2.9 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / 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}@{node|short} (annotated)</title>

      <link rel="alternate" type="application/atom+xml"

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

              r18526
            
         href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>

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

              r9999
            
      <link rel="alternate" type="application/rss+xml"

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

              r18526
            
         href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>

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

              r9999
            
      </head>

      <body>

      <div class="page_header">

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb: add a "URL breadcrumb" to the index and repository pages...

              r18258
            
      <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>

      <a href="/">Mercurial</a> {pathdef%breadcrumb} / annotate

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

              r9999
            
      </div>

      <div class="page_nav">

        Gregory Szorc
    
hgweb: refresh styling of gitweb's search form...

              r32762
            
      <div>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

              r9999
            
      annotate |

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

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

      <a href="{url|urlescape}comparison/{symrev}/{file|urlescape}{sessionvars%urlparameter}">comparison</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>

        Gregory Szorc
    
hgweb: refresh styling of gitweb's search form...

              r32762
            
      </div>

      {searchform}

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

              r9999
            
      </div>

      <div class="title">{file|escape}</div>

      <div class="title_text">

      <table cellspacing="0">

      <tr>

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

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

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

      </tr>

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

              r9999
            
      {branch%filerevbranch}

      <tr>

       <td>changeset {rev}</td>

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

              r24999
            
       <td style="font-family:monospace"><a class="list" 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>permissions</td>

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

              r24999
            
       <td style="font-family:monospace">{permissions|permissions}</td>

      </tr>

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

              r9999
            
      </table>

      </div>

        Gregory Szorc
    
gitweb: preserve whitespace in description...

              r33557
            
      <div class="page_path description">{desc|strip|escape|websub|nonempty}</div>

        Gregory Szorc
    
hgweb: add HTML elements to control whitespace settings for annotate...

              r34392
            
      {diffoptsform}

      <script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}>

          renderDiffOptsForm();

      </script>

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

              r9999
            
      <div class="page_body">

      <table>

        Denis Laxalde
    
hgweb: plug followlines action in annotate view...

              r32994
            
      <tbody class="sourcelines"

             data-logurl="{url|urlescape}log/{symrev}/{file|urlescape}"

             data-selectabletag="TR"

             data-ishead="{ishead}">

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

              r9999
            
      {annotate%annotateline}

        Denis Laxalde
    
gitweb: wrap table rows of annotate view into a <tbody> element...

              r32992
            
      </tbody>

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

              r9999
            
      </table>

      </div>

        Denis Laxalde
    
hgweb: plug followlines action in annotate view...

              r32994
            
      <script type="text/javascript" src="{staticurl|urlescape}followlines.js"></script>

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

              r9999
            
      {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}@{node\|short} (annotated)</title>
		<link rel="alternate" type="application/atom+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}atom-log" title="Atom feed for {repo\|escape}"/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<link rel="alternate" type="application/rss+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}rss-log" title="RSS feed for {repo\|escape}"/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</head>
		<body>

		<div class="page_header">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
		<a href="/">Mercurial</a> {pathdef%breadcrumb} / annotate
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="page_nav">
Gregory Szorc hgweb: refresh styling of gitweb's search form...	r32762	<div>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a> \|
		<a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> \|
		<a href="{url\|urlescape}log{sessionvars%urlparameter}">changelog</a> \|
		<a href="{url\|urlescape}graph{sessionvars%urlparameter}">graph</a> \|
		<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a> \|
		<a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> \|
		<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a> \|
av6 hgweb: don't dereference symbolic revision in gitweb style...	r25605	<a href="{url\|urlescape}file/{symrev}{path\|urlescape}{sessionvars%urlparameter}">files</a> \|
		<a href="{url\|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a> \|
		<a href="{url\|urlescape}file/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">file</a> \|
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}file/tip/{file\|urlescape}{sessionvars%urlparameter}">latest</a> \|
av6 hgweb: don't dereference symbolic revision in gitweb style...	r25605	<a href="{url\|urlescape}log/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">revisions</a> \|
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	annotate \|
av6 hgweb: don't dereference symbolic revision in gitweb style...	r25605	<a href="{url\|urlescape}diff/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">diff</a> \|
		<a href="{url\|urlescape}comparison/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">comparison</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>
Gregory Szorc hgweb: refresh styling of gitweb's search form...	r32762	</div>
		{searchform}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="title">{file\|escape}</div>

		<div class="title_text">
		<table cellspacing="0">
		<tr>
		<td>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></td>
Anton Shestakov hgweb: clearly outline <tr> block in gitweb and spartan styles...	r24999	<td class="date age">{date\|rfc822date}</td>
		</tr>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{branch%filerevbranch}
		<tr>
		<td>changeset {rev}</td>
Anton Shestakov hgweb: clearly outline <tr> block in gitweb and spartan styles...	r24999	<td style="font-family:monospace"><a class="list" 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>permissions</td>
Anton Shestakov hgweb: clearly outline <tr> block in gitweb and spartan styles...	r24999	<td style="font-family:monospace">{permissions\|permissions}</td>
		</tr>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</table>
		</div>

Gregory Szorc gitweb: preserve whitespace in description...	r33557	<div class="page_path description">{desc\|strip\|escape\|websub\|nonempty}</div>
Gregory Szorc hgweb: add HTML elements to control whitespace settings for annotate...	r34392
		{diffoptsform}

		<script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}>
		renderDiffOptsForm();
		</script>

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<div class="page_body">
		<table>
Denis Laxalde hgweb: plug followlines action in annotate view...	r32994	<tbody class="sourcelines"
		data-logurl="{url\|urlescape}log/{symrev}/{file\|urlescape}"
		data-selectabletag="TR"
		data-ishead="{ishead}">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{annotate%annotateline}
Denis Laxalde gitweb: wrap table rows of annotate view into a <tbody> element...	r32992	</tbody>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</table>
		</div>

Denis Laxalde hgweb: plug followlines action in annotate view...	r32994	<script type="text/javascript" src="{staticurl\|urlescape}followlines.js"></script>

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{footer}