Mercurial > hg
annotate tests/test-bisect.t @ 47890:3853e6ee160d
dirstatemap: replace `removefile` by an explicit `entry.set_untracked()`
All the other caller goes through `reset_state`, so we can safely have an
explicit method on `DirstateItem` object.
This means that all the logic to preserve the previous state (from p2, merged,
etc) is now properly encapsulated within the DirstateItem. This pave the way to
using different storage for these information.
Differential Revision: https://phab.mercurial-scm.org/D11315
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Aug 2021 11:27:01 +0200 |
parents | f51ff655d338 |
children | 42d2b31cee0b |
rev | line source |
---|---|
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
1 $ hg init |
2924
d62ce27d925a
tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
2 |
d62ce27d925a
tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
3 |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
4 committing changes |
2924
d62ce27d925a
tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
5 |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
6 $ count=0 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
7 $ echo > a |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
8 $ while test $count -lt 32 ; do |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
9 > echo 'a' >> a |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
10 > test $count -eq 0 && hg add |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
11 > hg ci -m "msg $count" -d "$count 0" |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
12 > count=`expr $count + 1` |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
13 > done |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
14 adding a |
2924
d62ce27d925a
tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
15 |
d62ce27d925a
tests: new test for the bisect extension
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
16 |
45979
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
17 $ hg log -G |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
18 @ changeset: 31:58c80a7c8a40 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
19 | tag: tip |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
20 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
21 | date: Thu Jan 01 00:00:31 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
22 | summary: msg 31 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
23 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
24 o changeset: 30:ed2d2f24b11c |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
25 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
26 | date: Thu Jan 01 00:00:30 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
27 | summary: msg 30 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
28 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
29 o changeset: 29:b5bd63375ab9 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
30 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
31 | date: Thu Jan 01 00:00:29 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
32 | summary: msg 29 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
33 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
34 o changeset: 28:8e0c2264c8af |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
35 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
36 | date: Thu Jan 01 00:00:28 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
37 | summary: msg 28 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
38 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
39 o changeset: 27:288867a866e9 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
40 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
41 | date: Thu Jan 01 00:00:27 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
42 | summary: msg 27 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
43 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
44 o changeset: 26:3efc6fd51aeb |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
45 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
46 | date: Thu Jan 01 00:00:26 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
47 | summary: msg 26 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
48 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
49 o changeset: 25:02a84173a97a |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
50 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
51 | date: Thu Jan 01 00:00:25 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
52 | summary: msg 25 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
53 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
54 o changeset: 24:10e0acd3809e |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
55 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
56 | date: Thu Jan 01 00:00:24 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
57 | summary: msg 24 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
58 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
59 o changeset: 23:5ec79163bff4 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
60 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
61 | date: Thu Jan 01 00:00:23 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
62 | summary: msg 23 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
63 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
64 o changeset: 22:06c7993750ce |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
65 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
66 | date: Thu Jan 01 00:00:22 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
67 | summary: msg 22 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
68 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
69 o changeset: 21:e5db6aa3fe2a |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
70 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
71 | date: Thu Jan 01 00:00:21 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
72 | summary: msg 21 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
73 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
74 o changeset: 20:7128fb4fdbc9 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
75 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
76 | date: Thu Jan 01 00:00:20 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
77 | summary: msg 20 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
78 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
79 o changeset: 19:52798545b482 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
80 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
81 | date: Thu Jan 01 00:00:19 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
82 | summary: msg 19 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
83 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
84 o changeset: 18:86977a90077e |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
85 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
86 | date: Thu Jan 01 00:00:18 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
87 | summary: msg 18 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
88 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
89 o changeset: 17:03515f4a9080 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
90 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
91 | date: Thu Jan 01 00:00:17 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
92 | summary: msg 17 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
93 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
94 o changeset: 16:a2e6ea4973e9 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
95 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
96 | date: Thu Jan 01 00:00:16 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
97 | summary: msg 16 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
98 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
99 o changeset: 15:e7fa0811edb0 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
100 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
101 | date: Thu Jan 01 00:00:15 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
102 | summary: msg 15 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
103 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
104 o changeset: 14:ce8f0998e922 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
105 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
106 | date: Thu Jan 01 00:00:14 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
107 | summary: msg 14 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
108 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
109 o changeset: 13:9d7d07bc967c |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
110 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
111 | date: Thu Jan 01 00:00:13 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
112 | summary: msg 13 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
113 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
114 o changeset: 12:1941b52820a5 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
115 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
116 | date: Thu Jan 01 00:00:12 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
117 | summary: msg 12 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
118 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
119 o changeset: 11:7b4cd9578619 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
120 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
121 | date: Thu Jan 01 00:00:11 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
122 | summary: msg 11 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
123 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
124 o changeset: 10:7c5eff49a6b6 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
125 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
126 | date: Thu Jan 01 00:00:10 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
127 | summary: msg 10 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
128 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
129 o changeset: 9:eb44510ef29a |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
130 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
131 | date: Thu Jan 01 00:00:09 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
132 | summary: msg 9 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
133 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
134 o changeset: 8:453eb4dba229 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
135 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
136 | date: Thu Jan 01 00:00:08 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
137 | summary: msg 8 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
138 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
139 o changeset: 7:03750880c6b5 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
140 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
141 | date: Thu Jan 01 00:00:07 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
142 | summary: msg 7 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
143 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
144 o changeset: 6:a3d5c6fdf0d3 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
145 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
146 | date: Thu Jan 01 00:00:06 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
147 | summary: msg 6 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
148 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
149 o changeset: 5:7874a09ea728 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
150 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
151 | date: Thu Jan 01 00:00:05 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
152 | summary: msg 5 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
153 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
154 o changeset: 4:9b2ba8336a65 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
155 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
156 | date: Thu Jan 01 00:00:04 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
157 | summary: msg 4 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
158 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
159 o changeset: 3:b53bea5e2fcb |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
160 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
161 | date: Thu Jan 01 00:00:03 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
162 | summary: msg 3 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
163 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
164 o changeset: 2:db07c04beaca |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
165 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
166 | date: Thu Jan 01 00:00:02 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
167 | summary: msg 2 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
168 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
169 o changeset: 1:5cd978ea5149 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
170 | user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
171 | date: Thu Jan 01 00:00:01 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
172 | summary: msg 1 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
173 | |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
174 o changeset: 0:b99c7b9c8e11 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
175 user: test |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
176 date: Thu Jan 01 00:00:00 1970 +0000 |
744ea3c4f41b
bisect: add `-G` to an `hg log` command in a test
Simon Sapin <simon-commits@exyr.org>
parents:
45875
diff
changeset
|
177 summary: msg 0 |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
178 |
5776
35ec669cdd43
bisect: handle search for bad to good transitions
Matt Mackall <mpm@selenic.com>
parents:
5775
diff
changeset
|
179 |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
180 $ hg up -C |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
181 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
182 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
183 bisect test |
5777 | 184 |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
185 $ hg bisect -r |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
186 $ hg bisect -b |
33771
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33542
diff
changeset
|
187 $ hg status -v |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33542
diff
changeset
|
188 # The repository is in an unfinished *bisect* state. |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33542
diff
changeset
|
189 |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33542
diff
changeset
|
190 # To mark the changeset good: hg bisect --good |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33542
diff
changeset
|
191 # To mark the changeset bad: hg bisect --bad |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33542
diff
changeset
|
192 # To abort: hg bisect --reset |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33542
diff
changeset
|
193 |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33542
diff
changeset
|
194 $ hg status -v --config commands.status.skipstates=bisect |
19213
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
18463
diff
changeset
|
195 $ hg summary |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
18463
diff
changeset
|
196 parent: 31:58c80a7c8a40 tip |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
18463
diff
changeset
|
197 msg 31 |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
18463
diff
changeset
|
198 branch: default |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
18463
diff
changeset
|
199 commit: (clean) |
f324a9b8d4bf
summary: add tests for some extensions we plan to modify
Bryan O'Sullivan <bryano@fb.com>
parents:
18463
diff
changeset
|
200 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
201 phases: 32 draft |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
202 $ hg bisect -g 1 |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
203 Testing changeset 16:a2e6ea4973e9 "msg 16" (30 changesets remaining, ~4 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
204 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
205 $ hg bisect -g |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
206 Testing changeset 23:5ec79163bff4 "msg 23" (15 changesets remaining, ~3 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
207 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
208 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
209 skip |
5777 | 210 |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
211 $ hg bisect -s |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
212 Testing changeset 24:10e0acd3809e "msg 24" (15 changesets remaining, ~3 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
213 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
214 $ hg bisect -g |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
215 Testing changeset 27:288867a866e9 "msg 27" (7 changesets remaining, ~2 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
216 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
217 $ hg bisect -g |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
218 Testing changeset 29:b5bd63375ab9 "msg 29" (4 changesets remaining, ~2 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
219 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
220 $ hg bisect -b |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
221 Testing changeset 28:8e0c2264c8af "msg 28" (2 changesets remaining, ~1 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
222 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
223 $ hg bisect -g |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
224 The first bad revision is: |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
225 changeset: 29:b5bd63375ab9 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
226 user: test |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
227 date: Thu Jan 01 00:00:29 1970 +0000 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
228 summary: msg 29 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
229 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
230 |
12177
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
231 mark revsets instead of single revs |
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
232 |
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
233 $ hg bisect -r |
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
234 $ hg bisect -b "0::3" |
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
235 $ hg bisect -s "13::16" |
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
236 $ hg bisect -g "26::tip" |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
237 Testing changeset 12:1941b52820a5 "msg 12" (23 changesets remaining, ~4 tests) |
12177
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
238 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
239 $ cat .hg/bisect.state |
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
240 bad b99c7b9c8e11558adef3fad9af211c58d46f325b |
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
241 bad 5cd978ea51499179507ee7b6f340d2dbaa401185 |
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
242 bad db07c04beaca44cf24832541e7f4a2346a95275b |
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
243 bad b53bea5e2fcb30d3e00bd3409507a5659ce0fd8b |
18358
93293813d753
bisect: store state sorted
Mads Kiilerich <mads@kiilerich.com>
parents:
16960
diff
changeset
|
244 current 1941b52820a544549596820a8ae006842b0e2c64 |
12177
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
245 good 3efc6fd51aeb8594398044c6c846ca59ae021203 |
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
246 good 288867a866e9adb7a29880b66936c874b80f4651 |
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
247 good 8e0c2264c8af790daf3585ada0669d93dee09c83 |
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
248 good b5bd63375ab9a290419f2024b7f4ee9ea7ce90a8 |
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
249 good ed2d2f24b11c368fa8aa0da9f4e1db580abade59 |
80399b5b5f13
bisect: allow revsets in addition to single revs (issue2360)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12094
diff
changeset
|
250 good 58c80a7c8a4025a94cedaf7b4a4e3124e8909a96 |
18358
93293813d753
bisect: store state sorted
Mads Kiilerich <mads@kiilerich.com>
parents:
16960
diff
changeset
|
251 skip 9d7d07bc967ca98ad0600c24953fd289ad5fa991 |
93293813d753
bisect: store state sorted
Mads Kiilerich <mads@kiilerich.com>
parents:
16960
diff
changeset
|
252 skip ce8f0998e922c179e80819d5066fbe46e2998784 |
93293813d753
bisect: store state sorted
Mads Kiilerich <mads@kiilerich.com>
parents:
16960
diff
changeset
|
253 skip e7fa0811edb063f6319531f0d0a865882138e180 |
93293813d753
bisect: store state sorted
Mads Kiilerich <mads@kiilerich.com>
parents:
16960
diff
changeset
|
254 skip a2e6ea4973e9196ddd3386493b0c214b41fd97d3 |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
255 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
256 bisect reverse test |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
257 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
258 $ hg bisect -r |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
259 $ hg bisect -b null |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
260 $ hg bisect -g tip |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
261 Testing changeset 15:e7fa0811edb0 "msg 15" (32 changesets remaining, ~5 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
262 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
263 $ hg bisect -g |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
264 Testing changeset 7:03750880c6b5 "msg 7" (16 changesets remaining, ~4 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
265 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
266 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
267 skip |
6860
6d904eb19c2a
add additional bisect tests
Bernhard Leiner <bleiner@gmail.com>
parents:
5777
diff
changeset
|
268 |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
269 $ hg bisect -s |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
270 Testing changeset 6:a3d5c6fdf0d3 "msg 6" (16 changesets remaining, ~4 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
271 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
272 $ hg bisect -g |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
273 Testing changeset 2:db07c04beaca "msg 2" (7 changesets remaining, ~2 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
274 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
275 $ hg bisect -g |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
276 Testing changeset 0:b99c7b9c8e11 "msg 0" (3 changesets remaining, ~1 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
277 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
278 $ hg bisect -b |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
279 Testing changeset 1:5cd978ea5149 "msg 1" (2 changesets remaining, ~1 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
280 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
281 $ hg bisect -g |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
282 The first good revision is: |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
283 changeset: 1:5cd978ea5149 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
284 user: test |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
285 date: Thu Jan 01 00:00:01 1970 +0000 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
286 summary: msg 1 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
287 |
6860
6d904eb19c2a
add additional bisect tests
Bernhard Leiner <bleiner@gmail.com>
parents:
5777
diff
changeset
|
288 |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
289 $ hg bisect -r |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
290 $ hg bisect -g tip |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
291 $ hg bisect -b tip |
20094
06ef32c3b4bb
bisect: report "both good and bad" as such, not as "not directly related"
Mads Kiilerich <madski@unity3d.com>
parents:
19213
diff
changeset
|
292 abort: inconsistent state, 31:58c80a7c8a40 is good and bad |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12365
diff
changeset
|
293 [255] |
6983
5ce625983208
bisect: only complain when nothing can be done
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6929
diff
changeset
|
294 |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
295 $ hg bisect -r |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
296 $ hg bisect -g null |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
297 $ hg bisect -bU tip |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
298 Testing changeset 15:e7fa0811edb0 "msg 15" (32 changesets remaining, ~5 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
299 $ hg id |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
300 5cd978ea5149 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
301 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
302 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
303 Issue1228: hg bisect crashes when you skip the last rev in bisection |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
304 Issue1182: hg bisect exception |
7557
21233de9c053
Circumvent removal of valid bisect candidates due to previously skipped ones
Bernhard Leiner <bleiner@gmail.com>
parents:
6990
diff
changeset
|
305 |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
306 $ hg bisect -r |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
307 $ hg bisect -b 4 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
308 $ hg bisect -g 0 |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
309 Testing changeset 2:db07c04beaca "msg 2" (4 changesets remaining, ~2 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
310 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
311 $ hg bisect -s |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
312 Testing changeset 1:5cd978ea5149 "msg 1" (4 changesets remaining, ~2 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
313 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
314 $ hg bisect -s |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
315 Testing changeset 3:b53bea5e2fcb "msg 3" (4 changesets remaining, ~2 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
316 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
317 $ hg bisect -s |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
318 Due to skipped revisions, the first bad revision could be any of: |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
319 changeset: 1:5cd978ea5149 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
320 user: test |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
321 date: Thu Jan 01 00:00:01 1970 +0000 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
322 summary: msg 1 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
323 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
324 changeset: 2:db07c04beaca |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
325 user: test |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
326 date: Thu Jan 01 00:00:02 1970 +0000 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
327 summary: msg 2 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
328 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
329 changeset: 3:b53bea5e2fcb |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
330 user: test |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
331 date: Thu Jan 01 00:00:03 1970 +0000 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
332 summary: msg 3 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
333 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
334 changeset: 4:9b2ba8336a65 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
335 user: test |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
336 date: Thu Jan 01 00:00:04 1970 +0000 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
337 summary: msg 4 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
338 |
8802
ca14b3982ffe
bisect: fix traceback when command executable is not found
Patrick Mezard <pmezard@gmail.com>
parents:
7557
diff
changeset
|
339 |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
340 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
341 reproduce non converging bisect, issue1182 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
342 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
343 $ hg bisect -r |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
344 $ hg bisect -g 0 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
345 $ hg bisect -b 2 |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
346 Testing changeset 1:5cd978ea5149 "msg 1" (2 changesets remaining, ~1 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
347 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
348 $ hg bisect -s |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
349 Due to skipped revisions, the first bad revision could be any of: |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
350 changeset: 1:5cd978ea5149 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
351 user: test |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
352 date: Thu Jan 01 00:00:01 1970 +0000 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
353 summary: msg 1 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
354 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
355 changeset: 2:db07c04beaca |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
356 user: test |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
357 date: Thu Jan 01 00:00:02 1970 +0000 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
358 summary: msg 2 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
359 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
360 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
361 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
362 test no action |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
363 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
364 $ hg bisect -r |
12365
22f3353bcc36
tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
365 $ hg bisect |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
366 abort: cannot bisect (no known good revisions) |
45875
e641bb2a6159
errors: raise StateError in `hg bisect`
Martin von Zweigbergk <martinvonz@google.com>
parents:
45827
diff
changeset
|
367 [20] |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
368 |
8803
2b35ced86b69
test-bisect: test --command option
Patrick Mezard <pmezard@gmail.com>
parents:
8802
diff
changeset
|
369 |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
370 reproduce AssertionError, issue1445 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
371 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
372 $ hg bisect -r |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
373 $ hg bisect -b 6 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
374 $ hg bisect -g 0 |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
375 Testing changeset 3:b53bea5e2fcb "msg 3" (6 changesets remaining, ~2 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
376 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
377 $ hg bisect -s |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
378 Testing changeset 2:db07c04beaca "msg 2" (6 changesets remaining, ~2 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
379 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
380 $ hg bisect -s |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
381 Testing changeset 4:9b2ba8336a65 "msg 4" (6 changesets remaining, ~2 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
382 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
383 $ hg bisect -s |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
384 Testing changeset 1:5cd978ea5149 "msg 1" (6 changesets remaining, ~2 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
385 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
386 $ hg bisect -s |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
387 Testing changeset 5:7874a09ea728 "msg 5" (6 changesets remaining, ~2 tests) |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
388 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
389 $ hg bisect -g |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
390 The first bad revision is: |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
391 changeset: 6:a3d5c6fdf0d3 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
392 user: test |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
393 date: Thu Jan 01 00:00:06 1970 +0000 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
394 summary: msg 6 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
395 |
15134
81adf7777f8f
revset: rename bisected() to bisect()
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
13602
diff
changeset
|
396 $ hg log -r "bisect(good)" |
13602
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
397 changeset: 0:b99c7b9c8e11 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
398 user: test |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
399 date: Thu Jan 01 00:00:00 1970 +0000 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
400 summary: msg 0 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
401 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
402 changeset: 5:7874a09ea728 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
403 user: test |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
404 date: Thu Jan 01 00:00:05 1970 +0000 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
405 summary: msg 5 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
406 |
15134
81adf7777f8f
revset: rename bisected() to bisect()
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
13602
diff
changeset
|
407 $ hg log -r "bisect(bad)" |
13602
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
408 changeset: 6:a3d5c6fdf0d3 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
409 user: test |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
410 date: Thu Jan 01 00:00:06 1970 +0000 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
411 summary: msg 6 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
412 |
16647
14913fcb30c6
bisect: track the current changeset (issue3382)
Bryan O'Sullivan <bryano@fb.com>
parents:
15519
diff
changeset
|
413 $ hg log -r "bisect(current)" |
14913fcb30c6
bisect: track the current changeset (issue3382)
Bryan O'Sullivan <bryano@fb.com>
parents:
15519
diff
changeset
|
414 changeset: 5:7874a09ea728 |
14913fcb30c6
bisect: track the current changeset (issue3382)
Bryan O'Sullivan <bryano@fb.com>
parents:
15519
diff
changeset
|
415 user: test |
14913fcb30c6
bisect: track the current changeset (issue3382)
Bryan O'Sullivan <bryano@fb.com>
parents:
15519
diff
changeset
|
416 date: Thu Jan 01 00:00:05 1970 +0000 |
14913fcb30c6
bisect: track the current changeset (issue3382)
Bryan O'Sullivan <bryano@fb.com>
parents:
15519
diff
changeset
|
417 summary: msg 5 |
14913fcb30c6
bisect: track the current changeset (issue3382)
Bryan O'Sullivan <bryano@fb.com>
parents:
15519
diff
changeset
|
418 |
15134
81adf7777f8f
revset: rename bisected() to bisect()
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
13602
diff
changeset
|
419 $ hg log -r "bisect(skip)" |
13602
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
420 changeset: 1:5cd978ea5149 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
421 user: test |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
422 date: Thu Jan 01 00:00:01 1970 +0000 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
423 summary: msg 1 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
424 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
425 changeset: 2:db07c04beaca |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
426 user: test |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
427 date: Thu Jan 01 00:00:02 1970 +0000 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
428 summary: msg 2 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
429 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
430 changeset: 3:b53bea5e2fcb |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
431 user: test |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
432 date: Thu Jan 01 00:00:03 1970 +0000 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
433 summary: msg 3 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
434 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
435 changeset: 4:9b2ba8336a65 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
436 user: test |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
437 date: Thu Jan 01 00:00:04 1970 +0000 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
438 summary: msg 4 |
54b198fe9768
revset: add a revset command to get bisect state.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12406
diff
changeset
|
439 |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
440 |
15134
81adf7777f8f
revset: rename bisected() to bisect()
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
13602
diff
changeset
|
441 test legacy bisected() keyword |
81adf7777f8f
revset: rename bisected() to bisect()
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
13602
diff
changeset
|
442 |
81adf7777f8f
revset: rename bisected() to bisect()
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
13602
diff
changeset
|
443 $ hg log -r "bisected(bad)" |
81adf7777f8f
revset: rename bisected() to bisect()
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
13602
diff
changeset
|
444 changeset: 6:a3d5c6fdf0d3 |
81adf7777f8f
revset: rename bisected() to bisect()
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
13602
diff
changeset
|
445 user: test |
81adf7777f8f
revset: rename bisected() to bisect()
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
13602
diff
changeset
|
446 date: Thu Jan 01 00:00:06 1970 +0000 |
81adf7777f8f
revset: rename bisected() to bisect()
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
13602
diff
changeset
|
447 summary: msg 6 |
81adf7777f8f
revset: rename bisected() to bisect()
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
13602
diff
changeset
|
448 |
81adf7777f8f
revset: rename bisected() to bisect()
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
13602
diff
changeset
|
449 |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
450 $ set +e |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
451 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
452 test invalid command |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
453 assuming that the shell returns 127 if command not found ... |
8803
2b35ced86b69
test-bisect: test --command option
Patrick Mezard <pmezard@gmail.com>
parents:
8802
diff
changeset
|
454 |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
455 $ hg bisect -r |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
456 $ hg bisect --command 'exit 127' |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
457 abort: failed to execute exit 127 |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12177
diff
changeset
|
458 [255] |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
459 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
460 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
461 test bisecting command |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
462 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
463 $ cat > script.py <<EOF |
32938
b6776b34e44e
tests: use $PYTHON in #! so we always use the right Python
Augie Fackler <augie@google.com>
parents:
32766
diff
changeset
|
464 > #!$PYTHON |
33945
403040b5a5bd
tests: update test-bisect to pass our module import checker
Augie Fackler <raf@durin42.com>
parents:
33883
diff
changeset
|
465 > from __future__ import absolute_import |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
466 > import sys |
33945
403040b5a5bd
tests: update test-bisect to pass our module import checker
Augie Fackler <raf@durin42.com>
parents:
33883
diff
changeset
|
467 > from mercurial import hg, ui as uimod |
36829
4eb3bf227ce7
py3: make test-bisect.t bytes-safe
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
468 > repo = hg.repository(uimod.ui.load(), b'.') |
4eb3bf227ce7
py3: make test-bisect.t bytes-safe
Yuya Nishihara <yuya@tcha.org>
parents:
34866
diff
changeset
|
469 > if repo[b'.'].rev() < 6: |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
470 > sys.exit(1) |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
471 > EOF |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
472 $ chmod +x script.py |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
473 $ hg bisect -r |
20237
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
474 $ hg up -qr tip |
32976
d39639fb840e
tests: adjust quoting to keep Windows happy with recent $PYTHON change
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
475 $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters" |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
476 changeset 31:58c80a7c8a40 tip "msg 31": good |
20237
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
477 abort: cannot bisect (no known bad revisions) |
45875
e641bb2a6159
errors: raise StateError in `hg bisect`
Martin von Zweigbergk <martinvonz@google.com>
parents:
45827
diff
changeset
|
478 [20] |
20237
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
479 $ hg up -qr 0 |
32976
d39639fb840e
tests: adjust quoting to keep Windows happy with recent $PYTHON change
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
480 $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters" |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
481 changeset 0:b99c7b9c8e11 "msg 0": bad |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
482 changeset 15:e7fa0811edb0 "msg 15": good |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
483 changeset 7:03750880c6b5 "msg 7": good |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
484 changeset 3:b53bea5e2fcb "msg 3": bad |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
485 changeset 5:7874a09ea728 "msg 5": bad |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
486 changeset 6:a3d5c6fdf0d3 "msg 6": good |
12094
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
487 The first good revision is: |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
488 changeset: 6:a3d5c6fdf0d3 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
489 user: test |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
490 date: Thu Jan 01 00:00:06 1970 +0000 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
491 summary: msg 6 |
1db76910f9b4
tests: convert test-bisect
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10775
diff
changeset
|
492 |
16648
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
493 |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
494 |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
495 test bisecting via a command without updating the working dir, and |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
496 ensure that the bisect state file is updated before running a test |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
497 command |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
498 |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
499 $ hg update null |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
500 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
501 $ cat > script.sh <<'EOF' |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
502 > #!/bin/sh |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
503 > test -n "$HG_NODE" || (echo HG_NODE missing; exit 127) |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
504 > current="`hg log -r \"bisect(current)\" --template {node}`" |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
505 > test "$current" = "$HG_NODE" || (echo current is bad: $current; exit 127) |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
506 > rev="`hg log -r $HG_NODE --template {rev}`" |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
507 > test "$rev" -ge 6 |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
508 > EOF |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
509 $ chmod +x script.sh |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
510 $ hg bisect -r |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
511 $ hg bisect --good tip --noupdate |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
512 $ hg bisect --bad 0 --noupdate |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
513 Testing changeset 15:e7fa0811edb0 "msg 15" (31 changesets remaining, ~4 tests) |
16960
be64115b4955
test-bisect: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16936
diff
changeset
|
514 $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" --noupdate |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
515 changeset 15:e7fa0811edb0 "msg 15": good |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
516 changeset 7:03750880c6b5 "msg 7": good |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
517 changeset 3:b53bea5e2fcb "msg 3": bad |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
518 changeset 5:7874a09ea728 "msg 5": bad |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
519 changeset 6:a3d5c6fdf0d3 "msg 6": good |
16648
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
520 The first good revision is: |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
521 changeset: 6:a3d5c6fdf0d3 |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
522 user: test |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
523 date: Thu Jan 01 00:00:06 1970 +0000 |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
524 summary: msg 6 |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
525 |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
526 |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
527 ensure that we still don't have a working dir |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
528 |
1388cc711ea7
bisect: set HG_NODE when runing a command
Bryan O'Sullivan <bryano@fb.com>
parents:
16647
diff
changeset
|
529 $ hg parents |
18463
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
530 |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
531 |
20237
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
532 test the same case, this time with updating |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
533 |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
534 $ cat > script.sh <<'EOF' |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
535 > #!/bin/sh |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
536 > test -n "$HG_NODE" || (echo HG_NODE missing; exit 127) |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
537 > current="`hg log -r \"bisect(current)\" --template {node}`" |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
538 > test "$current" = "$HG_NODE" || (echo current is bad: $current; exit 127) |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
539 > rev="`hg log -r . --template {rev}`" |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
540 > test "$rev" -ge 6 |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
541 > EOF |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
542 $ chmod +x script.sh |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
543 $ hg bisect -r |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
544 $ hg up -qr tip |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
545 $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
546 changeset 31:58c80a7c8a40 tip "msg 31": good |
20237
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
547 abort: cannot bisect (no known bad revisions) |
45875
e641bb2a6159
errors: raise StateError in `hg bisect`
Martin von Zweigbergk <martinvonz@google.com>
parents:
45827
diff
changeset
|
548 [20] |
20237
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
549 $ hg up -qr 0 |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
550 $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
551 changeset 0:b99c7b9c8e11 "msg 0": bad |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
552 changeset 15:e7fa0811edb0 "msg 15": good |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
553 changeset 7:03750880c6b5 "msg 7": good |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
554 changeset 3:b53bea5e2fcb "msg 3": bad |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
555 changeset 5:7874a09ea728 "msg 5": bad |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
556 changeset 6:a3d5c6fdf0d3 "msg 6": good |
20237
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
557 The first good revision is: |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
558 changeset: 6:a3d5c6fdf0d3 |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
559 user: test |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
560 date: Thu Jan 01 00:00:06 1970 +0000 |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
561 summary: msg 6 |
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
562 |
32131
35a69efbf190
bisect: allow resetting with unfinished graft/rebase/etc
Martin von Zweigbergk <martinvonz@google.com>
parents:
30559
diff
changeset
|
563 $ hg graft -q 15 |
35a69efbf190
bisect: allow resetting with unfinished graft/rebase/etc
Martin von Zweigbergk <martinvonz@google.com>
parents:
30559
diff
changeset
|
564 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
35a69efbf190
bisect: allow resetting with unfinished graft/rebase/etc
Martin von Zweigbergk <martinvonz@google.com>
parents:
30559
diff
changeset
|
565 abort: unresolved conflicts, can't continue |
35a69efbf190
bisect: allow resetting with unfinished graft/rebase/etc
Martin von Zweigbergk <martinvonz@google.com>
parents:
30559
diff
changeset
|
566 (use 'hg resolve' and 'hg graft --continue') |
44725
16c361152133
graft: exit 1 on conflicts, like merge
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents:
42893
diff
changeset
|
567 [1] |
32131
35a69efbf190
bisect: allow resetting with unfinished graft/rebase/etc
Martin von Zweigbergk <martinvonz@google.com>
parents:
30559
diff
changeset
|
568 $ hg bisect --reset |
35a69efbf190
bisect: allow resetting with unfinished graft/rebase/etc
Martin von Zweigbergk <martinvonz@google.com>
parents:
30559
diff
changeset
|
569 $ hg up -C . |
35a69efbf190
bisect: allow resetting with unfinished graft/rebase/etc
Martin von Zweigbergk <martinvonz@google.com>
parents:
30559
diff
changeset
|
570 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
20237
0d32dd60016c
bisect: --command without --noupdate should flag the parent rev it tested
Mads Kiilerich <madski@unity3d.com>
parents:
20094
diff
changeset
|
571 |
18463
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
572 Check that bisect does not break on obsolete changesets |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
573 ========================================================= |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
574 |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
20237
diff
changeset
|
575 $ cat >> $HGRCPATH << EOF |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
20237
diff
changeset
|
576 > [experimental] |
34866
1644623ab096
config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents:
33945
diff
changeset
|
577 > evolution.createmarkers=True |
18463
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
578 > EOF |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
579 |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
580 tip is obsolete |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
581 --------------------- |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
582 |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
583 $ hg debugobsolete `hg id --debug -i -r tip` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42310
diff
changeset
|
584 1 new obsolescence markers |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
32976
diff
changeset
|
585 obsoleted 1 changesets |
18463
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
586 $ hg bisect --reset |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
587 $ hg bisect --good 15 |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
588 $ hg bisect --bad 30 |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
589 Testing changeset 22:06c7993750ce "msg 22" (15 changesets remaining, ~3 tests) |
18463
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
590 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
591 $ hg bisect --command true |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
592 changeset 22:06c7993750ce "msg 22": good |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
593 changeset 26:3efc6fd51aeb "msg 26": good |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
594 changeset 28:8e0c2264c8af "msg 28": good |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
595 changeset 29:b5bd63375ab9 "msg 29": good |
18463
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
596 The first bad revision is: |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
597 changeset: 30:ed2d2f24b11c |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
598 tag: tip |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
599 user: test |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
600 date: Thu Jan 01 00:00:30 1970 +0000 |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
601 summary: msg 30 |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
602 |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
603 |
42310
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
604 Rewritten commits should not crash |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
605 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
606 $ hg co 29 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
607 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
608 $ hg revert --all -r 30 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
609 reverting a |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
610 $ hg commit -m 'msg 30 -- fixed' |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
611 created new head |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
612 $ hg debugobsolete `hg id --debug -i -r 30` `hg id --debug -i -r .` |
42893
34a46d48d24e
debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42310
diff
changeset
|
613 1 new obsolescence markers |
42310
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
614 obsoleted 1 changesets |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
615 $ hg bisect |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
616 The first bad revision is: |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
617 changeset: 30:ed2d2f24b11c |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
618 user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
619 date: Thu Jan 01 00:00:30 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
620 obsolete: rewritten as 32:8a638ebd1122 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
621 summary: msg 30 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
622 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
623 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
624 Log template does not crash |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
625 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
626 $ hg log -GTbisect -r 15:: |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
627 @ changeset: 32:8a638ebd1122 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
628 | bisect: good (implicit) |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
629 | tag: tip |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
630 | parent: 29:b5bd63375ab9 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
631 | user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
632 | date: Thu Jan 01 00:00:00 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
633 | summary: msg 30 -- fixed |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
634 | |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
635 o changeset: 29:b5bd63375ab9 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
636 | bisect: good |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
637 | user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
638 | date: Thu Jan 01 00:00:29 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
639 | summary: msg 29 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
640 | |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
641 o changeset: 28:8e0c2264c8af |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
642 | bisect: good |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
643 | user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
644 | date: Thu Jan 01 00:00:28 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
645 | summary: msg 28 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
646 | |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
647 o changeset: 27:288867a866e9 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
648 | bisect: ignored |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
649 | user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
650 | date: Thu Jan 01 00:00:27 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
651 | summary: msg 27 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
652 | |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
653 o changeset: 26:3efc6fd51aeb |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
654 | bisect: good |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
655 | user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
656 | date: Thu Jan 01 00:00:26 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
657 | summary: msg 26 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
658 | |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
659 o changeset: 25:02a84173a97a |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
660 | bisect: ignored |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
661 | user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
662 | date: Thu Jan 01 00:00:25 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
663 | summary: msg 25 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
664 | |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
665 o changeset: 24:10e0acd3809e |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
666 | bisect: ignored |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
667 | user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
668 | date: Thu Jan 01 00:00:24 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
669 | summary: msg 24 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
670 | |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
671 o changeset: 23:5ec79163bff4 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
672 | bisect: ignored |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
673 | user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
674 | date: Thu Jan 01 00:00:23 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
675 | summary: msg 23 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
676 | |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
677 o changeset: 22:06c7993750ce |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
678 | bisect: good |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
679 | user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
680 | date: Thu Jan 01 00:00:22 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
681 | summary: msg 22 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
682 | |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
683 o changeset: 21:e5db6aa3fe2a |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
684 | bisect: ignored |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
685 | user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
686 | date: Thu Jan 01 00:00:21 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
687 | summary: msg 21 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
688 | |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
689 o changeset: 20:7128fb4fdbc9 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
690 | bisect: ignored |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
691 | user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
692 | date: Thu Jan 01 00:00:20 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
693 | summary: msg 20 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
694 | |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
695 o changeset: 19:52798545b482 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
696 | bisect: ignored |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
697 | user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
698 | date: Thu Jan 01 00:00:19 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
699 | summary: msg 19 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
700 | |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
701 o changeset: 18:86977a90077e |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
702 | bisect: ignored |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
703 | user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
704 | date: Thu Jan 01 00:00:18 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
705 | summary: msg 18 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
706 | |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
707 o changeset: 17:03515f4a9080 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
708 | bisect: ignored |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
709 | user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
710 | date: Thu Jan 01 00:00:17 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
711 | summary: msg 17 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
712 | |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
713 o changeset: 16:a2e6ea4973e9 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
714 | bisect: ignored |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
715 | user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
716 | date: Thu Jan 01 00:00:16 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
717 | summary: msg 16 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
718 | |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
719 o changeset: 15:e7fa0811edb0 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
720 | bisect: good |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
721 ~ user: test |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
722 date: Thu Jan 01 00:00:15 1970 +0000 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
723 summary: msg 15 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
724 |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
725 $ hg debugobsolete --delete `hg debugobsolete --index -T'{index}\n' | tail -1` |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
726 deleted 1 obsolescence markers |
21eda240be07
bisect: do not crash with rewritten commits
timeless <timeless@mozdev.org>
parents:
36829
diff
changeset
|
727 |
18463
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
728 Changeset in the bad:good range is obsolete |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
729 --------------------------------------------- |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
730 |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
731 $ hg up 30 |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
732 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
733 $ echo 'a' >> a |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
734 $ hg ci -m "msg 32" -d "32 0" |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
735 $ hg bisect --reset |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
736 $ hg bisect --good . |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
737 $ hg bisect --bad 25 |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
738 Testing changeset 28:8e0c2264c8af "msg 28" (6 changesets remaining, ~2 tests) |
18463
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
739 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
740 $ hg bisect --command true |
46798
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
741 changeset 28:8e0c2264c8af "msg 28": good |
f51ff655d338
bisect: use standard one-line commit summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45979
diff
changeset
|
742 changeset 26:3efc6fd51aeb "msg 26": good |
18463
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
743 The first good revision is: |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
744 changeset: 26:3efc6fd51aeb |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
745 user: test |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
746 date: Thu Jan 01 00:00:26 1970 +0000 |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
747 summary: msg 26 |
07771e233cf1
bisect: use changelog for iteration
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18358
diff
changeset
|
748 |
32766
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
749 Test the validation message when exclusive options are used: |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
750 |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
751 $ hg bisect -r |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
752 $ hg bisect -b -c false |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
753 abort: --bad and --command are incompatible |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44725
diff
changeset
|
754 [10] |
32766
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
755 $ hg bisect -b -e |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
756 abort: --bad and --extend are incompatible |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44725
diff
changeset
|
757 [10] |
32766
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
758 $ hg bisect -b -g |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
759 abort: --bad and --good are incompatible |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44725
diff
changeset
|
760 [10] |
32766
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
761 $ hg bisect -b -r |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
762 abort: --bad and --reset are incompatible |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44725
diff
changeset
|
763 [10] |
32766
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
764 $ hg bisect -b -s |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
765 abort: --bad and --skip are incompatible |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44725
diff
changeset
|
766 [10] |
32766
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
767 $ hg bisect -c false -e |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
768 abort: --command and --extend are incompatible |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44725
diff
changeset
|
769 [10] |
32766
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
770 $ hg bisect -c false -g |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
771 abort: --command and --good are incompatible |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44725
diff
changeset
|
772 [10] |
32766
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
773 $ hg bisect -c false -r |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
774 abort: --command and --reset are incompatible |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44725
diff
changeset
|
775 [10] |
32766
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
776 $ hg bisect -c false -s |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
777 abort: --command and --skip are incompatible |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44725
diff
changeset
|
778 [10] |
32766
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
779 $ hg bisect -e -g |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
780 abort: --extend and --good are incompatible |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44725
diff
changeset
|
781 [10] |
32766
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
782 $ hg bisect -e -r |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
783 abort: --extend and --reset are incompatible |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44725
diff
changeset
|
784 [10] |
32766
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
785 $ hg bisect -e -s |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
786 abort: --extend and --skip are incompatible |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44725
diff
changeset
|
787 [10] |
32766
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
788 $ hg bisect -g -r |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
789 abort: --good and --reset are incompatible |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44725
diff
changeset
|
790 [10] |
32766
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
791 $ hg bisect -g -s |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
792 abort: --good and --skip are incompatible |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44725
diff
changeset
|
793 [10] |
32766
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
794 $ hg bisect -r -s |
fbe9c4dcc8a0
bisect: improve option validation message
Brandon McCaig <bamccaig@gmail.com>
parents:
32131
diff
changeset
|
795 abort: --reset and --skip are incompatible |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44725
diff
changeset
|
796 [10] |