##// 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:

r43624:4caf8884 stable
r49957:770e1352 stable
Show More
builddeb
115 lines | 2.6 KiB | text/plain | TextLexer
Gregory Szorc
packaging: move builddeb into contrib/packaging/...
r38026 #!/bin/sh -e
#
# Build a Mercurial debian package from the current repo
#
# Tested on Jessie (stable as of original script authoring.)
. $(dirname $0)/packagelib.sh
Gregory Szorc
packaging: make packaging scripts less reliant on pwd...
r38033 ROOTDIR=$(cd $(dirname $0)/../.. > /dev/null; pwd)
Gregory Szorc
packaging: move builddeb into contrib/packaging/...
r38026 BUILD=1
CLEANUP=1
DISTID=`(lsb_release -is 2> /dev/null | tr '[:upper:]' '[:lower:]') || echo debian`
CODENAME=`lsb_release -cs 2> /dev/null || echo unknown`
DEBFLAGS=-b
muxator
packaging: blindly factor out trap's cleanup function in builddeb...
r40140
cleanup() {
muxator
packaging: cleanup() did not read the value of $CLEANUP...
r40142 if [ "$CLEANUP" ]; then
muxator
packaging: "make deb" no longer fails...
r40143 rm -r "$ROOTDIR/debian";
muxator
packaging: blindly factor out trap's cleanup function in builddeb...
r40140 fi
}
Gregory Szorc
packaging: move builddeb into contrib/packaging/...
r38026 while [ "$1" ]; do
case "$1" in
--distid )
shift
DISTID="$1"
shift
;;
--codename )
shift
CODENAME="$1"
shift
;;
--cleanup )
shift
BUILD=
;;
--build )
shift
CLEANUP=
;;
--source-only )
shift
DEBFLAGS=-S
;;
* )
echo "Invalid parameter $1!" 1>&2
exit 1
;;
esac
done
muxator
packaging: "make deb" no longer fails...
r40143 cd "$ROOTDIR"
muxator
packaging: blindly factor out trap's cleanup function in builddeb...
r40140 trap 'cleanup' EXIT
Gregory Szorc
packaging: move builddeb into contrib/packaging/...
r38026
set -u
if [ ! -d .hg ]; then
muxator
packaging: print more specific error messages when builddeb fails
r40138 printf "You are inside %s, which is not the root of a Mercurial repository\n" $(pwd) 1>&2
Gregory Szorc
packaging: move builddeb into contrib/packaging/...
r38026 exit 1
fi
gethgversion
debver="$version"
if [ -n "$type" ] ; then
debver="$debver~$type"
fi
if [ -n "$distance" ] ; then
debver="$debver+$distance-$CODENAME-$node"
elif [ "$DEBFLAGS" = "-S" ] ; then
# for building a ppa (--source-only) for a release (distance == 0), we need
# to version the distroseries so that we can upload to launchpad
debver="$debver~${CODENAME}1"
fi
control=debian/control
changelog=debian/changelog
if [ "$BUILD" ]; then
if [ -d debian ] ; then
muxator
packaging: print more specific error messages when builddeb fails
r40138 printf "Error! debian control directory already exists at %s/debian\n" $(pwd)
Gregory Szorc
packaging: move builddeb into contrib/packaging/...
r38026 exit 1
fi
Gregory Szorc
packaging: make packaging scripts less reliant on pwd...
r38033 cp -r "$ROOTDIR"/contrib/packaging/debian debian
Gregory Szorc
packaging: move builddeb into contrib/packaging/...
r38026
sed -i.tmp "s/__VERSION__/$debver/" $changelog
sed -i.tmp "s/__DATE__/$(date --rfc-2822)/" $changelog
sed -i.tmp "s/__CODENAME__/$CODENAME/" $changelog
rm $changelog.tmp
# remove the node from the version string
SRCFILE="mercurial_$(echo $debver | sed "s,-$node,,").orig.tar.gz"
Gregory Szorc
packaging: make packaging scripts less reliant on pwd...
r38033 "$ROOTDIR/hg" archive $SRCFILE
Gregory Szorc
packaging: move builddeb into contrib/packaging/...
r38026 mv $SRCFILE ..
debuild -us -uc -i -I $DEBFLAGS
if [ $? != 0 ]; then
echo 'debuild failed!'
exit 1
fi
fi
if [ "$CLEANUP" ] ; then
echo
OUTPUTDIR=${OUTPUTDIR:=packages/$DISTID-$CODENAME}
mkdir -p "$OUTPUTDIR"
Denis Laxalde
packaging: also move Debian .buildinfo file in output directory
r43624 find ../mercurial*.deb ../mercurial_*.build* ../mercurial_*.changes \
Gregory Szorc
packaging: move builddeb into contrib/packaging/...
r38026 ../mercurial*.dsc ../mercurial*.gz \
-type f -newer $control -print0 2>/dev/null | \
xargs -Inarf -0 mv narf "$OUTPUTDIR"
echo "Built packages for $debver:"
Denis Laxalde
packaging: fix path where .deb files are looked for...
r43617 find "$OUTPUTDIR" -type f -newer $control -name '*.deb'
Gregory Szorc
packaging: move builddeb into contrib/packaging/...
r38026 fi