##// END OF EJS Templates
test-status-rev: use one glob for each expected status...
Martin von Zweigbergk -
r23228:5f5876a2 default
parent child Browse files
Show More
@@ -1,112 +1,109 b''
1 1 Tests of 'hg status --rev <rev>' to make sure status between <rev> and '.' get
2 2 combined correctly with the dirstate status.
3 3
4 4 $ hg init
5 5 $ touch .hgignore
6 6 $ hg add .hgignore
7 7 $ hg commit -m initial
8 8
9 9 First commit
10 10
11 11 $ python $TESTDIR/generate-working-copy-states.py base
12 12 $ hg addremove --similarity 0
13 13 adding content1_content1_content1-tracked
14 14 adding content1_content1_content1-untracked
15 15 adding content1_content1_content3-tracked
16 16 adding content1_content1_content3-untracked
17 17 adding content1_content1_missing-tracked
18 18 adding content1_content1_missing-untracked
19 19 adding content1_content2_content1-tracked
20 20 adding content1_content2_content1-untracked
21 21 adding content1_content2_content2-tracked
22 22 adding content1_content2_content2-untracked
23 23 adding content1_content2_content3-tracked
24 24 adding content1_content2_content3-untracked
25 25 adding content1_content2_missing-tracked
26 26 adding content1_content2_missing-untracked
27 27 adding content1_missing_content1-tracked
28 28 adding content1_missing_content1-untracked
29 29 adding content1_missing_content3-tracked
30 30 adding content1_missing_content3-untracked
31 31 adding content1_missing_missing-tracked
32 32 adding content1_missing_missing-untracked
33 33 $ hg commit -m first
34 34
35 35 Second commit
36 36
37 37 $ python $TESTDIR/generate-working-copy-states.py parent
38 38 $ hg addremove --similarity 0
39 39 removing content1_missing_content1-tracked
40 40 removing content1_missing_content1-untracked
41 41 removing content1_missing_content3-tracked
42 42 removing content1_missing_content3-untracked
43 43 removing content1_missing_missing-tracked
44 44 removing content1_missing_missing-untracked
45 45 adding missing_content2_content2-tracked
46 46 adding missing_content2_content2-untracked
47 47 adding missing_content2_content3-tracked
48 48 adding missing_content2_content3-untracked
49 49 adding missing_content2_missing-tracked
50 50 adding missing_content2_missing-untracked
51 51 $ hg commit -m second
52 52
53 53 Working copy
54 54
55 55 $ python $TESTDIR/generate-working-copy-states.py wc
56 56 $ hg addremove --similarity 0
57 57 adding content1_missing_content1-tracked
58 58 adding content1_missing_content1-untracked
59 59 adding content1_missing_content3-tracked
60 60 adding content1_missing_content3-untracked
61 61 adding content1_missing_missing-tracked
62 62 adding content1_missing_missing-untracked
63 63 adding missing_missing_content3-tracked
64 64 adding missing_missing_content3-untracked
65 65 adding missing_missing_missing-tracked
66 66 adding missing_missing_missing-untracked
67 67 $ hg forget *_*_*-untracked
68 68 $ rm *_*_missing-*
69 69
70 70 Status compared to one revision back
71 71
72 $ hg status -A --rev 1 content1_content1_content1-tracked
73 C content1_content1_content1-tracked
74 BROKEN: file appears twice; should be '!'
75 $ hg status -A --rev 1 content1_content1_missing-tracked
76 ! content1_content1_missing-tracked
77 C content1_content1_missing-tracked
78 $ hg status -A --rev 1 content1_content1_content1-untracked
79 R content1_content1_content1-untracked
80 $ hg status -A --rev 1 content1_content1_content3-tracked
72 $ hg status -A --rev 1 'glob:content1_*_content[23]-tracked'
81 73 M content1_content1_content3-tracked
82 $ hg status -A --rev 1 content1_content1_missing-untracked
74 M content1_content2_content2-tracked
75 M content1_content2_content3-tracked
76 M content1_missing_content3-tracked
77 $ hg status -A --rev 1 'glob:content1_*_content1-tracked'
78 C content1_content1_content1-tracked
79 C content1_content2_content1-tracked
80 C content1_missing_content1-tracked
81 $ hg status -A --rev 1 'glob:missing_*_content?-tracked'
82 A missing_content2_content2-tracked
83 A missing_content2_content3-tracked
84 A missing_missing_content3-tracked
85 BROKEN: missing_content2_content[23]-untracked exist, so should be listed
86 $ hg status -A --rev 1 'glob:missing_*_content?-untracked'
87 ? missing_missing_content3-untracked
88 $ hg status -A --rev 1 'glob:content1_*_*-untracked'
89 R content1_content1_content1-untracked
90 R content1_content1_content3-untracked
83 91 R content1_content1_missing-untracked
84 $ hg status -A --rev 1 content1_content2_content2-tracked
85 M content1_content2_content2-tracked
86 BROKEN: file appears twice; should be '!'
87 $ hg status -A --rev 1 content1_content2_missing-tracked
88 ! content1_content2_missing-tracked
89 C content1_content2_missing-tracked
90 $ hg status -A --rev 1 content1_content2_content2-untracked
92 R content1_content2_content1-untracked
91 93 R content1_content2_content2-untracked
92 $ hg status -A --rev 1 content1_content2_content3-tracked
93 M content1_content2_content3-tracked
94 $ hg status -A --rev 1 content1_content2_missing-untracked
94 R content1_content2_content3-untracked
95 95 R content1_content2_missing-untracked
96 $ hg status -A --rev 1 content1_missing_content3-tracked
97 M content1_missing_content3-tracked
98 BROKEN: file appears twice; should be '!'
99 $ hg status -A --rev 1 content1_missing_missing-tracked
96 R content1_missing_content1-untracked
97 R content1_missing_content3-untracked
98 R content1_missing_missing-untracked
99 BROKEN: content1_*_missing-tracked appear twice; should just be '!'
100 $ hg status -A --rev 1 'glob:*_*_missing-tracked'
100 101 R content1_missing_missing-tracked
102 ! content1_content1_missing-tracked
103 ! content1_content2_missing-tracked
101 104 ! content1_missing_missing-tracked
102 $ hg status -A --rev 1 content1_missing_content3-untracked
103 R content1_missing_content3-untracked
104 $ hg status -A --rev 1 missing_content2_missing-tracked
105 105 ! missing_content2_missing-tracked
106 BROKEN: file exists, so should be listed (as '?')
107 $ hg status -A --rev 1 missing_content2_content2-untracked
108 $ hg status -A --rev 1 missing_content2_content3-tracked
109 A missing_content2_content3-tracked
110 $ hg status -A --rev 1 missing_content2_missing-untracked
111 $ hg status -A --rev 1 missing_missing_content3-untracked
112 ? missing_missing_content3-untracked
106 ! missing_missing_missing-tracked
107 C content1_content1_missing-tracked
108 C content1_content2_missing-tracked
109 $ hg status -A --rev 1 'glob:missing_*_missing-untracked'
General Comments 0
You need to be logged in to leave comments. Login now