This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9919

config: test priority involving alias and include
ClosedPublic

Authored by marmoute on Jan 29 2021, 8:39 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG702bb73d7330: config: test priority involving alias and include

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.Jan 29 2021, 8:39 PM
pulkit added a subscriber: pulkit.Jan 31 2021, 12:54 PM
pulkit added inline comments.
tests/test-config.t
428

Can we use consistent config values? It's not obvious that ui.logtemplate and command-templates.log are aliases or means same.

marmoute added inline comments.Jan 31 2021, 2:15 PM
tests/test-config.t
428

What do you mean by "consistent" ? I am using ui.logtemplate and command-templates.log because they are a simple existing alias. We could add a couple extra comment in the tests to make this clearer if you feel like this is needed.

pulkit added inline comments.Jan 31 2021, 2:51 PM
tests/test-config.t
428

TBH, I don't use this config and hence didn't know they are aliases.

Can we just use one of them or add a comment?

Or I am missing something and using config aliases is testing/will test something.

marmoute added inline comments.Feb 1 2021, 12:27 PM
tests/test-config.t
428

I am confused about your confusion…

pulkit added inline comments.Feb 2 2021, 1:41 PM
tests/test-config.t
428

Are we using both ui.logtemplate and command-templates.log to test something?

In other words, can our target test be achieved by just using one of them?

marmoute added inline comments.Feb 3 2021, 4:04 AM
tests/test-config.t
428

No, the whole point of the test is to check how value set for both ui.logtemplate and command-templates.log interact with each other, since they are alias for one another.

I will add a comment to clarify this.

marmoute added a comment.Feb 9 2021, 12:43 PM

The commend have been updated (the diff should get updated by heptapod CI soonish).

baymax updated this revision to Diff 25514.Feb 9 2021, 6:29 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 25571.Feb 11 2021, 1:46 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit accepted this revision.Feb 27 2021, 12:29 PM
This revision is now accepted and ready to land.Feb 27 2021, 12:29 PM
marmoute added a commit: rHG702bb73d7330: config: test priority involving alias and include.Feb 27 2021, 1:31 PM
Closed by commit rHG702bb73d7330: config: test priority involving alias and include (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-config.t (36 lines)

Diff 25986

tests/test-config.t

$ cat > included.rc << EOF $ cat > included.rc << EOF
> [config-test] > [config-test]
> pre-include= value-included > pre-include= value-included
> post-include= value-included > post-include= value-included
> EOF > EOF
$ cat > file-C.rc << EOF
> %include ./included-alias-C.rc
> [ui]
> logtemplate = "value-C\n"
> EOF
$ cat > included-alias-C.rc << EOF
> [command-templates]
pulkitUnsubmitted
Not Done

Can we use consistent config values? It's not obvious that ui.logtemplate and command-templates.log are aliases or means same.

pulkit: Can we use consistent config values? It's not obvious that `ui.logtemplate` and `command…
marmouteAuthorUnsubmitted
Done

What do you mean by "consistent" ? I am using ui.logtemplate and command-templates.log because they are a simple existing alias. We could add a couple extra comment in the tests to make this clearer if you feel like this is needed.

marmoute: What do you mean by "consistent" ? I am using `ui.logtemplate` and `command-templates.log`…
pulkitUnsubmitted
Not Done

TBH, I don't use this config and hence didn't know they are aliases.

Can we just use one of them or add a comment?

Or I am missing something and using config aliases is testing/will test something.

pulkit: TBH, I don't use this config and hence didn't know they are aliases. Can we just use one of…
marmouteAuthorUnsubmitted
Done

I am confused about your confusion…

marmoute: I am confused about your confusion…
pulkitUnsubmitted
Not Done

Are we using both ui.logtemplate and command-templates.log to test something?

In other words, can our target test be achieved by just using one of them?

pulkit: Are we using both `ui.logtemplate` and `command-templates.log` to test something? In other…
marmouteAuthorUnsubmitted
Done

No, the whole point of the test is to check how value set for both ui.logtemplate and command-templates.log interact with each other, since they are alias for one another.

I will add a comment to clarify this.

marmoute: No, the whole point of the test is to check how value set for both `ui.logtemplate` and…
> log = "value-included\n"
> EOF
$ cat > file-D.rc << EOF
> [command-templates]
> log = "value-D\n"
> %include ./included-alias-D.rc
> EOF
$ cat > included-alias-D.rc << EOF
> [ui]
> logtemplate = "value-included\n"
> EOF
Simple order checking Simple order checking
--------------------- ---------------------
If file B is read after file A, value from B overwrite value from A. If file B is read after file A, value from B overwrite value from A.
$ HGRCPATH="file-A.rc:file-B.rc" hg config config-test.basic $ HGRCPATH="file-A.rc:file-B.rc" hg config config-test.basic
value-B value-B
$ HGRCPATH="file-A.rc" hg log -r . $ HGRCPATH="file-A.rc" hg log -r .
value-A value-A
$ HGRCPATH="file-B.rc" hg log -r . $ HGRCPATH="file-B.rc" hg log -r .
value-B value-B
$ HGRCPATH="file-A.rc:file-B.rc" hg log -r . $ HGRCPATH="file-A.rc:file-B.rc" hg log -r .
value-A (known-bad-output !) value-A (known-bad-output !)
value-B (missing-correct-output !) value-B (missing-correct-output !)
Alias and include
-----------------
The pre/post include priority should also apply when tie-breaking alternatives.
See the case above for details about the two config options used.
$ HGRCPATH="file-C.rc" hg log -r .
value-included (known-bad-output !)
value-C (missing-correct-output !)
$ HGRCPATH="file-D.rc" hg log -r .
value-D (known-bad-output !)
value-included (missing-correct-output !)