##// END OF EJS Templates
copies: add test that makes both the merging csets dirty and run w/o error...
copies: add test that makes both the merging csets dirty and run w/o error This series of patches is to cover a case in fullcopytracing algorithms where both the merging csets are not descendant of merge base. In this algorithm we call a merging cset "dirty" if that cset is not the descendant of merge base. That said, added test in this patch cover case when both the merging csets are "dirty". Actually this case of "both dirty" was encountered by Pulkit when he was working on content-divergence where it is possible that both the csets are not descendant of merging base. For reference you can look into: https://phab.mercurial-scm.org/D3896 As this test run fine without any error and correctly traced the copies, I added this test to make sure that it doesn't break even after I will modify some code in next patches to fix an error. Next patch adds the tests where this algorithm throws an error for the same case of "both dirty". Differential Revision: https://phab.mercurial-scm.org/D5961

File last commit:

r38804:824636b0 stable
r42096:cbdd2b56 default
Show More
dockerdeb
40 lines | 1.3 KiB | text/plain | TextLexer
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024 #!/bin/bash -eu
Gregory Szorc
packaging: move packagelib.sh into contrib/packaging/...
r38025 . $(dirname $0)/packagelib.sh
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024
BUILDDIR=$(dirname $0)
export ROOTDIR=$(cd $BUILDDIR/../.. > /dev/null; pwd)
DISTID="$1"
CODENAME="$2"
PLATFORM="$1-$2"
shift; shift # extra params are passed to build process
OUTPUTDIR=${OUTPUTDIR:=$ROOTDIR/packages/$PLATFORM}
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 CONTAINER=hg-docker-$PLATFORM
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 DOCKER=$($BUILDDIR/hg-docker docker-path)
Gregory Szorc
packaging: don't write files for templatized Dockerfiles...
r38477 $BUILDDIR/hg-docker build \
--build-arg CODENAME=$CODENAME \
$BUILDDIR/docker/$DISTID.template \
$CONTAINER
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024
# debuild only appears to be able to save built debs etc to .., so we
# have to share the .. of the current directory with the docker
# container and hope it's writable. Whee.
Gregory Szorc
packaging: make packaging scripts less reliant on pwd...
r38033 dn=$(basename $ROOTDIR)
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024
Gregory Szorc
packaging: consistently create build user in Dockerfiles...
r38475 DBUILDUSER=build
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024 if [ $(uname) = "Darwin" ] ; then
$DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
sh -c "cd /mnt/$dn && make clean && make local"
fi
Gregory Szorc
packaging: make packaging scripts less reliant on pwd...
r38033 $DOCKER run -u $DBUILDUSER --rm -v $ROOTDIR/..:/mnt $CONTAINER \
Gregory Szorc
packaging: move builddeb into contrib/packaging/...
r38026 sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/packaging/builddeb --build --distid $DISTID --codename $CODENAME $@"
Gregory Szorc
packaging: always execute builddeb from source root...
r38804 (cd $ROOTDIR && contrib/packaging/builddeb --cleanup --distid $DISTID --codename $CODENAME)
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024 if [ $(uname) = "Darwin" ] ; then
$DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
sh -c "cd /mnt/$dn && make clean"
fi