annotate tests/test-issue6642.t @ 52053:af54626bf358

dirstate-map: add a missing debug wait point when accessing the v2 docket fc8e37c380d3 added synchronization points to the dirstate to allow for race condition testing without actually requiring a time-based race condition to happen. This changes adds the `pre-read-file` wait point before we read the docket, since callers might ask for the parents before anything else is read, leading to the first read being done before the wait point. This removes some differences in test output which were presumed to be speed related, but weren't.
author Raphaël Gomès <rgomes@octobus.net>
date Mon, 14 Oct 2024 14:14:21 +0200
parents 7e5be4a7cda7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
49314
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
1 hg log --debug shouldn't show different data than {file_*} template keywords
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
2 https://bz.mercurial-scm.org/show_bug.cgi?id=6642
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
3
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
4 $ hg init issue6642
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
5 $ cd issue6642
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
6
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
7 $ echo a > a
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
8 $ hg ci -qAm a
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
9 $ echo b > b
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
10 $ hg ci -qAm b
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
11 $ hg up 0 -q
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
12 $ echo c > c
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
13 $ hg ci -qAm c
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
14 $ hg merge -q
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
15 $ hg ci -m merge
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
16
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
17 $ hg log -GT '{rev} {desc} file_adds: [{file_adds}], file_mods: [{file_mods}], file_dels: [{file_dels}], files: [{files}]\n'
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
18 @ 3 merge file_adds: [], file_mods: [], file_dels: [], files: []
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
19 |\
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
20 | o 2 c file_adds: [c], file_mods: [], file_dels: [], files: [c]
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
21 | |
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
22 o | 1 b file_adds: [b], file_mods: [], file_dels: [], files: [b]
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
23 |/
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
24 o 0 a file_adds: [a], file_mods: [], file_dels: [], files: [a]
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
25
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
26
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
27 $ hg log -r . --debug | grep files
49315
2f326ea19fbc logcmdutil: use the same data as {file*} template keywords (issue6642)
Anton Shestakov <av6@dwimlabs.net>
parents: 49314
diff changeset
28 [1]
50725
7e5be4a7cda7 tests: use grep -E instead of obsolescent egrep
Mads Kiilerich <mads@kiilerich.com>
parents: 49315
diff changeset
29 $ hg log -r . --debug -T json | grep -E '(added|removed|modified)'
49315
2f326ea19fbc logcmdutil: use the same data as {file*} template keywords (issue6642)
Anton Shestakov <av6@dwimlabs.net>
parents: 49314
diff changeset
30 "added": [],
49314
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
31 "modified": [],
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
32 "removed": [],
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
33 $ hg log -r . --debug -T xml | grep path
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
34 <paths>
ec3f88480dbf tests: show that hg log --debug output differs from {file*} template keywords
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
35 </paths>