Skip to content

Commit

Permalink
Bug 1389715 - Upgrade to Mercurial 4.3.1. r=ted, a=release
Browse files Browse the repository at this point in the history
This is pretty straightforward: we just update some version numbers
and hashes.

The tooltool artifacts were produced and uploaded by me, just like
the last ones. I have some patches to establish a proper toolchain
task to build Mercurial. But it is a bit of a rabbit hole due to the
chicken-and-egg problem of Mercurial needing to be in Docker images.
Preserving the existing install mechanism is the simplest path
forward. Plus we need this patch so we can uplift so earlier releases
get a secure Mercurial in their Docker images.

color and pager are enabled by default in 4.2. So remove configuration
options for them that add no value.

MozReview-Commit-ID: 9pkHX044kV8

--HG--
extra : source : b6840d399d8208d3c6ef890b97cf88e16d41381d
extra : amend_source : 5beb2489c4f1a2a0c1dddd321e115ad7402f0558
  • Loading branch information
indygreg committed Aug 15, 2017
1 parent d122f9b commit 075ea50
Showing 1 changed file with 16 additions and 25 deletions.
41 changes: 16 additions & 25 deletions testing/docker/recipes/install-mercurial.sh
Expand Up @@ -13,22 +13,22 @@ if [ -f /etc/lsb-release ]; then

if [ "${DISTRIB_ID}" = "Ubuntu" -a "${DISTRIB_RELEASE}" = "16.04" ]; then
HG_DEB=1
HG_DIGEST=e891b46d8e97cb1c6b0c714e037ea78ae3043f49d27655332c615c861ebb94654a064298c7363d318edd7750c45574cc434848ae758adbcd2a41c6c390006053
HG_SIZE=159870
HG_FILENAME=mercurial_4.1.2_amd64.deb
HG_DIGEST=dd4dd7759fe73985b6a0424b34a3036d130c26defdd866a9fdd7302e40c7417433b93f020497ceb40593eaead8e86be55e48340887015645202b47ff7b0d7ac6
HG_SIZE=181722
HG_FILENAME=mercurial_4.3.1_amd64.deb

HG_COMMON_DIGEST=112fab48805f267343c5757af5633ef51e4a8fcc7029b83afb7790ba9600ec185d4857dd1925c9aa724bc191f5f37039a59900b99f95e3427bf5d82c85447b69
HG_COMMON_SIZE=1919078
HG_COMMON_FILENAME=mercurial-common_4.1.2_all.deb
HG_COMMON_DIGEST=045f7e07f1e2e0fef767b2f50a7e9ab37d5da0bfead5ddf473ae044b61a4566aed2d6f2706f52d227947d713ef8e89eb9a269288f08e52924e4de88a39cd7ac0
HG_COMMON_SIZE=2017628
HG_COMMON_FILENAME=mercurial-common_4.3.1_all.deb
elif [ "${DISTRIB_ID}" = "Ubuntu" -a "${DISTRIB_RELEASE}" = "12.04" ]; then
HG_DEB=1
HG_DIGEST=67823aa455c59dbdc24ec1f044b0afdb5c03520ef3601509cb5466dc0ac332846caf96176f07de501c568236f6909e55dfc8f4b02f8c69fa593a4abca9abfeb8
HG_SIZE=167880
HG_FILENAME=mercurial_4.1.2_amd64.deb
HG_DIGEST=dd4dd7759fe73985b6a0424b34a3036d130c26defdd866a9fdd7302e40c7417433b93f020497ceb40593eaead8e86be55e48340887015645202b47ff7b0d7ac6
HG_SIZE=181722
HG_FILENAME=mercurial_4.3.1_amd64.deb

HG_COMMON_DIGEST=5e1c462a9b699d2068f7a0c14589f347ca719c216181ef7a625033df757185eeb3a8fed57986829a7943f16af5a8d66ddf457cc7fc4af557be88eb09486fe665
HG_COMMON_SIZE=3091596
HG_COMMON_FILENAME=mercurial-common_4.1.2_all.deb
HG_COMMON_DIGEST=045f7e07f1e2e0fef767b2f50a7e9ab37d5da0bfead5ddf473ae044b61a4566aed2d6f2706f52d227947d713ef8e89eb9a269288f08e52924e4de88a39cd7ac0
HG_COMMON_SIZE=2017628
HG_COMMON_FILENAME=mercurial-common_4.3.1_all.deb
fi

CERT_PATH=/etc/ssl/certs/ca-certificates.crt
Expand Down Expand Up @@ -96,16 +96,15 @@ elif [ -n "${PIP_PATH}" ]; then
tooltool_fetch <<EOF
[
{
"size": 5133417,
"visibility": "public",
"digest": "32b59d23d6b911b7a7e9c9c7659457daf2eba771d5170ad5a44a068d7941939e1d68c72c847e488bf26c14392e5d7ee25e5f660e0330250d0685acce40552745",
"size": 5475042,
"digest": "4c42d06b7f111a3e825dd927704a30f88f0b2225cf87ab8954bf53a7fbc0edf561374dd49b13d9c10140d98ff5853a64acb5a744349727abae81d32da401922b",
"algorithm": "sha512",
"filename": "mercurial-4.1.2.tar.gz"
"filename": "mercurial-4.3.1.tar.gz""
}
]
EOF

${PIP_PATH} install mercurial-4.1.2.tar.gz
${PIP_PATH} install mercurial-4.3.1.tar.gz
else
echo "Do not know how to install Mercurial on this OS"
exit 1
Expand Down Expand Up @@ -140,9 +139,7 @@ minimumprotocol = tls1.2
# Settings to make 1-click loaners more useful.
[extensions]
color =
histedit =
pager =
rebase =
[diff]
Expand All @@ -151,12 +148,6 @@ showfunc = 1
[pager]
pager = LESS=FRSXQ less
attend-help = true
attend-incoming = true
attend-log = true
attend-outgoing = true
attend-status = true
EOF

chmod 644 /etc/mercurial/hgrc

0 comments on commit 075ea50

Please sign in to comment.