##// END OF EJS Templates
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

File last commit:

r46597:97205cf0 default
r49838:f3aafd78 default
Show More
packagelib.sh
43 lines | 1.3 KiB | application/x-sh | BashLexer
Gregory Szorc
packaging: move packagelib.sh into contrib/packaging/...
r38025 # Extract version number into 4 parts, some of which may be empty:
#
# version: the numeric part of the most recent tag. Will always look like 1.3.
#
# type: if an rc build, "rc", otherwise empty
#
# distance: the distance from the nearest tag, or empty if built from a tag
#
# node: the node|short hg was built from, or empty if built from a tag
gethgversion() {
Mathias De Mare
packaging: don't use plain 'python' if another python has been specified...
r46597 if [ -z "${1+x}" ]; then
python="python"
else
python="$1"
fi
Gregory Szorc
packaging: move packagelib.sh into contrib/packaging/...
r38025 export HGRCPATH=
export HGPLAIN=
Mathias De Mare
packaging: don't use plain 'python' if another python has been specified...
r46597 make cleanbutpackages PYTHON=$python
make local PURE=--pure PYTHON=$python
Gregory Szorc
packaging: move packagelib.sh into contrib/packaging/...
r38025 HG="$PWD/hg"
Mathias De Mare
packaging: don't use plain 'python' if another python has been specified...
r46597 $python "$HG" version > /dev/null || { echo 'abort: hg version failed!'; exit 1 ; }
Gregory Szorc
packaging: move packagelib.sh into contrib/packaging/...
r38025
Mathias De Mare
packaging: don't use plain 'python' if another python has been specified...
r46597 hgversion=`LANGUAGE=C $python "$HG" version | sed -ne 's/.*(version \(.*\))$/\1/p'`
Gregory Szorc
packaging: move packagelib.sh into contrib/packaging/...
r38025
if echo $hgversion | grep + > /dev/null 2>&1 ; then
tmp=`echo $hgversion | cut -d+ -f 2`
hgversion=`echo $hgversion | cut -d+ -f 1`
distance=`echo $tmp | cut -d- -f 1`
node=`echo $tmp | cut -d- -f 2`
else
distance=''
node=''
fi
Mathias De Mare
packaging: modify rc detection to work with X.Yrc instead of X.Y-rc...
r41759 if echo $hgversion | grep -E -- '[0-9]\.[0-9](\.[0-9])?rc' > /dev/null 2>&1; then
version=`echo $hgversion | cut -d'r' -f1`
type="rc`echo $hgversion | cut -d'c' -f2-`"
Gregory Szorc
packaging: move packagelib.sh into contrib/packaging/...
r38025 else
version=$hgversion
type=''
fi
}