From 57aa87b92e9cb9078d474467d9c12145f9c528ff Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Mon, 11 Jan 2021 18:35:22 +0000
Subject: [PATCH] hack/deploy: sync parts of the hg repo

---
 hack/deploy.sh | 4 ++--
 version.nix    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hack/deploy.sh b/hack/deploy.sh
index 924a068cbb..be8efa73d8 100755
--- a/hack/deploy.sh
+++ b/hack/deploy.sh
@@ -13,7 +13,7 @@ ssh_cmd="ssh -o StrictHostKeyChecking=accept-new"
 if [ ! -z ${2+x} ]; then ssh_cmd="$ssh_cmd $2"; fi
 
 echo Syncing repo content to machine "$1"
-rsync -e "$ssh_cmd" -avz --exclude='.hg/' ./ "deployer@$1:depot/"
+rsync -e "$ssh_cmd" -avz --exclude='.hg/store/data/' --exclude='.hg/store/da/' --exclude='.hg/cache/' --exclude='.hg/wcache/' ./ "deployer@$1:depot/"
 
 echo Triggering rebuild
-$ssh_cmd -t "deployer@$1" rebuilder ./depot
\ No newline at end of file
+$ssh_cmd -t "deployer@$1" rebuilder ./depot
diff --git a/version.nix b/version.nix
index a5a062b769..2f96ae54c2 100644
--- a/version.nix
+++ b/version.nix
@@ -6,10 +6,11 @@ let
     HG_REPO = hgRepo;
     MERCURIAL = pkgs.mercurial;
   } ''
+    export HGPLAIN=
     mytmp=$(mktemp -d)
     pushd $mytmp
     ln -s $HG_REPO .hg
-    echo -n "depot-$($MERCURIAL/bin/hg id --id | tr -d '+')" > $out
+    echo -n "depot-$($MERCURIAL/bin/hg id --id -r.)" > $out
     popd
     rm -rf $mytmp
   '';