##// END OF EJS Templates
match: handle excludes using new differencematcher...
match: handle excludes using new differencematcher As I've said on earlier patches, I'm hoping to use more composition of simpler matchers instead of the single complex matcher we currently have. This extracts a first new matcher that composes two other matchers. It matches if the first matcher matches but the second does not. As such, we can use it for excludes, which this patch also does. We'll remove the now-unncessary code for excludes in the next patch.

File last commit:

r29641:13f90dde stable
r32465:a83a7d27 default
Show More
packagelib.sh
35 lines | 1.1 KiB | application/x-sh | BashLexer
Augie Fackler
packaging: rework version detection and declaration (issue4912)...
r26833 # Extract version number into 4 parts, some of which may be empty:
#
# version: the numeric part of the most recent tag. Will always look like 1.3.
#
# type: if an rc build, "rc", otherwise empty
#
# distance: the distance from the nearest tag, or empty if built from a tag
#
# node: the node|short hg was built from, or empty if built from a tag
Augie Fackler
packaging: extract packagelib for common code from builddeb and buildrpm
r24972 gethgversion() {
Pierre-Yves David
packagelib: do not remove packages directory in hggetversion (issue5262)...
r29641 make cleanbutpackages
Augie Fackler
packaging: extract packagelib for common code from builddeb and buildrpm
r24972 make local || make local PURE=--pure
HG="$PWD/hg"
$HG version > /dev/null || { echo 'abort: hg version failed!'; exit 1 ; }
hgversion=`$HG version | sed -ne 's/.*(version \(.*\))$/\1/p'`
Augie Fackler
packaging: rework version detection and declaration (issue4912)...
r26833 if echo $hgversion | grep + > /dev/null 2>&1 ; then
tmp=`echo $hgversion | cut -d+ -f 2`
hgversion=`echo $hgversion | cut -d+ -f 1`
distance=`echo $tmp | cut -d- -f 1`
node=`echo $tmp | cut -d- -f 2`
else
distance=''
node=''
fi
Augie Fackler
packaging: extract packagelib for common code from builddeb and buildrpm
r24972 if echo $hgversion | grep -- '-' > /dev/null 2>&1; then
version=`echo $hgversion | cut -d- -f1`
Augie Fackler
packaging: rework version detection and declaration (issue4912)...
r26833 type=`echo $hgversion | cut -d- -f2`
Augie Fackler
packaging: extract packagelib for common code from builddeb and buildrpm
r24972 else
Augie Fackler
packaging: rework version detection and declaration (issue4912)...
r26833 version=$hgversion
type=''
Augie Fackler
packaging: extract packagelib for common code from builddeb and buildrpm
r24972 fi
}