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

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

amend: add tests for amending only some files from commit to be amended...
amend: add tests for amending only some files from commit to be amended We do not have robust enough tests for scenarios where only some files in a changeset are amended. This presents an interesting scenario because the working copy could have modified versions of the remaining files in the pre-amend changeset. Therefore, I have added some tests to ensure that amend behaves as expected in these scenarios. Test Plan: Ensured that the test "test-commit-amend.t" passes. Differential Revision: https://phab.mercurial-scm.org/D596
Mathias De Maré - - Load All Authors

File last commit:

r33598:a3ac1ea6 stable
r34061:6fb5a06b default
Show More
dockerrpm
37 lines | 970 B | text/plain | TextLexer
/ contrib / dockerrpm
History | Source | Raw |Copy content |Copy permalink
Mads Kiilerich
dockerrpm: check that docker is running correctly before building
 r22438 #!/bin/bash -e
Matt Mackall
build: initial support for in-tree autobuilding recipes
 r21255
Augie Fackler
dockerlib: start extracting common functions for setting up docker...
 r24968 . $(dirname $0)/dockerlib.sh
Matt Mackall
build: initial support for in-tree autobuilding recipes
 r21255 BUILDDIR=$(dirname $0)
Augie Fackler
dockerlib: extract initcontainer() method...
 r24969 export ROOTDIR=$(cd $BUILDDIR/..; pwd)
Matt Mackall
build: initial support for in-tree autobuilding recipes
 r21255
Augie Fackler
dockerlib: start extracting common functions for setting up docker...
 r24968 checkdocker
Mads Kiilerich
dockerrpm: check that docker is running correctly before building
 r22438
Mads Kiilerich
dockerrpm: better handling of specification of docker name
 r22439 PLATFORM="$1"
Mads Kiilerich
docker: add CentOS 5...
 r22443 shift # extra params are passed to buildrpm
Mads Kiilerich
dockerrpm: better handling of specification of docker name
 r22439
Augie Fackler
dockerlib: extract initcontainer() method...
 r24969 initcontainer $PLATFORM
Mads Kiilerich
dockerrpm: run docker build process as the current user, not as root...
 r22440
Mads Kiilerich
dockerrpm: prepare source outside docker and just run rpmbuild inside docker...
 r22441 RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM
Mads Kiilerich
docker: add CentOS 5...
 r22443 contrib/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $*
Mads Kiilerich
dockerrpm: prepare source outside docker and just run rpmbuild inside docker...
 r22441
DSHARED=/mnt/shared
Mathias De Maré
docker: pass proxy arguments to docker process...
 r33598 $DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \
Mads Kiilerich
dockerrpm: prepare source outside docker and just run rpmbuild inside docker...
 r22441 rpmbuild --define "_topdir $DSHARED" -ba $DSHARED/SPECS/mercurial.spec --clean
Mads Kiilerich
dockerrpm: create a yum/dnf repo from the generated rpms...
 r22444
Mathias De Maré
docker: pass proxy arguments to docker process...
 r33598 $DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \
Mads Kiilerich
dockerrpm: create a yum/dnf repo from the generated rpms...
 r22444 createrepo $DSHARED
cat << EOF > $RPMBUILDDIR/mercurial.repo
# Place this file in /etc/yum.repos.d/mercurial.repo
[mercurial]
Mads Kiilerich
buildrpm: fix use of invalid $PLATFORM in mercurial.repo
 r23124 name=Mercurial packages for $PLATFORM
Mads Kiilerich
dockerrpm: create a yum/dnf repo from the generated rpms...
 r22444 # baseurl=file://$RPMBUILDDIR/
Mads Kiilerich
buildrpm: fix use of invalid $PLATFORM in mercurial.repo
 r23124 baseurl=http://hg.example.com/build/$PLATFORM/
Mads Kiilerich
dockerrpm: create a yum/dnf repo from the generated rpms...
 r22444 skip_if_unavailable=True
gpgcheck=0
enabled=1
EOF
echo
echo "Build complete - results can be found in $RPMBUILDDIR"