##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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
Yuya Nishihara - - Load All Authors

File last commit:

r38469:b45c353e default
r49838:f3aafd78 default
Show More
map-cmdline.show
25 lines | 1.1 KiB | text/plain | TextLexer
/ mercurial / templates / map-cmdline.show
History | Source | Raw |Copy content |Copy permalink
Gregory Szorc
show: add basic labels to work template...
 r32059 # TODO there are a few deficiencies in this file:
# * The "namespace" of the labels needs to be worked out. We currently
# piggyback on existing values so color works.
Denis Laxalde
show: use labelcset() template alias for work (and stack) views...
 r34878
%include map-cmdline.default
Yuya Nishihara
templater: load template fragments from [templates] section in map file...
 r34715
[templates]
Gregory Szorc
show: pass the minimum length for nodes as a template keyword...
 r34191 showbookmarks = '{if(active, "*", " ")} {pad(bookmark, longestbookmarklen + 4)}{shortest(node, nodelen)}\n'
Gregory Szorc
show: construct changeset templater during dispatch...
 r33046
Gregory Szorc
show: show all namespaces in "work" view...
 r33050 showwork = '{cset_shortnode}{namespaces % cset_namespace} {cset_shortdesc}'
Gregory Szorc
show: implement "stack" view...
 r33194 showstack = '{showwork}'
Gregory Szorc
show: construct changeset templater during dispatch...
 r33046
Denis Laxalde
show: use labelcset() template alias for work (and stack) views...
 r34878 cset_shortnode = '{labelcset(shortest(node, nodelen))}'
Gregory Szorc
show: show all namespaces in "work" view...
 r33050
# Treat branch and tags specially so we don't display "default" or "tip"
cset_namespace = '{ifeq(namespace, "branches", names_branches, ifeq(namespace, "tags", names_tags, names_others))}'
names_branches = '{ifeq(branch, "default", "", " ({label('log.{colorname}', branch)})")}'
Yuya Nishihara
show: use filter() function to strip "tip" tag...
 r38469 names_tags = '{if(filter_tags(names),
" ({label('log.{colorname}', join(filter_tags(names), ' '))})")}'
Gregory Szorc
show: show all namespaces in "work" view...
 r33050 names_others = '{if(names, " ({label('log.{colorname}', join(names, ' '))})")}'
Gregory Szorc
show: construct changeset templater during dispatch...
 r33046 cset_shortdesc = '{label("log.description", desc|firstline)}'
Yuya Nishihara
show: use filter() function to strip "tip" tag...
 r38469
[templatealias]
filter_tags(names) = filter(names, ifeq(name, 'tip', '', name))