##// 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
Gregory Szorc - - Load All Authors

File last commit:

r49730:6000f5b2 default
r49838:f3aafd78 default
Show More
manifest_corpus.py
36 lines | 1.4 KiB | text/x-python | PythonLexer
/ contrib / fuzz / manifest_corpus.py
History | Source | Raw |Copy content |Copy permalink
Augie Fackler
fuzz: new fuzzer for cext/manifest.c...
 r40089 import argparse
import zipfile
ap = argparse.ArgumentParser()
ap.add_argument("out", metavar="some.zip", type=str, nargs=1)
args = ap.parse_args()
with zipfile.ZipFile(args.out[0], "w", zipfile.ZIP_STORED) as zf:
Augie Fackler
formatting: blacken the codebase...
 r43346 zf.writestr(
"manifest_zero",
Augie Fackler
fuzz: tell manifest fuzzer about longer node hashes...
 r45519 '''\0PKG-INFO\09b3ed8f2b81095a13064402e930565f083346e9a
Augie Fackler
fuzz: new fuzzer for cext/manifest.c...
 r40089 README\080b6e76643dcb44d4bc729e932fc464b3e36dbe3
hg\0b6444347c629cc058d478023905cfb83b7f5bb9d
mercurial/__init__.py\0b80de5d138758541c5f05265ad144ab9fa86d1db
mercurial/byterange.py\017f5a9fbd99622f31a392c33ac1e903925dc80ed
mercurial/fancyopts.py\0b6f52e23e356748c5039313d8b639cda16bf67ba
mercurial/hg.py\023cc12f225f1b42f32dc0d897a4f95a38ddc8f4a
mercurial/mdiff.py\0a05f65c44bfbeec6a42336cd2ff0b30217899ca3
mercurial/revlog.py\0217bc3fde6d82c0210cf56aeae11d05a03f35b2b
mercurial/transaction.py\09d180df101dc14ce3dd582fd998b36c98b3e39aa
notes.txt\0703afcec5edb749cf5cec67831f554d6da13f2fb
setup.py\0ccf3f6daf0f13101ca73631f7a1769e328b472c9
tkmerge\03c922edb43a9c143682f7bc7b00f98b3c756ebe7
Augie Fackler
formatting: blacken the codebase...
 r43346 ''',
)
Augie Fackler
fuzz: tell manifest fuzzer about longer node hashes...
 r45519 zf.writestr("badmanifest_shorthashes", "\0narf\0aa\nnarf2\0aaa\n")
Augie Fackler
formatting: blacken the codebase...
 r43346 zf.writestr(
"badmanifest_nonull",
Augie Fackler
fuzz: tell manifest fuzzer about longer node hashes...
 r45519 "\0narf\0cccccccccccccccccccccccccccccccccccccccc\n"
Augie Fackler
formatting: blacken the codebase...
 r43346 "narf2aaaaaaaaaaaaaaaaaaaa\n",
)
Augie Fackler
fuzz: tell manifest fuzzer about longer node hashes...
 r45519
zf.writestr(
"manifest_long_nodes",
"\1a\0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\n",
)