##// END OF EJS Templates
repair: invalidate volatile sets after stripping...
repair: invalidate volatile sets after stripping Matt Harbison reported that some tests were broken on Windows after 1a09dad8b85a (evolution: report new unstable changesets, 2018-01-14). The failures were exactly as seen in this patch. The failures actually seemed correct, which made me wonder why they didn't fail the same way on Linux. It turned out to be a cache invalidation problem. The new orphan mentioned in the test case actually does get created when we're re-applying the temporary bundle that's created while stripping. However, without the invalidation, it appears that there was already an orphan before applying the temporary bundle. The warnings about unknown working parent appear because the aformentioned changeset means that we're now accessing the dirstate while it's invalid. We may want to suppress these messages that happen in the intermediate strip state, but they're technically correct (although confusing to the user), so I think just fixing the cache invalidation is fine for now. I haven't figured out why the caches seemed to get correctly invalidated on Windows. Differential Revision: https://phab.mercurial-scm.org/D1933

File last commit:

r34904:16d9f0b3 default
r35796:128dd940 default
Show More
packagelib.sh
38 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() {
muxator
build: build deb/rpm independently on config/extensions in the host system...
r34904 export HGRCPATH=
export HGPLAIN=
Pierre-Yves David
packagelib: do not remove packages directory in hggetversion (issue5262)...
r29641 make cleanbutpackages
muxator
build: for the bootstrap phase of a deb/rpm build pure-py mercurial is enough...
r34687 make local PURE=--pure
Augie Fackler
packaging: extract packagelib for common code from builddeb and buildrpm
r24972 HG="$PWD/hg"
muxator
build: initial version detection by make deb/rpm was missing quoting
r34624 "$HG" version > /dev/null || { echo 'abort: hg version failed!'; exit 1 ; }
Augie Fackler
packaging: extract packagelib for common code from builddeb and buildrpm
r24972
muxator
build: initial version detection by make deb/rpm was missing quoting
r34624 hgversion=`LANGUAGE=C "$HG" version | sed -ne 's/.*(version \(.*\))$/\1/p'`
Augie Fackler
packaging: extract packagelib for common code from builddeb and buildrpm
r24972
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
}