Mercurial > hg
view contrib/packagelib.sh @ 33886:13dc7f29531e
exchange: don't attempt phase exchange if phase-heads was in bundle
The Mercurial core server doesn't yet include phase-heads parts in the
bundle, but our Google-internal server wants to do
that. Unfortunately, the usual exchange still happens even if
phase-heads part is included (including the short-circuited one for
old/publishing servers). That means that even if our server (again,
the Google-internal one, but also future Mercurial core servers)
includes a phase-heads part to indicate that some heads should be
drafts, that would still get overwritten by the phase updating that
happens after. So let's fix that by marking the phase step done if we
receive at least one phase-heads part in the bundle.
Differential Revision: https://phab.mercurial-scm.org/D440
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 17 Aug 2017 13:04:47 -0700 |
parents | 9dccaff02ad5 |
children | baa522889540 |
line wrap: on
line source
# 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 gethgversion() { make cleanbutpackages make local || make local PURE=--pure HG="$PWD/hg" $HG version > /dev/null || { echo 'abort: hg version failed!'; exit 1 ; } hgversion=`LANGUAGE=C $HG version | sed -ne 's/.*(version \(.*\))$/\1/p'` 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 if echo $hgversion | grep -- '-' > /dev/null 2>&1; then version=`echo $hgversion | cut -d- -f1` type=`echo $hgversion | cut -d- -f2` else version=$hgversion type='' fi }