This is an archive of the discontinued Mercurial Phabricator instance.

dirstate: clarify a `hg update` invocation in a test
ClosedPublic

Authored by marmoute on Nov 24 2021, 6:11 AM.

Download Raw Diff

Details

Reviewers

Alphare
pulkit

Group Reviewers

hg-reviewers

Commits

rHGf3f41e23c1fa: dirstate: clarify a `hg update` invocation in a test

Summary

It is common for readers of that test to confuse the hg co call with a `hg
commit`, while it actually means hg checkout, an alias for the more common
`hg update.

So let us use the clearer version.

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

marmoute created this revision.Nov 24 2021, 6:11 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptNov 24 2021, 6:11 AM

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

marmoute added a child revision: D11778: tests: make sure no ambiguities remains after the commit.Nov 24 2021, 6:11 AM

Alphare accepted this revision.Nov 24 2021, 7:54 AM

This revision is now accepted and ready to land.Nov 24 2021, 7:54 AM

pulkit accepted this revision.Nov 24 2021, 12:17 PM

marmoute added a parent revision: D11833: test: mark rhg output as flaky.Nov 30 2021, 6:53 PM

marmoute edited the summary of this revision. (Show Details)

marmoute added a commit: rHGf3f41e23c1fa: dirstate: clarify a `hg update` invocation in a test.Dec 1 2021, 10:20 AM

Closed by commit rHGf3f41e23c1fa: dirstate: clarify a `hg update` invocation in a test (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Status	Author	Revision
Closed	marmoute	D11800 largefile: use the proper "mtime boundary" logic during fixup
Closed	marmoute	D11799 status: move the boundary comparison logic within the timestamp module
Closed	marmoute	D11798 tests: remove potential mtime ambiguity in a dirstate test
Closed	marmoute	D11797 dirstate: cleanup remaining of "now" during write
Closed	marmoute	D11796 dirstate: remove need_delay logic
Closed	marmoute	D11795 dirstate: remove `lastnormaltime` mechanism
Closed	marmoute	D11794 status: use filesystem time boundary to invalidate racy mtime
Closed	marmoute	D11793 test: use a different timestamp for the updated file
Closed	marmoute	D11792 win32text: drop associated dirstate cache information on revert
Closed	marmoute	D11791 dirstate: stop gathering parentfiledata in update_file
Closed	marmoute	D11790 dirstate: stop gathering parentfiledata in update_file_p1
Closed	marmoute	D11789 dirstate: make it mandatory to provide parentfiledata in `set_clean`
Closed	marmoute	D11788 dirstate: do no use `set_clean` in revert
Closed	marmoute	D11787 status: adapt the "keyword" extensions to gather stats at lookup time
Closed	marmoute	D11786 status: adapt largefile to gather stats at lookup time
Closed	marmoute	D11785 status: gather fixup info at comparison time
Closed	marmoute	D11784 update: filter the ambiguous mtime in update directly
Closed	marmoute	D11783 dirstate: move "get fs now" in the timestamp utility module
Closed	marmoute	D11782 dirstate-item: allow mtime to be None in "parentdata"
Closed	marmoute	D11781 dirstate: add a comment about a racy piece of code during updates
Closed	marmoute	D11780 tests: add missing `head` for when things go wrong
Closed	marmoute	D11779 tests: ensure a status will have non ambiguous mtime in some race test
Closed	marmoute	D11778 tests: make sure no ambiguities remains after the commit
Closed	marmoute	D11777 dirstate: clarify a `hg update` invocation in a test
Closed	marmoute	D11833 test: mark rhg output as flaky

Diff 31239

tests/test-dirstate-race.t

	$ cd repo			$ cd repo
	$ echo a > a			$ echo a > a
	$ hg add a			$ hg add a
	$ hg commit -m test			$ hg commit -m test

	Do we ever miss a sub-second change?:			Do we ever miss a sub-second change?:

	$ for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do			$ for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
	> hg co -qC 0			> hg update -qC 0
	> echo b > a			> echo b > a
	> hg st			> hg st
	> done			> done
	M a			M a
	M a			M a
	M a			M a
	M a			M a
	M a			M a

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	31099		Nov 24 2021, 6:11 AM	★	★
Diff 2	31239	rHGf3f41e23c1faeb0546bc487e3b1089005fc4432f	Nov 4 2021, 12:49 PM	★	★