test-dirstate: fix detection of Rust environment variable stable
authorRaphaël Gomès <rgomes@octobus.net>
Wed, 04 May 2022 15:48:13 +0200
branchstable
changeset 49157 5d610521a285
parent 49156 09984dc70352
child 49158 682b0ac92c0b
test-dirstate: fix detection of Rust environment variable The Rust path never actually worked. This change also improves clarity of the comment. The next change will ensure we print something when this check fails. Differential Revision: https://phab.mercurial-scm.org/D12601
tests/test-dirstate.t
--- a/tests/test-dirstate.t	Thu Apr 28 17:15:35 2022 +0200
+++ b/tests/test-dirstate.t	Wed May 04 15:48:13 2022 +0200
@@ -133,8 +133,8 @@
   > }
 
   $ dirstate_uuid_has_not_changed () {
-  >   # Pure Python always rewrites the whole dirstate
-  >   if [ $# -eq 1 ] || [ "$HGMODULEPOLICY" = *"rust"* ] || [ -n "$RHG_INSTALLED_AS_HG" ]; then
+  >   # Non-Rust always rewrites the whole dirstate
+  >   if [ $# -eq 1 ] || ([ -n "$HGMODULEPOLICY" ] && [ -z "${HGMODULEPOLICY##*rust*}" ]) || [ -n "$RHG_INSTALLED_AS_HG" ]; then
   >     test $current_uid = $(find_dirstate_uuid)
   >   fi
   > }