This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12601

test-dirstate: fix detection of Rust environment variable
ClosedPublic

Authored by Alphare on Wed, May 4, 9:55 AM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

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

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.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.Wed, May 4, 9:55 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptWed, May 4, 9:55 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

Alphare added a child revision: D12602: test-dirstate: print something when the check is skipped.Wed, May 4, 9:55 AM

Alphare added a commit: rHG5d610521a285: test-dirstate: fix detection of Rust environment variable.Wed, May 4, 10:24 AM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHG5d610521a285: test-dirstate: fix detection of Rust environment variable (authored by Alphare). · Explain Why

This revision was automatically updated to reflect the committed changes.

✅ refresh by Heptapod after a successful CI run (🐙 💚)
⚠ This patch is intended for stable ⚠

Revision Contents
Changeset List

			Path	Packages
M			tests/test-dirstate.t (4 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	33337		Wed, May 4, 9:55 AM	★	★
Diff 2	33344	rHG5d610521a285289235259c0941580f052424ee1d	Wed, May 4, 9:48 AM	★	★
Diff 3	33351		Wed, May 4, 10:52 AM	★	★

Status	Author	Revision
Closed	Alphare	D12602 test-dirstate: print something when the check is skipped
Closed	Alphare	D12601 test-dirstate: fix detection of Rust environment variable
Closed	Alphare	D12594 rust-dirstate-v2: fix the unused bytes counter when rewriting the dirstate
Closed	Alphare	D12593 rust-dirstate-v2: show `unused_bytes` counter is not reset on total rewrite
Closed	Alphare	D12592 test-dirstate: use new `--docket` flag to get the data uuid
Closed	Alphare	D12591 debugcommands: remove `debugdirstateignorepatternhash`
Closed	Alphare	D12590 dirstate-v2: add flag to `debugstate` to print docket information
Closed	Alphare	D12586 rhg: fix dirstate-v2 data file removal system

Diff 33344

tests/test-dirstate.t

	> find .hg -maxdepth 1 -name "dirstate.*"			> find .hg -maxdepth 1 -name "dirstate.*"
	> }			> }

	$ find_dirstate_uuid () {			$ find_dirstate_uuid () {
	> hg debugstate --docket \| grep uuid \| sed 's/.uuid: $.$/\1/'			> hg debugstate --docket \| grep uuid \| sed 's/.uuid: $.$/\1/'
	> }			> }

	$ dirstate_uuid_has_not_changed () {			$ dirstate_uuid_has_not_changed () {
	> # Pure Python always rewrites the whole dirstate			> # Non-Rust always rewrites the whole dirstate
	> if [ $# -eq 1 ] \|\| [ "$HGMODULEPOLICY" = "rust" ] \|\| [ -n "$RHG_INSTALLED_AS_HG" ]; then			> if [ $# -eq 1 ] \|\| ([ -n "$HGMODULEPOLICY" ] && [ -z "${HGMODULEPOLICY##rust}" ]) \|\| [ -n "$RHG_INSTALLED_AS_HG" ]; then
	> test $current_uid = $(find_dirstate_uuid)			> test $current_uid = $(find_dirstate_uuid)
	> fi			> fi
	> }			> }

	$ cd ..			$ cd ..
	$ hg init append-mostly			$ hg init append-mostly
	$ cd append-mostly			$ cd append-mostly
	$ mkdir dir dir2			$ mkdir dir dir2