##// END OF EJS Templates
copies: fix the changeset based algorithm regarding merge...
copies: fix the changeset based algorithm regarding merge In 99ebde4fec99, we changed the list of files stored into the `files` field. This lead to the changeset centric copy algorithm to break in various merge situation involving merge. Older information could reach the merge through `p1`, and while information from `p2` was strictly fresher, it would get overwritten anyway. We update the situation with more details about which revision introduces rename information. This help use making the right decision in case of merge. We are now running a more comprehensive suite of test with include this kind of situation. The behavior differ slightly from the filelog based in a couple of instance. There is mostly two distinct cases: 1) there are conflicting rename information in a merge (different rename history on each side). In this case the filelog based implementation arbitrarily pick a side based on the file-revision-number. So it depends on a local factor. The changeset centric algorithm will use a deterministic approach, by picking the information coming from the first parent of the merge. This is stable across different clone. 2) rename information related to file that exist in both source and destination. The filelog based implementation do not even try to detect these, however the changeset centric one get them for "free" (it is simpler to detect them than not). The new implementation focus on correctness. Performance improvement will come later. Differential Revision: https://phab.mercurial-scm.org/D8244

File last commit:

r44058:99e231af default
r45252:45f3f35c 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())