Bug 1389715 - Upgrade to Mercurial 4.3.1; r?ted draft
authorGregory Szorc <gps@mozilla.com>
Mon, 14 Aug 2017 19:03:33 -0700
changeset 647576 bfc651a360d0d43744b3fd69766e9f55c0bf9cc8
parent 647575 f9f688452b60ea9ae9ec76dc88e3871bc2230040
child 726553 578f3876232321f6e55c26abebb301a57a8631e7
push id74457
push usergszorc@mozilla.com
push dateWed, 16 Aug 2017 15:41:26 +0000
reviewersted
bugs1389715
milestone57.0a1
Bug 1389715 - Upgrade to Mercurial 4.3.1; r?ted 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
taskcluster/docker/recipes/install-mercurial.sh
--- a/taskcluster/docker/recipes/install-mercurial.sh
+++ b/taskcluster/docker/recipes/install-mercurial.sh
@@ -8,23 +8,23 @@
 set -e
 
 # Detect OS.
 if [ -f /etc/lsb-release ]; then
     . /etc/lsb-release
 
     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
         echo "Ubuntu 12.04 not supported"
         exit 1
     fi
 
     CERT_PATH=/etc/ssl/certs/ca-certificates.crt
 
 elif [ -f /etc/centos-release ]; then
@@ -75,26 +75,25 @@ tooltool_fetch <<EOF
 ]
 EOF
 
     rpm -i ${HG_FILENAME}
 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
 fi
 
 chmod 644 /usr/local/mercurial/robustcheckout.py
 
 mkdir -p /etc/mercurial
@@ -119,28 +118,20 @@ robustcheckout = /usr/local/mercurial/ro
 # When running on a legacy Python, Mercurial will default to TLS 1.0+.
 # There is no good reason we shouldn't be running a modern Python
 # capable of speaking TLS 1.2. And the only Mercurial servers we care
 # about should be running TLS 1.2. So make TLS 1.2 the minimum.
 minimumprotocol = tls1.2
 
 # Settings to make 1-click loaners more useful.
 [extensions]
-color =
 histedit =
-pager =
 rebase =
 
 [diff]
 git = 1
 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