upstream/mercurial-mirror Files · mercurial/templates/monoblue/helptopics.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:

r32759:265196cd default


                r49838:f3aafd78

default

Download file

             helptopics.tmpl
        
                    46 lines
            
             | 1.9 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / helptopics.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      {header}

        av6
    
hgweb: fix help pages title in gitweb and monoblue...

              r25686
            
          <title>Help: {title}</title>

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

              r18526
            
          <link rel="alternate" type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>

          <link rel="alternate" type="application/rss+xml" href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      </head>

      <body>

      <div id="container">

          <div class="page-header">

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

              r18258
            
              <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / help</h1>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
        Gregory Szorc
    
hgweb: consolidate search form for monoblue...

              r32759
            
              {searchform}

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
              <ul class="page-nav">

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

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

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

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

        av6
    
hgweb: don't point graph links at tip hash where it doesn't make sense...

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

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

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

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

        av6
    
monoblue: fix branches link on help topics page

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

        av6
    
hgweb: don't point file links at tip hash where it doesn't make sense...

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

        Gregory Szorc
    
templates: support linking to main help page...

              r27580
            
                  {if(subindex,

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

                    '<li class="current">help</li>'

                  )}

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
              </ul>

          </div>

        av6
    
monoblue: fix page subtitle on help pages

              r26151
            
          <h2 class="no-link no-border">help</h2>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
          <table cellspacing="0">

        av6
    
hgweb: make anchor name actually match its href on help index page

              r30019
            
          <tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
          {topics % helpentry}

        Gregory Szorc
    
templates: make earlycommands and othercommands optional...

              r27578
            
          {if(earlycommands, '

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
          <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>

          {earlycommands % helpentry}

        Gregory Szorc
    
templates: make earlycommands and othercommands optional...

              r27578
            
          ')}

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
        Gregory Szorc
    
templates: make earlycommands and othercommands optional...

              r27578
            
          {if(othercommands, '

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
          <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>

          {othercommands % helpentry}

        Gregory Szorc
    
templates: make earlycommands and othercommands optional...

              r27578
            
          ')}

        Augie Fackler
    
web: add a help view for getting hg help output

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

Augie Fackler web: add a help view for getting hg help output	r12666	{header}
av6 hgweb: fix help pages title in gitweb and monoblue...	r25686	<title>Help: {title}</title>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<link rel="alternate" type="application/atom+xml" href="{url\|urlescape}atom-log" title="Atom feed for {repo\|escape}"/>
		<link rel="alternate" type="application/rss+xml" href="{url\|urlescape}rss-log" title="RSS feed for {repo\|escape}"/>
Augie Fackler web: add a help view for getting hg help output	r12666	</head>

		<body>
		<div id="container">
		<div class="page-header">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / help</h1>
Augie Fackler web: add a help view for getting hg help output	r12666
Gregory Szorc hgweb: consolidate search form for monoblue...	r32759	{searchform}
Augie Fackler web: add a help view for getting hg help output	r12666
		<ul class="page-nav">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
		<li><a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
		<li><a href="{url\|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>
av6 hgweb: don't point graph links at tip hash where it doesn't make sense...	r25525	<li><a href="{url\|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
		<li><a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
av6 monoblue: fix branches link on help topics page	r25872	<li><a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
av6 hgweb: don't point file links at tip hash where it doesn't make sense...	r25526	<li><a href="{url\|urlescape}file{sessionvars%urlparameter}">files</a></li>
Gregory Szorc templates: support linking to main help page...	r27580	{if(subindex,
		'<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>',
		'<li class="current">help</li>'
		)}
Augie Fackler web: add a help view for getting hg help output	r12666	</ul>
		</div>

av6 monoblue: fix page subtitle on help pages	r26151	<h2 class="no-link no-border">help</h2>
Augie Fackler web: add a help view for getting hg help output	r12666	<table cellspacing="0">
av6 hgweb: make anchor name actually match its href on help index page	r30019	<tr><td colspan="2"><h2><a name="topics" href="#topics">Topics</a></h2></td></tr>
Augie Fackler web: add a help view for getting hg help output	r12666	{topics % helpentry}

Gregory Szorc templates: make earlycommands and othercommands optional...	r27578	{if(earlycommands, '
Augie Fackler web: add a help view for getting hg help output	r12666	<tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
		{earlycommands % helpentry}
Gregory Szorc templates: make earlycommands and othercommands optional...	r27578	')}
Augie Fackler web: add a help view for getting hg help output	r12666
Gregory Szorc templates: make earlycommands and othercommands optional...	r27578	{if(othercommands, '
Augie Fackler web: add a help view for getting hg help output	r12666	<tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
		{othercommands % helpentry}
Gregory Szorc templates: make earlycommands and othercommands optional...	r27578	')}
Augie Fackler web: add a help view for getting hg help output	r12666	</table>

		{footer}