This is an archive of the discontinued Mercurial Phabricator instance.

Differential D925

test-merge-subrepos: make test compatible with chg
ClosedPublic

Authored by singhsrb on Oct 3 2017, 4:07 PM.

Download Raw Diff

Details

Reviewers

quark

Group Reviewers

hg-reviewers

Commits

rHG6981d120c9d7: test-merge-subrepos: make test compatible with chg

Summary

The test checks the output of '.hg/blackbox.log' which will contain
logs corresponding to chg in case chg is running. Therefore, this commit
modifies the test to take chg into consideration while checking the
blackbox.log contents.

Test Plan

Ran the test 'test-merge-subrepos.t' with and without the '--chg'
option.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

singhsrb created this revision.Oct 3 2017, 4:07 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 3 2017, 4:07 PM

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

singhsrb mentioned this in D926: test-setdiscovery: make test compatible with chg.Oct 3 2017, 8:07 PM

quark updated this revision to Diff 2394.Oct 3 2017, 8:08 PM

I have simplified the fix.

This is like blackmagic but still very neat :). I will keep this in mind!

Closed by commit rHG6981d120c9d7: test-merge-subrepos: make test compatible with chg (authored by singhsrb). · Explain WhyOct 4 2017, 9:41 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-merge-subrepos.t (1 line)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2385		Oct 3 2017, 4:07 PM	★	★
Diff 2	2394		Oct 3 2017, 8:08 PM	★	★
Diff 3	2406	rHG6981d120c9d7f1f264fd72dd53eb22a0e594dbef	Oct 3 2017, 4:05 PM	★	★

Diff 2394

tests/test-merge-subrepos.t


	$ rm subrepo/b			$ rm subrepo/b

	A deleted subrepo file is flagged as dirty, like the top level repo			A deleted subrepo file is flagged as dirty, like the top level repo

	$ hg id --config extensions.blackbox= --config blackbox.dirty=True			$ hg id --config extensions.blackbox= --config blackbox.dirty=True
	9bfe45a197d7+ tip			9bfe45a197d7+ tip
	$ cat .hg/blackbox.log			$ cat .hg/blackbox.log
				* @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ ()> serve --cmdserver chgunix (glob) (chg !)
	* @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ (*)> id (glob)			* @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ (*)> id (glob)
	* @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ ()> id --config extensions.blackbox=* --config blackbox.dirty=True exited 0 * (glob)			* @9bfe45a197d7b0ab09bf287729dd57e9619c9da5+ ()> id --config extensions.blackbox=* --config blackbox.dirty=True exited 0 * (glob)

	TODO: a deleted file should be listed as such, like the top level repo			TODO: a deleted file should be listed as such, like the top level repo

	$ hg sum			$ hg sum
	parent: 4:9bfe45a197d7 tip			parent: 4:9bfe45a197d7 tip
	change b			change b