Mercurial > hg
annotate tests/test-status-rev.t @ 48443:112184713852
rhg: Set second_ambiguous as needed in post-status fixup
This fixes an intermittent bug that manifested only in test-revert.t,
and unfortunately not on CI. On a fast enough machine we could have:
1. A file is modified
2. `rhg status` writes an updated dirstate-v1
3. The same file is modified again
… all within the same integer second. Because the dirstate-v1 file format
does not store sub-second precision, step 2 must write the file’s mtime
as "unknown" because of the possibility of step 3.
However, most of the code now handles timestamps with nanosecond precision
in order to take advantage of it in dirstate-v2. `second_ambiguous` must
be set for timestamps that become ambiguous if sub-second precision is dropped
(such as through serialization in dirstate-v1 format).
Differential Revision: https://phab.mercurial-scm.org/D11889
author | Simon Sapin <simon.sapin@octobus.net> |
---|---|
date | Thu, 09 Dec 2021 10:55:17 +0100 |
parents | 5abc47d4ca6b |
children | 55c6ebd11cb9 |
rev | line source |
---|---|
23037
eeaed3d2b004
status: add more complete tests for --rev
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
diff
changeset
|
1 Tests of 'hg status --rev <rev>' to make sure status between <rev> and '.' get |
eeaed3d2b004
status: add more complete tests for --rev
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
diff
changeset
|
2 combined correctly with the dirstate status. |
eeaed3d2b004
status: add more complete tests for --rev
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
diff
changeset
|
3 |
eeaed3d2b004
status: add more complete tests for --rev
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
diff
changeset
|
4 $ hg init |
eeaed3d2b004
status: add more complete tests for --rev
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
diff
changeset
|
5 |
23196
daa73289dd2a
test-status-rev: use same names as from generate-working-copy-states
Martin von Zweigbergk <martinvonz@google.com>
parents:
23037
diff
changeset
|
6 First commit |
23037
eeaed3d2b004
status: add more complete tests for --rev
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
diff
changeset
|
7 |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
35230
diff
changeset
|
8 $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 1 |
23197
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
9 $ hg addremove --similarity 0 |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
10 adding content1_content1_content1-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
11 adding content1_content1_content1-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
12 adding content1_content1_content3-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
13 adding content1_content1_content3-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
14 adding content1_content1_missing-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
15 adding content1_content1_missing-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
16 adding content1_content2_content1-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
17 adding content1_content2_content1-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
18 adding content1_content2_content2-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
19 adding content1_content2_content2-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
20 adding content1_content2_content3-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
21 adding content1_content2_content3-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
22 adding content1_content2_missing-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
23 adding content1_content2_missing-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
24 adding content1_missing_content1-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
25 adding content1_missing_content1-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
26 adding content1_missing_content3-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
27 adding content1_missing_content3-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
28 adding content1_missing_missing-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
29 adding content1_missing_missing-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
30 $ hg commit -m first |
23037
eeaed3d2b004
status: add more complete tests for --rev
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
diff
changeset
|
31 |
23196
daa73289dd2a
test-status-rev: use same names as from generate-working-copy-states
Martin von Zweigbergk <martinvonz@google.com>
parents:
23037
diff
changeset
|
32 Second commit |
23037
eeaed3d2b004
status: add more complete tests for --rev
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
diff
changeset
|
33 |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
35230
diff
changeset
|
34 $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 2 |
23197
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
35 $ hg addremove --similarity 0 |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
36 removing content1_missing_content1-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
37 removing content1_missing_content1-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
38 removing content1_missing_content3-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
39 removing content1_missing_content3-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
40 removing content1_missing_missing-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
41 removing content1_missing_missing-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
42 adding missing_content2_content2-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
43 adding missing_content2_content2-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
44 adding missing_content2_content3-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
45 adding missing_content2_content3-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
46 adding missing_content2_missing-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
47 adding missing_content2_missing-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
48 $ hg commit -m second |
23037
eeaed3d2b004
status: add more complete tests for --rev
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
diff
changeset
|
49 |
23196
daa73289dd2a
test-status-rev: use same names as from generate-working-copy-states
Martin von Zweigbergk <martinvonz@google.com>
parents:
23037
diff
changeset
|
50 Working copy |
23037
eeaed3d2b004
status: add more complete tests for --rev
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
diff
changeset
|
51 |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
35230
diff
changeset
|
52 $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 wc |
23197
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
53 $ hg addremove --similarity 0 |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
54 adding content1_missing_content1-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
55 adding content1_missing_content1-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
56 adding content1_missing_content3-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
57 adding content1_missing_content3-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
58 adding content1_missing_missing-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
59 adding content1_missing_missing-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
60 adding missing_missing_content3-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
61 adding missing_missing_content3-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
62 adding missing_missing_missing-tracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
63 adding missing_missing_missing-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
64 $ hg forget *_*_*-untracked |
636158ff7329
test-status-rev: use common script for generating file history
Martin von Zweigbergk <martinvonz@google.com>
parents:
23196
diff
changeset
|
65 $ rm *_*_missing-* |
23037
eeaed3d2b004
status: add more complete tests for --rev
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
diff
changeset
|
66 |
23230
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
67 Status compared to parent of the working copy, i.e. the dirstate status |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
68 |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
69 $ hg status -A --rev 1 'glob:missing_content2_content3-tracked' |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
70 M missing_content2_content3-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
71 $ hg status -A --rev 1 'glob:missing_content2_content2-tracked' |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
72 C missing_content2_content2-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
73 $ hg status -A --rev 1 'glob:missing_missing_content3-tracked' |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
74 A missing_missing_content3-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
75 $ hg status -A --rev 1 'glob:missing_missing_content3-untracked' |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
76 ? missing_missing_content3-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
77 $ hg status -A --rev 1 'glob:missing_content2_*-untracked' |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
78 R missing_content2_content2-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
79 R missing_content2_content3-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
80 R missing_content2_missing-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
81 $ hg status -A --rev 1 'glob:missing_*_missing-tracked' |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
82 ! missing_content2_missing-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
83 ! missing_missing_missing-tracked |
33343
305935be8d5c
test-status-rev: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
84 |
23353
c2907334276b
tests: handle differences between missing file error strings on Windows and Unix
Matt Harbison <matt_harbison@yahoo.com>
parents:
23230
diff
changeset
|
85 $ hg status -A --rev 1 'glob:missing_missing_missing-untracked' |
35230
feecfefeba25
tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages
Matt Harbison <matt_harbison@yahoo.com>
parents:
33343
diff
changeset
|
86 missing_missing_missing-untracked: $ENOENT$ |
23230
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
87 |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
88 Status between first and second commit. Should ignore dirstate status. |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
89 |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
90 $ hg status -A --rev 0:1 'glob:content1_content2_*' |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
91 M content1_content2_content1-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
92 M content1_content2_content1-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
93 M content1_content2_content2-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
94 M content1_content2_content2-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
95 M content1_content2_content3-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
96 M content1_content2_content3-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
97 M content1_content2_missing-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
98 M content1_content2_missing-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
99 $ hg status -A --rev 0:1 'glob:content1_content1_*' |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
100 C content1_content1_content1-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
101 C content1_content1_content1-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
102 C content1_content1_content3-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
103 C content1_content1_content3-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
104 C content1_content1_missing-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
105 C content1_content1_missing-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
106 $ hg status -A --rev 0:1 'glob:missing_content2_*' |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
107 A missing_content2_content2-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
108 A missing_content2_content2-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
109 A missing_content2_content3-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
110 A missing_content2_content3-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
111 A missing_content2_missing-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
112 A missing_content2_missing-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
113 $ hg status -A --rev 0:1 'glob:content1_missing_*' |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
114 R content1_missing_content1-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
115 R content1_missing_content1-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
116 R content1_missing_content3-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
117 R content1_missing_content3-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
118 R content1_missing_missing-tracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
119 R content1_missing_missing-untracked |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
120 $ hg status -A --rev 0:1 'glob:missing_missing_*' |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
121 |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
122 Status compared to one revision back, checking that the dirstate status |
7f4f4217c924
test-status-rev: add tests for plain dirstate and inter-revision status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23229
diff
changeset
|
123 is correctly combined with the inter-revision status |
23037
eeaed3d2b004
status: add more complete tests for --rev
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
diff
changeset
|
124 |
23229
2a462c0792fe
test-status-rev: remove unnecessary initial commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
23228
diff
changeset
|
125 $ hg status -A --rev 0 'glob:content1_*_content[23]-tracked' |
23196
daa73289dd2a
test-status-rev: use same names as from generate-working-copy-states
Martin von Zweigbergk <martinvonz@google.com>
parents:
23037
diff
changeset
|
126 M content1_content1_content3-tracked |
23228
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
127 M content1_content2_content2-tracked |
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
128 M content1_content2_content3-tracked |
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
129 M content1_missing_content3-tracked |
23229
2a462c0792fe
test-status-rev: remove unnecessary initial commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
23228
diff
changeset
|
130 $ hg status -A --rev 0 'glob:content1_*_content1-tracked' |
23228
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
131 C content1_content1_content1-tracked |
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
132 C content1_content2_content1-tracked |
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
133 C content1_missing_content1-tracked |
23229
2a462c0792fe
test-status-rev: remove unnecessary initial commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
23228
diff
changeset
|
134 $ hg status -A --rev 0 'glob:missing_*_content?-tracked' |
23228
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
135 A missing_content2_content2-tracked |
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
136 A missing_content2_content3-tracked |
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
137 A missing_missing_content3-tracked |
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
138 BROKEN: missing_content2_content[23]-untracked exist, so should be listed |
23229
2a462c0792fe
test-status-rev: remove unnecessary initial commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
23228
diff
changeset
|
139 $ hg status -A --rev 0 'glob:missing_*_content?-untracked' |
23228
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
140 ? missing_missing_content3-untracked |
23229
2a462c0792fe
test-status-rev: remove unnecessary initial commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
23228
diff
changeset
|
141 $ hg status -A --rev 0 'glob:content1_*_*-untracked' |
23228
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
142 R content1_content1_content1-untracked |
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
143 R content1_content1_content3-untracked |
23196
daa73289dd2a
test-status-rev: use same names as from generate-working-copy-states
Martin von Zweigbergk <martinvonz@google.com>
parents:
23037
diff
changeset
|
144 R content1_content1_missing-untracked |
23228
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
145 R content1_content2_content1-untracked |
23196
daa73289dd2a
test-status-rev: use same names as from generate-working-copy-states
Martin von Zweigbergk <martinvonz@google.com>
parents:
23037
diff
changeset
|
146 R content1_content2_content2-untracked |
23228
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
147 R content1_content2_content3-untracked |
23196
daa73289dd2a
test-status-rev: use same names as from generate-working-copy-states
Martin von Zweigbergk <martinvonz@google.com>
parents:
23037
diff
changeset
|
148 R content1_content2_missing-untracked |
23228
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
149 R content1_missing_content1-untracked |
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
150 R content1_missing_content3-untracked |
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
151 R content1_missing_missing-untracked |
23229
2a462c0792fe
test-status-rev: remove unnecessary initial commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
23228
diff
changeset
|
152 $ hg status -A --rev 0 'glob:*_*_missing-tracked' |
23228
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
153 ! content1_content1_missing-tracked |
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
154 ! content1_content2_missing-tracked |
23196
daa73289dd2a
test-status-rev: use same names as from generate-working-copy-states
Martin von Zweigbergk <martinvonz@google.com>
parents:
23037
diff
changeset
|
155 ! content1_missing_missing-tracked |
daa73289dd2a
test-status-rev: use same names as from generate-working-copy-states
Martin von Zweigbergk <martinvonz@google.com>
parents:
23037
diff
changeset
|
156 ! missing_content2_missing-tracked |
23228
5f5876a2d2b2
test-status-rev: use one glob for each expected status
Martin von Zweigbergk <martinvonz@google.com>
parents:
23227
diff
changeset
|
157 ! missing_missing_missing-tracked |
23229
2a462c0792fe
test-status-rev: remove unnecessary initial commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
23228
diff
changeset
|
158 $ hg status -A --rev 0 'glob:missing_*_missing-untracked' |