D12601: test-dirstate: fix detection of Rust environment variable

Alphare (Raphaël Gomès) phabricator at mercurial-scm.org
Wed May 4 13:55:49 UTC 2022


Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  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.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D12601

AFFECTED FILES
  tests/test-dirstate.t

CHANGE DETAILS

diff --git a/tests/test-dirstate.t b/tests/test-dirstate.t
--- a/tests/test-dirstate.t
+++ b/tests/test-dirstate.t
@@ -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
   > }



To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel


More information about the Mercurial-devel mailing list