This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12592

test-dirstate: use new `--docket` flag to get the data uuid
ClosedPublic

Authored by Alphare on Apr 28 2022, 11:16 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG51262af89efe: test-dirstate: use new `--docket` flag to get the data uuid
Summary

This is more robust.

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.Apr 28 2022, 11:16 AM
marmoute accepted this revision.May 3 2022, 12:36 PM
marmoute requested changes to this revision.

We probably need to add a new line to check that the old file have been deleted, don't we?

The current checking is done by checking that find_dirstate_uuid only return one value.

This revision now requires changes to proceed.May 3 2022, 12:37 PM
Alphare added a comment.Wed, May 4, 4:41 AM

All calls to dirstate_uuid_has_not_changed is preceded by a check that we only have 1 dirstate data file, so I'm not sure what you're asking

Alphare added a commit: rHG51262af89efe: test-dirstate: use new `--docket` flag to get the data uuid.Wed, May 4, 10:23 AM
This revision was not accepted when it landed; it landed in state Needs Revision.
Closed by commit rHG51262af89efe: test-dirstate: use new `--docket` flag to get the data uuid (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 33348.Wed, May 4, 10:52 AM

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

marmoute added a comment.Wed, May 4, 1:45 PM

Yeaj, I was just mistaken. Sorry about that.

Revision Contents
Changeset List

PathPackages
Mtests/test-dirstate.t (2 lines)

Diff 33341

tests/test-dirstate.t

Check that the old dirstate data file is removed correctly and the new one is Check that the old dirstate data file is removed correctly and the new one is
valid. valid.
$ dirstate_data_files () { $ dirstate_data_files () {
> find .hg -maxdepth 1 -name "dirstate.*" > find .hg -maxdepth 1 -name "dirstate.*"
> } > }
$ find_dirstate_uuid () { $ find_dirstate_uuid () {
> dirstate_data_files | sed 's#.hg/dirstate.##' > 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 > # Pure Python always rewrites the whole dirstate
> if [ $# -eq 1 ] || [ "$HGMODULEPOLICY" = *"rust"* ] || [ -n "$RHG_INSTALLED_AS_HG" ]; then > if [ $# -eq 1 ] || [ "$HGMODULEPOLICY" = *"rust"* ] || [ -n "$RHG_INSTALLED_AS_HG" ]; then
> test $current_uid = $(find_dirstate_uuid) > test $current_uid = $(find_dirstate_uuid)
> fi > fi
> } > }