This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5976

tests: add more wildcards to test-extdiff.t
ClosedPublic

Authored by indygreg on Feb 15 2019, 4:46 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG88d4477ac4f6: tests: add more wildcards to test-extdiff.t
Summary

The diff tool (which is echo) runs in the background and output
order can therefore be non-deterministic. We need to glob over
the file names to account for this.

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

indygreg created this revision.Feb 15 2019, 4:46 PM
Closed by commit rHG88d4477ac4f6: tests: add more wildcards to test-extdiff.t (authored by indygreg). · Explain WhyFeb 15 2019, 10:34 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-extdiff.t (4 lines)

Diff 14122

tests/test-extdiff.t

running '* diffing * *' in * (backgrounded) (glob) running '* diffing * *' in * (backgrounded) (glob)
running '* diffing * *' in * (backgrounded) (glob) running '* diffing * *' in * (backgrounded) (glob)
cleaning up temp directory cleaning up temp directory
[1] [1]
Test --per-file option for gui tool again: Test --per-file option for gui tool again:
$ hg --config merge-tools.alabalaf.gui=True alabalaf -c 6 --per-file --debug $ hg --config merge-tools.alabalaf.gui=True alabalaf -c 6 --per-file --debug
diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob) diffing */extdiff.*/a.46c0e4daeb72/* a.81906f2b98ac/* (glob)
diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) diffing */extdiff.*/a.46c0e4daeb72/* a.81906f2b98ac/* (glob)
making snapshot of 2 files from rev 46c0e4daeb72 making snapshot of 2 files from rev 46c0e4daeb72
a a
b b
making snapshot of 2 files from rev 81906f2b98ac making snapshot of 2 files from rev 81906f2b98ac
a a
b b
running '* diffing * *' in * (backgrounded) (glob) running '* diffing * *' in * (backgrounded) (glob)
running '* diffing * *' in * (backgrounded) (glob) running '* diffing * *' in * (backgrounded) (glob)