Show More
@@ -1,512 +1,510 b'' | |||||
1 | $ "$TESTDIR/hghave" system-sh || exit 80 |
|
|||
2 |
|
||||
3 |
|
|
1 | $ hg init | |
4 |
|
2 | |||
5 |
|
3 | |||
6 | committing changes |
|
4 | committing changes | |
7 |
|
5 | |||
8 | $ count=0 |
|
6 | $ count=0 | |
9 | $ echo > a |
|
7 | $ echo > a | |
10 | $ while test $count -lt 32 ; do |
|
8 | $ while test $count -lt 32 ; do | |
11 | > echo 'a' >> a |
|
9 | > echo 'a' >> a | |
12 | > test $count -eq 0 && hg add |
|
10 | > test $count -eq 0 && hg add | |
13 | > hg ci -m "msg $count" -d "$count 0" |
|
11 | > hg ci -m "msg $count" -d "$count 0" | |
14 | > count=`expr $count + 1` |
|
12 | > count=`expr $count + 1` | |
15 | > done |
|
13 | > done | |
16 | adding a |
|
14 | adding a | |
17 |
|
15 | |||
18 |
|
16 | |||
19 | $ hg log |
|
17 | $ hg log | |
20 | changeset: 31:58c80a7c8a40 |
|
18 | changeset: 31:58c80a7c8a40 | |
21 | tag: tip |
|
19 | tag: tip | |
22 | user: test |
|
20 | user: test | |
23 | date: Thu Jan 01 00:00:31 1970 +0000 |
|
21 | date: Thu Jan 01 00:00:31 1970 +0000 | |
24 | summary: msg 31 |
|
22 | summary: msg 31 | |
25 |
|
23 | |||
26 | changeset: 30:ed2d2f24b11c |
|
24 | changeset: 30:ed2d2f24b11c | |
27 | user: test |
|
25 | user: test | |
28 | date: Thu Jan 01 00:00:30 1970 +0000 |
|
26 | date: Thu Jan 01 00:00:30 1970 +0000 | |
29 | summary: msg 30 |
|
27 | summary: msg 30 | |
30 |
|
28 | |||
31 | changeset: 29:b5bd63375ab9 |
|
29 | changeset: 29:b5bd63375ab9 | |
32 | user: test |
|
30 | user: test | |
33 | date: Thu Jan 01 00:00:29 1970 +0000 |
|
31 | date: Thu Jan 01 00:00:29 1970 +0000 | |
34 | summary: msg 29 |
|
32 | summary: msg 29 | |
35 |
|
33 | |||
36 | changeset: 28:8e0c2264c8af |
|
34 | changeset: 28:8e0c2264c8af | |
37 | user: test |
|
35 | user: test | |
38 | date: Thu Jan 01 00:00:28 1970 +0000 |
|
36 | date: Thu Jan 01 00:00:28 1970 +0000 | |
39 | summary: msg 28 |
|
37 | summary: msg 28 | |
40 |
|
38 | |||
41 | changeset: 27:288867a866e9 |
|
39 | changeset: 27:288867a866e9 | |
42 | user: test |
|
40 | user: test | |
43 | date: Thu Jan 01 00:00:27 1970 +0000 |
|
41 | date: Thu Jan 01 00:00:27 1970 +0000 | |
44 | summary: msg 27 |
|
42 | summary: msg 27 | |
45 |
|
43 | |||
46 | changeset: 26:3efc6fd51aeb |
|
44 | changeset: 26:3efc6fd51aeb | |
47 | user: test |
|
45 | user: test | |
48 | date: Thu Jan 01 00:00:26 1970 +0000 |
|
46 | date: Thu Jan 01 00:00:26 1970 +0000 | |
49 | summary: msg 26 |
|
47 | summary: msg 26 | |
50 |
|
48 | |||
51 | changeset: 25:02a84173a97a |
|
49 | changeset: 25:02a84173a97a | |
52 | user: test |
|
50 | user: test | |
53 | date: Thu Jan 01 00:00:25 1970 +0000 |
|
51 | date: Thu Jan 01 00:00:25 1970 +0000 | |
54 | summary: msg 25 |
|
52 | summary: msg 25 | |
55 |
|
53 | |||
56 | changeset: 24:10e0acd3809e |
|
54 | changeset: 24:10e0acd3809e | |
57 | user: test |
|
55 | user: test | |
58 | date: Thu Jan 01 00:00:24 1970 +0000 |
|
56 | date: Thu Jan 01 00:00:24 1970 +0000 | |
59 | summary: msg 24 |
|
57 | summary: msg 24 | |
60 |
|
58 | |||
61 | changeset: 23:5ec79163bff4 |
|
59 | changeset: 23:5ec79163bff4 | |
62 | user: test |
|
60 | user: test | |
63 | date: Thu Jan 01 00:00:23 1970 +0000 |
|
61 | date: Thu Jan 01 00:00:23 1970 +0000 | |
64 | summary: msg 23 |
|
62 | summary: msg 23 | |
65 |
|
63 | |||
66 | changeset: 22:06c7993750ce |
|
64 | changeset: 22:06c7993750ce | |
67 | user: test |
|
65 | user: test | |
68 | date: Thu Jan 01 00:00:22 1970 +0000 |
|
66 | date: Thu Jan 01 00:00:22 1970 +0000 | |
69 | summary: msg 22 |
|
67 | summary: msg 22 | |
70 |
|
68 | |||
71 | changeset: 21:e5db6aa3fe2a |
|
69 | changeset: 21:e5db6aa3fe2a | |
72 | user: test |
|
70 | user: test | |
73 | date: Thu Jan 01 00:00:21 1970 +0000 |
|
71 | date: Thu Jan 01 00:00:21 1970 +0000 | |
74 | summary: msg 21 |
|
72 | summary: msg 21 | |
75 |
|
73 | |||
76 | changeset: 20:7128fb4fdbc9 |
|
74 | changeset: 20:7128fb4fdbc9 | |
77 | user: test |
|
75 | user: test | |
78 | date: Thu Jan 01 00:00:20 1970 +0000 |
|
76 | date: Thu Jan 01 00:00:20 1970 +0000 | |
79 | summary: msg 20 |
|
77 | summary: msg 20 | |
80 |
|
78 | |||
81 | changeset: 19:52798545b482 |
|
79 | changeset: 19:52798545b482 | |
82 | user: test |
|
80 | user: test | |
83 | date: Thu Jan 01 00:00:19 1970 +0000 |
|
81 | date: Thu Jan 01 00:00:19 1970 +0000 | |
84 | summary: msg 19 |
|
82 | summary: msg 19 | |
85 |
|
83 | |||
86 | changeset: 18:86977a90077e |
|
84 | changeset: 18:86977a90077e | |
87 | user: test |
|
85 | user: test | |
88 | date: Thu Jan 01 00:00:18 1970 +0000 |
|
86 | date: Thu Jan 01 00:00:18 1970 +0000 | |
89 | summary: msg 18 |
|
87 | summary: msg 18 | |
90 |
|
88 | |||
91 | changeset: 17:03515f4a9080 |
|
89 | changeset: 17:03515f4a9080 | |
92 | user: test |
|
90 | user: test | |
93 | date: Thu Jan 01 00:00:17 1970 +0000 |
|
91 | date: Thu Jan 01 00:00:17 1970 +0000 | |
94 | summary: msg 17 |
|
92 | summary: msg 17 | |
95 |
|
93 | |||
96 | changeset: 16:a2e6ea4973e9 |
|
94 | changeset: 16:a2e6ea4973e9 | |
97 | user: test |
|
95 | user: test | |
98 | date: Thu Jan 01 00:00:16 1970 +0000 |
|
96 | date: Thu Jan 01 00:00:16 1970 +0000 | |
99 | summary: msg 16 |
|
97 | summary: msg 16 | |
100 |
|
98 | |||
101 | changeset: 15:e7fa0811edb0 |
|
99 | changeset: 15:e7fa0811edb0 | |
102 | user: test |
|
100 | user: test | |
103 | date: Thu Jan 01 00:00:15 1970 +0000 |
|
101 | date: Thu Jan 01 00:00:15 1970 +0000 | |
104 | summary: msg 15 |
|
102 | summary: msg 15 | |
105 |
|
103 | |||
106 | changeset: 14:ce8f0998e922 |
|
104 | changeset: 14:ce8f0998e922 | |
107 | user: test |
|
105 | user: test | |
108 | date: Thu Jan 01 00:00:14 1970 +0000 |
|
106 | date: Thu Jan 01 00:00:14 1970 +0000 | |
109 | summary: msg 14 |
|
107 | summary: msg 14 | |
110 |
|
108 | |||
111 | changeset: 13:9d7d07bc967c |
|
109 | changeset: 13:9d7d07bc967c | |
112 | user: test |
|
110 | user: test | |
113 | date: Thu Jan 01 00:00:13 1970 +0000 |
|
111 | date: Thu Jan 01 00:00:13 1970 +0000 | |
114 | summary: msg 13 |
|
112 | summary: msg 13 | |
115 |
|
113 | |||
116 | changeset: 12:1941b52820a5 |
|
114 | changeset: 12:1941b52820a5 | |
117 | user: test |
|
115 | user: test | |
118 | date: Thu Jan 01 00:00:12 1970 +0000 |
|
116 | date: Thu Jan 01 00:00:12 1970 +0000 | |
119 | summary: msg 12 |
|
117 | summary: msg 12 | |
120 |
|
118 | |||
121 | changeset: 11:7b4cd9578619 |
|
119 | changeset: 11:7b4cd9578619 | |
122 | user: test |
|
120 | user: test | |
123 | date: Thu Jan 01 00:00:11 1970 +0000 |
|
121 | date: Thu Jan 01 00:00:11 1970 +0000 | |
124 | summary: msg 11 |
|
122 | summary: msg 11 | |
125 |
|
123 | |||
126 | changeset: 10:7c5eff49a6b6 |
|
124 | changeset: 10:7c5eff49a6b6 | |
127 | user: test |
|
125 | user: test | |
128 | date: Thu Jan 01 00:00:10 1970 +0000 |
|
126 | date: Thu Jan 01 00:00:10 1970 +0000 | |
129 | summary: msg 10 |
|
127 | summary: msg 10 | |
130 |
|
128 | |||
131 | changeset: 9:eb44510ef29a |
|
129 | changeset: 9:eb44510ef29a | |
132 | user: test |
|
130 | user: test | |
133 | date: Thu Jan 01 00:00:09 1970 +0000 |
|
131 | date: Thu Jan 01 00:00:09 1970 +0000 | |
134 | summary: msg 9 |
|
132 | summary: msg 9 | |
135 |
|
133 | |||
136 | changeset: 8:453eb4dba229 |
|
134 | changeset: 8:453eb4dba229 | |
137 | user: test |
|
135 | user: test | |
138 | date: Thu Jan 01 00:00:08 1970 +0000 |
|
136 | date: Thu Jan 01 00:00:08 1970 +0000 | |
139 | summary: msg 8 |
|
137 | summary: msg 8 | |
140 |
|
138 | |||
141 | changeset: 7:03750880c6b5 |
|
139 | changeset: 7:03750880c6b5 | |
142 | user: test |
|
140 | user: test | |
143 | date: Thu Jan 01 00:00:07 1970 +0000 |
|
141 | date: Thu Jan 01 00:00:07 1970 +0000 | |
144 | summary: msg 7 |
|
142 | summary: msg 7 | |
145 |
|
143 | |||
146 | changeset: 6:a3d5c6fdf0d3 |
|
144 | changeset: 6:a3d5c6fdf0d3 | |
147 | user: test |
|
145 | user: test | |
148 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
146 | date: Thu Jan 01 00:00:06 1970 +0000 | |
149 | summary: msg 6 |
|
147 | summary: msg 6 | |
150 |
|
148 | |||
151 | changeset: 5:7874a09ea728 |
|
149 | changeset: 5:7874a09ea728 | |
152 | user: test |
|
150 | user: test | |
153 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
151 | date: Thu Jan 01 00:00:05 1970 +0000 | |
154 | summary: msg 5 |
|
152 | summary: msg 5 | |
155 |
|
153 | |||
156 | changeset: 4:9b2ba8336a65 |
|
154 | changeset: 4:9b2ba8336a65 | |
157 | user: test |
|
155 | user: test | |
158 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
156 | date: Thu Jan 01 00:00:04 1970 +0000 | |
159 | summary: msg 4 |
|
157 | summary: msg 4 | |
160 |
|
158 | |||
161 | changeset: 3:b53bea5e2fcb |
|
159 | changeset: 3:b53bea5e2fcb | |
162 | user: test |
|
160 | user: test | |
163 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
161 | date: Thu Jan 01 00:00:03 1970 +0000 | |
164 | summary: msg 3 |
|
162 | summary: msg 3 | |
165 |
|
163 | |||
166 | changeset: 2:db07c04beaca |
|
164 | changeset: 2:db07c04beaca | |
167 | user: test |
|
165 | user: test | |
168 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
166 | date: Thu Jan 01 00:00:02 1970 +0000 | |
169 | summary: msg 2 |
|
167 | summary: msg 2 | |
170 |
|
168 | |||
171 | changeset: 1:5cd978ea5149 |
|
169 | changeset: 1:5cd978ea5149 | |
172 | user: test |
|
170 | user: test | |
173 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
171 | date: Thu Jan 01 00:00:01 1970 +0000 | |
174 | summary: msg 1 |
|
172 | summary: msg 1 | |
175 |
|
173 | |||
176 | changeset: 0:b99c7b9c8e11 |
|
174 | changeset: 0:b99c7b9c8e11 | |
177 | user: test |
|
175 | user: test | |
178 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
176 | date: Thu Jan 01 00:00:00 1970 +0000 | |
179 | summary: msg 0 |
|
177 | summary: msg 0 | |
180 |
|
178 | |||
181 |
|
179 | |||
182 | $ hg up -C |
|
180 | $ hg up -C | |
183 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
181 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
184 |
|
182 | |||
185 | bisect test |
|
183 | bisect test | |
186 |
|
184 | |||
187 | $ hg bisect -r |
|
185 | $ hg bisect -r | |
188 | $ hg bisect -b |
|
186 | $ hg bisect -b | |
189 | $ hg bisect -g 1 |
|
187 | $ hg bisect -g 1 | |
190 | Testing changeset 16:a2e6ea4973e9 (30 changesets remaining, ~4 tests) |
|
188 | Testing changeset 16:a2e6ea4973e9 (30 changesets remaining, ~4 tests) | |
191 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
189 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
192 | $ hg bisect -g |
|
190 | $ hg bisect -g | |
193 | Testing changeset 23:5ec79163bff4 (15 changesets remaining, ~3 tests) |
|
191 | Testing changeset 23:5ec79163bff4 (15 changesets remaining, ~3 tests) | |
194 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
192 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
195 |
|
193 | |||
196 | skip |
|
194 | skip | |
197 |
|
195 | |||
198 | $ hg bisect -s |
|
196 | $ hg bisect -s | |
199 | Testing changeset 24:10e0acd3809e (15 changesets remaining, ~3 tests) |
|
197 | Testing changeset 24:10e0acd3809e (15 changesets remaining, ~3 tests) | |
200 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
198 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
201 | $ hg bisect -g |
|
199 | $ hg bisect -g | |
202 | Testing changeset 27:288867a866e9 (7 changesets remaining, ~2 tests) |
|
200 | Testing changeset 27:288867a866e9 (7 changesets remaining, ~2 tests) | |
203 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
201 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
204 | $ hg bisect -g |
|
202 | $ hg bisect -g | |
205 | Testing changeset 29:b5bd63375ab9 (4 changesets remaining, ~2 tests) |
|
203 | Testing changeset 29:b5bd63375ab9 (4 changesets remaining, ~2 tests) | |
206 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
204 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
207 | $ hg bisect -b |
|
205 | $ hg bisect -b | |
208 | Testing changeset 28:8e0c2264c8af (2 changesets remaining, ~1 tests) |
|
206 | Testing changeset 28:8e0c2264c8af (2 changesets remaining, ~1 tests) | |
209 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
207 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
210 | $ hg bisect -g |
|
208 | $ hg bisect -g | |
211 | The first bad revision is: |
|
209 | The first bad revision is: | |
212 | changeset: 29:b5bd63375ab9 |
|
210 | changeset: 29:b5bd63375ab9 | |
213 | user: test |
|
211 | user: test | |
214 | date: Thu Jan 01 00:00:29 1970 +0000 |
|
212 | date: Thu Jan 01 00:00:29 1970 +0000 | |
215 | summary: msg 29 |
|
213 | summary: msg 29 | |
216 |
|
214 | |||
217 |
|
215 | |||
218 | mark revsets instead of single revs |
|
216 | mark revsets instead of single revs | |
219 |
|
217 | |||
220 | $ hg bisect -r |
|
218 | $ hg bisect -r | |
221 | $ hg bisect -b "0::3" |
|
219 | $ hg bisect -b "0::3" | |
222 | $ hg bisect -s "13::16" |
|
220 | $ hg bisect -s "13::16" | |
223 | $ hg bisect -g "26::tip" |
|
221 | $ hg bisect -g "26::tip" | |
224 | Testing changeset 12:1941b52820a5 (23 changesets remaining, ~4 tests) |
|
222 | Testing changeset 12:1941b52820a5 (23 changesets remaining, ~4 tests) | |
225 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
223 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
226 | $ cat .hg/bisect.state |
|
224 | $ cat .hg/bisect.state | |
227 | current 1941b52820a544549596820a8ae006842b0e2c64 |
|
225 | current 1941b52820a544549596820a8ae006842b0e2c64 | |
228 | skip 9d7d07bc967ca98ad0600c24953fd289ad5fa991 |
|
226 | skip 9d7d07bc967ca98ad0600c24953fd289ad5fa991 | |
229 | skip ce8f0998e922c179e80819d5066fbe46e2998784 |
|
227 | skip ce8f0998e922c179e80819d5066fbe46e2998784 | |
230 | skip e7fa0811edb063f6319531f0d0a865882138e180 |
|
228 | skip e7fa0811edb063f6319531f0d0a865882138e180 | |
231 | skip a2e6ea4973e9196ddd3386493b0c214b41fd97d3 |
|
229 | skip a2e6ea4973e9196ddd3386493b0c214b41fd97d3 | |
232 | bad b99c7b9c8e11558adef3fad9af211c58d46f325b |
|
230 | bad b99c7b9c8e11558adef3fad9af211c58d46f325b | |
233 | bad 5cd978ea51499179507ee7b6f340d2dbaa401185 |
|
231 | bad 5cd978ea51499179507ee7b6f340d2dbaa401185 | |
234 | bad db07c04beaca44cf24832541e7f4a2346a95275b |
|
232 | bad db07c04beaca44cf24832541e7f4a2346a95275b | |
235 | bad b53bea5e2fcb30d3e00bd3409507a5659ce0fd8b |
|
233 | bad b53bea5e2fcb30d3e00bd3409507a5659ce0fd8b | |
236 | good 3efc6fd51aeb8594398044c6c846ca59ae021203 |
|
234 | good 3efc6fd51aeb8594398044c6c846ca59ae021203 | |
237 | good 288867a866e9adb7a29880b66936c874b80f4651 |
|
235 | good 288867a866e9adb7a29880b66936c874b80f4651 | |
238 | good 8e0c2264c8af790daf3585ada0669d93dee09c83 |
|
236 | good 8e0c2264c8af790daf3585ada0669d93dee09c83 | |
239 | good b5bd63375ab9a290419f2024b7f4ee9ea7ce90a8 |
|
237 | good b5bd63375ab9a290419f2024b7f4ee9ea7ce90a8 | |
240 | good ed2d2f24b11c368fa8aa0da9f4e1db580abade59 |
|
238 | good ed2d2f24b11c368fa8aa0da9f4e1db580abade59 | |
241 | good 58c80a7c8a4025a94cedaf7b4a4e3124e8909a96 |
|
239 | good 58c80a7c8a4025a94cedaf7b4a4e3124e8909a96 | |
242 |
|
240 | |||
243 | bisect reverse test |
|
241 | bisect reverse test | |
244 |
|
242 | |||
245 | $ hg bisect -r |
|
243 | $ hg bisect -r | |
246 | $ hg bisect -b null |
|
244 | $ hg bisect -b null | |
247 | $ hg bisect -g tip |
|
245 | $ hg bisect -g tip | |
248 | Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests) |
|
246 | Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests) | |
249 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
247 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
250 | $ hg bisect -g |
|
248 | $ hg bisect -g | |
251 | Testing changeset 7:03750880c6b5 (16 changesets remaining, ~4 tests) |
|
249 | Testing changeset 7:03750880c6b5 (16 changesets remaining, ~4 tests) | |
252 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
250 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
253 |
|
251 | |||
254 | skip |
|
252 | skip | |
255 |
|
253 | |||
256 | $ hg bisect -s |
|
254 | $ hg bisect -s | |
257 | Testing changeset 6:a3d5c6fdf0d3 (16 changesets remaining, ~4 tests) |
|
255 | Testing changeset 6:a3d5c6fdf0d3 (16 changesets remaining, ~4 tests) | |
258 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
256 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
259 | $ hg bisect -g |
|
257 | $ hg bisect -g | |
260 | Testing changeset 2:db07c04beaca (7 changesets remaining, ~2 tests) |
|
258 | Testing changeset 2:db07c04beaca (7 changesets remaining, ~2 tests) | |
261 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
259 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
262 | $ hg bisect -g |
|
260 | $ hg bisect -g | |
263 | Testing changeset 0:b99c7b9c8e11 (3 changesets remaining, ~1 tests) |
|
261 | Testing changeset 0:b99c7b9c8e11 (3 changesets remaining, ~1 tests) | |
264 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
262 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
265 | $ hg bisect -b |
|
263 | $ hg bisect -b | |
266 | Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests) |
|
264 | Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests) | |
267 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
265 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
268 | $ hg bisect -g |
|
266 | $ hg bisect -g | |
269 | The first good revision is: |
|
267 | The first good revision is: | |
270 | changeset: 1:5cd978ea5149 |
|
268 | changeset: 1:5cd978ea5149 | |
271 | user: test |
|
269 | user: test | |
272 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
270 | date: Thu Jan 01 00:00:01 1970 +0000 | |
273 | summary: msg 1 |
|
271 | summary: msg 1 | |
274 |
|
272 | |||
275 |
|
273 | |||
276 | $ hg bisect -r |
|
274 | $ hg bisect -r | |
277 | $ hg bisect -g tip |
|
275 | $ hg bisect -g tip | |
278 | $ hg bisect -b tip |
|
276 | $ hg bisect -b tip | |
279 | abort: starting revisions are not directly related |
|
277 | abort: starting revisions are not directly related | |
280 | [255] |
|
278 | [255] | |
281 |
|
279 | |||
282 | $ hg bisect -r |
|
280 | $ hg bisect -r | |
283 | $ hg bisect -g null |
|
281 | $ hg bisect -g null | |
284 | $ hg bisect -bU tip |
|
282 | $ hg bisect -bU tip | |
285 | Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests) |
|
283 | Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests) | |
286 | $ hg id |
|
284 | $ hg id | |
287 | 5cd978ea5149 |
|
285 | 5cd978ea5149 | |
288 |
|
286 | |||
289 |
|
287 | |||
290 | Issue1228: hg bisect crashes when you skip the last rev in bisection |
|
288 | Issue1228: hg bisect crashes when you skip the last rev in bisection | |
291 | Issue1182: hg bisect exception |
|
289 | Issue1182: hg bisect exception | |
292 |
|
290 | |||
293 | $ hg bisect -r |
|
291 | $ hg bisect -r | |
294 | $ hg bisect -b 4 |
|
292 | $ hg bisect -b 4 | |
295 | $ hg bisect -g 0 |
|
293 | $ hg bisect -g 0 | |
296 | Testing changeset 2:db07c04beaca (4 changesets remaining, ~2 tests) |
|
294 | Testing changeset 2:db07c04beaca (4 changesets remaining, ~2 tests) | |
297 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
295 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
298 | $ hg bisect -s |
|
296 | $ hg bisect -s | |
299 | Testing changeset 1:5cd978ea5149 (4 changesets remaining, ~2 tests) |
|
297 | Testing changeset 1:5cd978ea5149 (4 changesets remaining, ~2 tests) | |
300 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
298 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
301 | $ hg bisect -s |
|
299 | $ hg bisect -s | |
302 | Testing changeset 3:b53bea5e2fcb (4 changesets remaining, ~2 tests) |
|
300 | Testing changeset 3:b53bea5e2fcb (4 changesets remaining, ~2 tests) | |
303 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
301 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
304 | $ hg bisect -s |
|
302 | $ hg bisect -s | |
305 | Due to skipped revisions, the first bad revision could be any of: |
|
303 | Due to skipped revisions, the first bad revision could be any of: | |
306 | changeset: 1:5cd978ea5149 |
|
304 | changeset: 1:5cd978ea5149 | |
307 | user: test |
|
305 | user: test | |
308 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
306 | date: Thu Jan 01 00:00:01 1970 +0000 | |
309 | summary: msg 1 |
|
307 | summary: msg 1 | |
310 |
|
308 | |||
311 | changeset: 2:db07c04beaca |
|
309 | changeset: 2:db07c04beaca | |
312 | user: test |
|
310 | user: test | |
313 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
311 | date: Thu Jan 01 00:00:02 1970 +0000 | |
314 | summary: msg 2 |
|
312 | summary: msg 2 | |
315 |
|
313 | |||
316 | changeset: 3:b53bea5e2fcb |
|
314 | changeset: 3:b53bea5e2fcb | |
317 | user: test |
|
315 | user: test | |
318 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
316 | date: Thu Jan 01 00:00:03 1970 +0000 | |
319 | summary: msg 3 |
|
317 | summary: msg 3 | |
320 |
|
318 | |||
321 | changeset: 4:9b2ba8336a65 |
|
319 | changeset: 4:9b2ba8336a65 | |
322 | user: test |
|
320 | user: test | |
323 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
321 | date: Thu Jan 01 00:00:04 1970 +0000 | |
324 | summary: msg 4 |
|
322 | summary: msg 4 | |
325 |
|
323 | |||
326 |
|
324 | |||
327 |
|
325 | |||
328 | reproduce non converging bisect, issue1182 |
|
326 | reproduce non converging bisect, issue1182 | |
329 |
|
327 | |||
330 | $ hg bisect -r |
|
328 | $ hg bisect -r | |
331 | $ hg bisect -g 0 |
|
329 | $ hg bisect -g 0 | |
332 | $ hg bisect -b 2 |
|
330 | $ hg bisect -b 2 | |
333 | Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests) |
|
331 | Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests) | |
334 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
332 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
335 | $ hg bisect -s |
|
333 | $ hg bisect -s | |
336 | Due to skipped revisions, the first bad revision could be any of: |
|
334 | Due to skipped revisions, the first bad revision could be any of: | |
337 | changeset: 1:5cd978ea5149 |
|
335 | changeset: 1:5cd978ea5149 | |
338 | user: test |
|
336 | user: test | |
339 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
337 | date: Thu Jan 01 00:00:01 1970 +0000 | |
340 | summary: msg 1 |
|
338 | summary: msg 1 | |
341 |
|
339 | |||
342 | changeset: 2:db07c04beaca |
|
340 | changeset: 2:db07c04beaca | |
343 | user: test |
|
341 | user: test | |
344 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
342 | date: Thu Jan 01 00:00:02 1970 +0000 | |
345 | summary: msg 2 |
|
343 | summary: msg 2 | |
346 |
|
344 | |||
347 |
|
345 | |||
348 |
|
346 | |||
349 | test no action |
|
347 | test no action | |
350 |
|
348 | |||
351 | $ hg bisect -r |
|
349 | $ hg bisect -r | |
352 | $ hg bisect |
|
350 | $ hg bisect | |
353 | abort: cannot bisect (no known good revisions) |
|
351 | abort: cannot bisect (no known good revisions) | |
354 | [255] |
|
352 | [255] | |
355 |
|
353 | |||
356 |
|
354 | |||
357 | reproduce AssertionError, issue1445 |
|
355 | reproduce AssertionError, issue1445 | |
358 |
|
356 | |||
359 | $ hg bisect -r |
|
357 | $ hg bisect -r | |
360 | $ hg bisect -b 6 |
|
358 | $ hg bisect -b 6 | |
361 | $ hg bisect -g 0 |
|
359 | $ hg bisect -g 0 | |
362 | Testing changeset 3:b53bea5e2fcb (6 changesets remaining, ~2 tests) |
|
360 | Testing changeset 3:b53bea5e2fcb (6 changesets remaining, ~2 tests) | |
363 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
361 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
364 | $ hg bisect -s |
|
362 | $ hg bisect -s | |
365 | Testing changeset 2:db07c04beaca (6 changesets remaining, ~2 tests) |
|
363 | Testing changeset 2:db07c04beaca (6 changesets remaining, ~2 tests) | |
366 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
364 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
367 | $ hg bisect -s |
|
365 | $ hg bisect -s | |
368 | Testing changeset 4:9b2ba8336a65 (6 changesets remaining, ~2 tests) |
|
366 | Testing changeset 4:9b2ba8336a65 (6 changesets remaining, ~2 tests) | |
369 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
367 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
370 | $ hg bisect -s |
|
368 | $ hg bisect -s | |
371 | Testing changeset 1:5cd978ea5149 (6 changesets remaining, ~2 tests) |
|
369 | Testing changeset 1:5cd978ea5149 (6 changesets remaining, ~2 tests) | |
372 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
370 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
373 | $ hg bisect -s |
|
371 | $ hg bisect -s | |
374 | Testing changeset 5:7874a09ea728 (6 changesets remaining, ~2 tests) |
|
372 | Testing changeset 5:7874a09ea728 (6 changesets remaining, ~2 tests) | |
375 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
373 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
376 | $ hg bisect -g |
|
374 | $ hg bisect -g | |
377 | The first bad revision is: |
|
375 | The first bad revision is: | |
378 | changeset: 6:a3d5c6fdf0d3 |
|
376 | changeset: 6:a3d5c6fdf0d3 | |
379 | user: test |
|
377 | user: test | |
380 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
378 | date: Thu Jan 01 00:00:06 1970 +0000 | |
381 | summary: msg 6 |
|
379 | summary: msg 6 | |
382 |
|
380 | |||
383 | $ hg log -r "bisect(good)" |
|
381 | $ hg log -r "bisect(good)" | |
384 | changeset: 0:b99c7b9c8e11 |
|
382 | changeset: 0:b99c7b9c8e11 | |
385 | user: test |
|
383 | user: test | |
386 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
384 | date: Thu Jan 01 00:00:00 1970 +0000 | |
387 | summary: msg 0 |
|
385 | summary: msg 0 | |
388 |
|
386 | |||
389 | changeset: 5:7874a09ea728 |
|
387 | changeset: 5:7874a09ea728 | |
390 | user: test |
|
388 | user: test | |
391 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
389 | date: Thu Jan 01 00:00:05 1970 +0000 | |
392 | summary: msg 5 |
|
390 | summary: msg 5 | |
393 |
|
391 | |||
394 | $ hg log -r "bisect(bad)" |
|
392 | $ hg log -r "bisect(bad)" | |
395 | changeset: 6:a3d5c6fdf0d3 |
|
393 | changeset: 6:a3d5c6fdf0d3 | |
396 | user: test |
|
394 | user: test | |
397 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
395 | date: Thu Jan 01 00:00:06 1970 +0000 | |
398 | summary: msg 6 |
|
396 | summary: msg 6 | |
399 |
|
397 | |||
400 | $ hg log -r "bisect(current)" |
|
398 | $ hg log -r "bisect(current)" | |
401 | changeset: 5:7874a09ea728 |
|
399 | changeset: 5:7874a09ea728 | |
402 | user: test |
|
400 | user: test | |
403 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
401 | date: Thu Jan 01 00:00:05 1970 +0000 | |
404 | summary: msg 5 |
|
402 | summary: msg 5 | |
405 |
|
403 | |||
406 | $ hg log -r "bisect(skip)" |
|
404 | $ hg log -r "bisect(skip)" | |
407 | changeset: 1:5cd978ea5149 |
|
405 | changeset: 1:5cd978ea5149 | |
408 | user: test |
|
406 | user: test | |
409 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
407 | date: Thu Jan 01 00:00:01 1970 +0000 | |
410 | summary: msg 1 |
|
408 | summary: msg 1 | |
411 |
|
409 | |||
412 | changeset: 2:db07c04beaca |
|
410 | changeset: 2:db07c04beaca | |
413 | user: test |
|
411 | user: test | |
414 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
412 | date: Thu Jan 01 00:00:02 1970 +0000 | |
415 | summary: msg 2 |
|
413 | summary: msg 2 | |
416 |
|
414 | |||
417 | changeset: 3:b53bea5e2fcb |
|
415 | changeset: 3:b53bea5e2fcb | |
418 | user: test |
|
416 | user: test | |
419 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
417 | date: Thu Jan 01 00:00:03 1970 +0000 | |
420 | summary: msg 3 |
|
418 | summary: msg 3 | |
421 |
|
419 | |||
422 | changeset: 4:9b2ba8336a65 |
|
420 | changeset: 4:9b2ba8336a65 | |
423 | user: test |
|
421 | user: test | |
424 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
422 | date: Thu Jan 01 00:00:04 1970 +0000 | |
425 | summary: msg 4 |
|
423 | summary: msg 4 | |
426 |
|
424 | |||
427 |
|
425 | |||
428 | test legacy bisected() keyword |
|
426 | test legacy bisected() keyword | |
429 |
|
427 | |||
430 | $ hg log -r "bisected(bad)" |
|
428 | $ hg log -r "bisected(bad)" | |
431 | changeset: 6:a3d5c6fdf0d3 |
|
429 | changeset: 6:a3d5c6fdf0d3 | |
432 | user: test |
|
430 | user: test | |
433 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
431 | date: Thu Jan 01 00:00:06 1970 +0000 | |
434 | summary: msg 6 |
|
432 | summary: msg 6 | |
435 |
|
433 | |||
436 |
|
434 | |||
437 | $ set +e |
|
435 | $ set +e | |
438 |
|
436 | |||
439 | test invalid command |
|
437 | test invalid command | |
440 | assuming that the shell returns 127 if command not found ... |
|
438 | assuming that the shell returns 127 if command not found ... | |
441 |
|
439 | |||
442 | $ hg bisect -r |
|
440 | $ hg bisect -r | |
443 | $ hg bisect --command 'exit 127' |
|
441 | $ hg bisect --command 'exit 127' | |
444 | abort: failed to execute exit 127 |
|
442 | abort: failed to execute exit 127 | |
445 | [255] |
|
443 | [255] | |
446 |
|
444 | |||
447 |
|
445 | |||
448 | test bisecting command |
|
446 | test bisecting command | |
449 |
|
447 | |||
450 | $ cat > script.py <<EOF |
|
448 | $ cat > script.py <<EOF | |
451 | > #!/usr/bin/env python |
|
449 | > #!/usr/bin/env python | |
452 | > import sys |
|
450 | > import sys | |
453 | > from mercurial import ui, hg |
|
451 | > from mercurial import ui, hg | |
454 | > repo = hg.repository(ui.ui(), '.') |
|
452 | > repo = hg.repository(ui.ui(), '.') | |
455 | > if repo['.'].rev() < 6: |
|
453 | > if repo['.'].rev() < 6: | |
456 | > sys.exit(1) |
|
454 | > sys.exit(1) | |
457 | > EOF |
|
455 | > EOF | |
458 | $ chmod +x script.py |
|
456 | $ chmod +x script.py | |
459 | $ hg bisect -r |
|
457 | $ hg bisect -r | |
460 | $ hg bisect --good tip |
|
458 | $ hg bisect --good tip | |
461 | $ hg bisect --bad 0 |
|
459 | $ hg bisect --bad 0 | |
462 | Testing changeset 15:e7fa0811edb0 (31 changesets remaining, ~4 tests) |
|
460 | Testing changeset 15:e7fa0811edb0 (31 changesets remaining, ~4 tests) | |
463 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
461 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
464 |
$ hg bisect --command " |
|
462 | $ hg bisect --command "python \"$TESTTMP/script.py\" and some parameters" | |
465 | changeset 15:e7fa0811edb0: good |
|
463 | changeset 15:e7fa0811edb0: good | |
466 | changeset 7:03750880c6b5: good |
|
464 | changeset 7:03750880c6b5: good | |
467 | changeset 3:b53bea5e2fcb: bad |
|
465 | changeset 3:b53bea5e2fcb: bad | |
468 | changeset 5:7874a09ea728: bad |
|
466 | changeset 5:7874a09ea728: bad | |
469 | changeset 6:a3d5c6fdf0d3: good |
|
467 | changeset 6:a3d5c6fdf0d3: good | |
470 | The first good revision is: |
|
468 | The first good revision is: | |
471 | changeset: 6:a3d5c6fdf0d3 |
|
469 | changeset: 6:a3d5c6fdf0d3 | |
472 | user: test |
|
470 | user: test | |
473 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
471 | date: Thu Jan 01 00:00:06 1970 +0000 | |
474 | summary: msg 6 |
|
472 | summary: msg 6 | |
475 |
|
473 | |||
476 |
|
474 | |||
477 |
|
475 | |||
478 | test bisecting via a command without updating the working dir, and |
|
476 | test bisecting via a command without updating the working dir, and | |
479 | ensure that the bisect state file is updated before running a test |
|
477 | ensure that the bisect state file is updated before running a test | |
480 | command |
|
478 | command | |
481 |
|
479 | |||
482 | $ hg update null |
|
480 | $ hg update null | |
483 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
481 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
484 | $ cat > script.sh <<'EOF' |
|
482 | $ cat > script.sh <<'EOF' | |
485 | > #!/bin/sh |
|
483 | > #!/bin/sh | |
486 | > test -n "$HG_NODE" || (echo HG_NODE missing; exit 127) |
|
484 | > test -n "$HG_NODE" || (echo HG_NODE missing; exit 127) | |
487 | > current="`hg log -r \"bisect(current)\" --template {node}`" |
|
485 | > current="`hg log -r \"bisect(current)\" --template {node}`" | |
488 | > test "$current" = "$HG_NODE" || (echo current is bad: $current; exit 127) |
|
486 | > test "$current" = "$HG_NODE" || (echo current is bad: $current; exit 127) | |
489 | > rev="`hg log -r $HG_NODE --template {rev}`" |
|
487 | > rev="`hg log -r $HG_NODE --template {rev}`" | |
490 | > test "$rev" -ge 6 |
|
488 | > test "$rev" -ge 6 | |
491 | > EOF |
|
489 | > EOF | |
492 | $ chmod +x script.sh |
|
490 | $ chmod +x script.sh | |
493 | $ hg bisect -r |
|
491 | $ hg bisect -r | |
494 | $ hg bisect --good tip --noupdate |
|
492 | $ hg bisect --good tip --noupdate | |
495 | $ hg bisect --bad 0 --noupdate |
|
493 | $ hg bisect --bad 0 --noupdate | |
496 | Testing changeset 15:e7fa0811edb0 (31 changesets remaining, ~4 tests) |
|
494 | Testing changeset 15:e7fa0811edb0 (31 changesets remaining, ~4 tests) | |
497 |
$ hg bisect --command " |
|
495 | $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" --noupdate | |
498 | changeset 15:e7fa0811edb0: good |
|
496 | changeset 15:e7fa0811edb0: good | |
499 | changeset 7:03750880c6b5: good |
|
497 | changeset 7:03750880c6b5: good | |
500 | changeset 3:b53bea5e2fcb: bad |
|
498 | changeset 3:b53bea5e2fcb: bad | |
501 | changeset 5:7874a09ea728: bad |
|
499 | changeset 5:7874a09ea728: bad | |
502 | changeset 6:a3d5c6fdf0d3: good |
|
500 | changeset 6:a3d5c6fdf0d3: good | |
503 | The first good revision is: |
|
501 | The first good revision is: | |
504 | changeset: 6:a3d5c6fdf0d3 |
|
502 | changeset: 6:a3d5c6fdf0d3 | |
505 | user: test |
|
503 | user: test | |
506 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
504 | date: Thu Jan 01 00:00:06 1970 +0000 | |
507 | summary: msg 6 |
|
505 | summary: msg 6 | |
508 |
|
506 | |||
509 |
|
507 | |||
510 | ensure that we still don't have a working dir |
|
508 | ensure that we still don't have a working dir | |
511 |
|
509 | |||
512 | $ hg parents |
|
510 | $ hg parents |
General Comments 0
You need to be logged in to leave comments.
Login now