##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

shelve: directly handle the abort process...
shelve: directly handle the abort process Shelve is currently sub-contracting some of its work to the rebase extension. In order to make shelve more independent and flexible we would like shelve to handle the parent alignment directly. This change starts with the simplest bits, handling the abort process. It turns out we have all the necessary bits in the `shelvestate` file. So we do not need anything from the interrupted rebase. As a nice side effect, a test about missing `shelverebasestate` state file now behave better. Differential Revision: https://phab.mercurial-scm.org/D3688
Gregory Szorc - - Load All Authors

File last commit:

r38476:e5916f12 default
r38480:61e4cf1b default
Show More
dockerrpm
39 lines | 1.1 KiB | text/plain | TextLexer
/ contrib / packaging / dockerrpm
History | Source | Raw |Copy content |Copy permalink
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
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
 r38476 DOCKER=$($BUILDDIR/hg-docker docker-path)
CONTAINER=hg-docker-$PLATFORM
$BUILDDIR/hg-docker build $BUILDDIR/docker/$PLATFORM $CONTAINER
Gregory Szorc
packaging: move some docker scripts into contrib/packaging/...
 r38024
RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM
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"