##// 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:

r44058:99e231af default
r49838:f3aafd78 default
Show More
hg-docker
129 lines | 3.4 KiB | text/plain | TextLexer
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 #!/usr/bin/env python3
#
# Copyright 2018 Gregory Szorc <gregory.szorc@gmail.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
import argparse
import pathlib
import shutil
import subprocess
import sys
Gregory Szorc
black: blacken scripts...
r44058
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 def get_docker() -> str:
docker = shutil.which('docker.io') or shutil.which('docker')
if not docker:
print('could not find docker executable')
return 1
try:
out = subprocess.check_output([docker, '-h'], stderr=subprocess.STDOUT)
if b'Jansens' in out:
Gregory Szorc
black: blacken scripts...
r44058 print(
'%s is the Docking System Tray; try installing docker.io'
% docker
)
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 sys.exit(1)
except subprocess.CalledProcessError as e:
print('error calling `%s -h`: %s' % (docker, e.output))
sys.exit(1)
Gregory Szorc
black: blacken scripts...
r44058 out = subprocess.check_output([docker, 'version'], stderr=subprocess.STDOUT)
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476
lines = out.splitlines()
if not any(l.startswith((b'Client:', b'Client version:')) for l in lines):
print('`%s version` does not look like Docker' % docker)
sys.exit(1)
if not any(l.startswith((b'Server:', b'Server version:')) for l in lines):
print('`%s version` does not look like Docker' % docker)
sys.exit(1)
return docker
Gregory Szorc
black: blacken scripts...
r44058
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 def get_dockerfile(path: pathlib.Path, args: list) -> bytes:
with path.open('rb') as fh:
df = fh.read()
for k, v in args:
Mathias De Mare
packaging: allow running packaging with custom uid+gid for CentOS...
r41270 df = df.replace(bytes('%%%s%%' % k.decode(), 'utf-8'), v)
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476
return df
Gregory Szorc
black: blacken scripts...
r44058
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 def build_docker_image(dockerfile: pathlib.Path, params: list, tag: str):
"""Build a Docker image from a templatized Dockerfile."""
docker = get_docker()
dockerfile_path = pathlib.Path(dockerfile)
dockerfile = get_dockerfile(dockerfile_path, params)
print('building Dockerfile:')
print(dockerfile.decode('utf-8', 'replace'))
args = [
docker,
'build',
Gregory Szorc
black: blacken scripts...
r44058 '--build-arg',
'http_proxy',
'--build-arg',
'https_proxy',
'--tag',
tag,
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 '-',
]
print('executing: %r' % args)
Mathias De Mare
hg-docker: fix Python 3.4 compatibility (for CentOS 7)...
r41269 p = subprocess.Popen(args, stdin=subprocess.PIPE)
p.communicate(input=dockerfile)
if p.returncode:
raise subprocess.CalledProcessException(
Gregory Szorc
black: blacken scripts...
r44058 p.returncode,
'failed to build docker image: %s %s' % (p.stdout, p.stderr),
)
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476
def command_build(args):
build_args = []
for arg in args.build_arg:
k, v = arg.split('=', 1)
build_args.append((k.encode('utf-8'), v.encode('utf-8')))
Gregory Szorc
black: blacken scripts...
r44058 build_docker_image(pathlib.Path(args.dockerfile), build_args, args.tag)
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476
def command_docker(args):
print(get_docker())
Gregory Szorc
black: blacken scripts...
r44058
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 def main() -> int:
parser = argparse.ArgumentParser()
subparsers = parser.add_subparsers(title='subcommands')
build = subparsers.add_parser('build', help='Build a Docker image')
build.set_defaults(func=command_build)
Gregory Szorc
black: blacken scripts...
r44058 build.add_argument(
'--build-arg',
action='append',
default=[],
help='Substitution to perform in Dockerfile; ' 'format: key=value',
)
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 build.add_argument('dockerfile', help='path to Dockerfile to use')
build.add_argument('tag', help='Tag to apply to created image')
docker = subparsers.add_parser('docker-path', help='Resolve path to Docker')
docker.set_defaults(func=command_docker)
args = parser.parse_args()
return args.func(args)
Gregory Szorc
black: blacken scripts...
r44058
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 if __name__ == '__main__':
sys.exit(main())