From c61479961f534230787c211cb425d45f72dcbad1 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Wed, 8 Jan 2020 14:40:51 +0100 Subject: [PATCH] Revert "tools: Use Mercurial with Python 3 (#402)" This reverts commit d0693651d4195b9d774f424fcc2a95b1075c321e. --- tools/docker/bootstrap-mercurial.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/docker/bootstrap-mercurial.sh b/tools/docker/bootstrap-mercurial.sh index c00effcfc..7525c9307 100755 --- a/tools/docker/bootstrap-mercurial.sh +++ b/tools/docker/bootstrap-mercurial.sh @@ -1,14 +1,16 @@ #!/bin/bash -ex -MERCURIAL_VERSION="5.2" -VERSION_CONTROL_TOOLS_REV="102106f53cb2" +MERCURIAL_VERSION="5.1" apt-get update -apt-get install --no-install-recommends -y curl python-dev gcc openssh-client +apt-get install --no-install-recommends -y curl python2-minimal python-bz2file python-dev gcc openssh-client -pip install --disable-pip-version-check --quiet --no-cache-dir mercurial==$MERCURIAL_VERSION +# Setup mercurial from its own website, without install pip2 which has a lot of dependencies +curl -L https://www.mercurial-scm.org/release/mercurial-$MERCURIAL_VERSION.tar.gz | tar -C /opt -xvz +cd /opt/mercurial-$MERCURIAL_VERSION +python2 setup.py install # Setup mercurial with needed extensions -hg clone -r $VERSION_CONTROL_TOOLS_REV https://hg.mozilla.org/hgcustom/version-control-tools /src/version-control-tools/ +hg clone -u cc7be0763bb7cb36e64b55b8cec6998741709776 https://hg.mozilla.org/hgcustom/version-control-tools /src/version-control-tools/ mkdir -p /etc/mercurial/hgrc.d ln -s /src/tools/docker/hgrc /etc/mercurial/hgrc.d/code-review.rc