##// END OF EJS Templates
amend: don't remove unselected removals from memctx...
amend: don't remove unselected removals from memctx When there are removed files in the working copy and they are not selected to be amended into the parent, the `filectxfn` we create for the `memctx` would still return `None` before this patch. That's clearly incorrect; we should return the `filectx` from the unamended commit. Somehow it seems to not matter much except for the case with copies stored in changesets. Thanks to Kyle Lippincott for doing all the debugging and identifying the fix for this issue. Differential Revision: https://phab.mercurial-scm.org/D12573

File last commit:

r49154:4713bcf7 stable
r49957:770e1352 stable
Show More
dockerrpm
55 lines | 1.4 KiB | text/plain | TextLexer
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024 #!/bin/bash -e
BUILDDIR=$(dirname $0)
export ROOTDIR=$(cd $BUILDDIR/../..; pwd)
PLATFORM="$1"
shift # extra params are passed to buildrpm
Mads Kiilerich
packaging: make dockerrpm fedora target more generic...
r43676 DOCKERFILE="$PLATFORM"
OS_RELEASE="${PLATFORM//[a-z]/}"
case "$PLATFORM" in
fedora*)
DOCKERFILE="${PLATFORM//[0-9]/}.template"
;;
esac
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 DOCKER=$($BUILDDIR/hg-docker docker-path)
CONTAINER=hg-docker-$PLATFORM
Mathias De Mare
dockerrpm: always use current user and group...
r49154 DOCKERUID=$(id -u)
DOCKERGID=$(id -g)
Mathias De Mare
packaging: allow running packaging with custom uid+gid for CentOS...
r41270
Mads Kiilerich
packaging: make dockerrpm fedora target more generic...
r43676 $BUILDDIR/hg-docker build \
--build-arg UID=$DOCKERUID \
--build-arg GID=$DOCKERGID \
--build-arg OS_RELEASE=${OS_RELEASE:-latest} \
$BUILDDIR/docker/$DOCKERFILE $CONTAINER
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024
RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM
Mads Kiilerich
packaging: move dockerrpm output directory creation to dockerrpm...
r43672 mkdir -p $RPMBUILDDIR
Gregory Szorc
packaging: make packaging scripts less reliant on pwd...
r38033 $ROOTDIR/contrib/packaging/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $*
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024
DSHARED=/mnt/shared
Gregory Szorc
packaging: consistently create build user in Dockerfiles...
r38475 DBUILDUSER=build
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
r38024 $DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \
rpmbuild --define "_topdir $DSHARED" -ba $DSHARED/SPECS/mercurial.spec --clean
$DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \
createrepo $DSHARED
cat << EOF > $RPMBUILDDIR/mercurial.repo
# Place this file in /etc/yum.repos.d/mercurial.repo
[mercurial]
name=Mercurial packages for $PLATFORM
# baseurl=file://$RPMBUILDDIR/
baseurl=http://hg.example.com/build/$PLATFORM/
skip_if_unavailable=True
gpgcheck=0
enabled=1
EOF
echo
echo "Build complete - results can be found in $RPMBUILDDIR"