view tests/test-bisect.out @ 10396:65a90c8e11ee

prepush: add more precise error messages

Part of the patch is from [e-mail]

- indicate the branch name where there are multiple heads
- give better advice when hitting a possible race, where new heads are added
  between discovery and the call to branchmap(). In that case, asking the user
  to merge isn't helpful, since only remote has the changes.

% init
% committing changes
adding a
% committed changeset 0
% committed changeset 1
% committed changeset 2
% committed changeset 3
% committed changeset 4
% committed changeset 5
% committed changeset 6
% committed changeset 7
% committed changeset 8
% committed changeset 9
% committed changeset 10
% committed changeset 11
% committed changeset 12
% committed changeset 13
% committed changeset 14
% committed changeset 15
% committed changeset 16
% committed changeset 17
% committed changeset 18
% committed changeset 19
% committed changeset 20
% committed changeset 21
% committed changeset 22
% committed changeset 23
% committed changeset 24
% committed changeset 25
% committed changeset 26
% committed changeset 27
% committed changeset 28
% committed changeset 29
% committed changeset 30
% committed changeset 31
% log
changeset:   31:58c80a7c8a40
tag:         tip
user:        test
date:        Thu Jan 01 00:00:31 1970 +0000
summary:     msg 31

changeset:   30:ed2d2f24b11c
user:        test
date:        Thu Jan 01 00:00:30 1970 +0000
summary:     msg 30

changeset:   29:b5bd63375ab9
user:        test
date:        Thu Jan 01 00:00:29 1970 +0000
summary:     msg 29

changeset:   28:8e0c2264c8af
user:        test
date:        Thu Jan 01 00:00:28 1970 +0000
summary:     msg 28

changeset:   27:288867a866e9
user:        test
date:        Thu Jan 01 00:00:27 1970 +0000
summary:     msg 27

changeset:   26:3efc6fd51aeb
user:        test
date:        Thu Jan 01 00:00:26 1970 +0000
summary:     msg 26

changeset:   25:02a84173a97a
user:        test
date:        Thu Jan 01 00:00:25 1970 +0000
summary:     msg 25

changeset:   24:10e0acd3809e
user:        test
date:        Thu Jan 01 00:00:24 1970 +0000
summary:     msg 24

changeset:   23:5ec79163bff4
user:        test
date:        Thu Jan 01 00:00:23 1970 +0000
summary:     msg 23

changeset:   22:06c7993750ce
user:        test
date:        Thu Jan 01 00:00:22 1970 +0000
summary:     msg 22

changeset:   21:e5db6aa3fe2a
user:        test
date:        Thu Jan 01 00:00:21 1970 +0000
summary:     msg 21

changeset:   20:7128fb4fdbc9
user:        test
date:        Thu Jan 01 00:00:20 1970 +0000
summary:     msg 20

changeset:   19:52798545b482
user:        test
date:        Thu Jan 01 00:00:19 1970 +0000
summary:     msg 19

changeset:   18:86977a90077e
user:        test
date:        Thu Jan 01 00:00:18 1970 +0000
summary:     msg 18

changeset:   17:03515f4a9080
user:        test
date:        Thu Jan 01 00:00:17 1970 +0000
summary:     msg 17

changeset:   16:a2e6ea4973e9
user:        test
date:        Thu Jan 01 00:00:16 1970 +0000
summary:     msg 16

changeset:   15:e7fa0811edb0
user:        test
date:        Thu Jan 01 00:00:15 1970 +0000
summary:     msg 15

changeset:   14:ce8f0998e922
user:        test
date:        Thu Jan 01 00:00:14 1970 +0000
summary:     msg 14

changeset:   13:9d7d07bc967c
user:        test
date:        Thu Jan 01 00:00:13 1970 +0000
summary:     msg 13

changeset:   12:1941b52820a5
user:        test
date:        Thu Jan 01 00:00:12 1970 +0000
summary:     msg 12

changeset:   11:7b4cd9578619
user:        test
date:        Thu Jan 01 00:00:11 1970 +0000
summary:     msg 11

changeset:   10:7c5eff49a6b6
user:        test
date:        Thu Jan 01 00:00:10 1970 +0000
summary:     msg 10

changeset:   9:eb44510ef29a
user:        test
date:        Thu Jan 01 00:00:09 1970 +0000
summary:     msg 9

changeset:   8:453eb4dba229
user:        test
date:        Thu Jan 01 00:00:08 1970 +0000
summary:     msg 8

changeset:   7:03750880c6b5
user:        test
date:        Thu Jan 01 00:00:07 1970 +0000
summary:     msg 7

changeset:   6:a3d5c6fdf0d3
user:        test
date:        Thu Jan 01 00:00:06 1970 +0000
summary:     msg 6

changeset:   5:7874a09ea728
user:        test
date:        Thu Jan 01 00:00:05 1970 +0000
summary:     msg 5

changeset:   4:9b2ba8336a65
user:        test
date:        Thu Jan 01 00:00:04 1970 +0000
summary:     msg 4

changeset:   3:b53bea5e2fcb
user:        test
date:        Thu Jan 01 00:00:03 1970 +0000
summary:     msg 3

changeset:   2:db07c04beaca
user:        test
date:        Thu Jan 01 00:00:02 1970 +0000
summary:     msg 2

changeset:   1:5cd978ea5149
user:        test
date:        Thu Jan 01 00:00:01 1970 +0000
summary:     msg 1

changeset:   0:b99c7b9c8e11
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     msg 0

% hg up -C
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% bisect test
Testing changeset 16:a2e6ea4973e9 (30 changesets remaining, ~4 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing changeset 23:5ec79163bff4 (15 changesets remaining, ~3 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
skip
Testing changeset 24:10e0acd3809e (15 changesets remaining, ~3 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing changeset 27:288867a866e9 (7 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing changeset 29:b5bd63375ab9 (4 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing changeset 28:8e0c2264c8af (2 changesets remaining, ~1 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
The first bad revision is:
changeset:   29:b5bd63375ab9
user:        test
date:        Thu Jan 01 00:00:29 1970 +0000
summary:     msg 29

% bisect reverse test
Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing changeset 7:03750880c6b5 (16 changesets remaining, ~4 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
skip
Testing changeset 6:a3d5c6fdf0d3 (16 changesets remaining, ~4 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing changeset 2:db07c04beaca (7 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing changeset 0:b99c7b9c8e11 (3 changesets remaining, ~1 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
The first good revision is:
changeset:   1:5cd978ea5149
user:        test
date:        Thu Jan 01 00:00:01 1970 +0000
summary:     msg 1

abort: Inconsistent state, 31:58c80a7c8a40 is good and bad
error
Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests)
5cd978ea5149
% reproduce AssertionError, issue1228 and issue1182
Testing changeset 2:db07c04beaca (4 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing changeset 1:5cd978ea5149 (4 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing changeset 3:b53bea5e2fcb (4 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Due to skipped revisions, the first bad revision could be any of:
changeset:   1:5cd978ea5149
user:        test
date:        Thu Jan 01 00:00:01 1970 +0000
summary:     msg 1

changeset:   2:db07c04beaca
user:        test
date:        Thu Jan 01 00:00:02 1970 +0000
summary:     msg 2

changeset:   3:b53bea5e2fcb
user:        test
date:        Thu Jan 01 00:00:03 1970 +0000
summary:     msg 3

changeset:   4:9b2ba8336a65
user:        test
date:        Thu Jan 01 00:00:04 1970 +0000
summary:     msg 4

% reproduce non converging bisect, issue1182
Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Due to skipped revisions, the first bad revision could be any of:
changeset:   1:5cd978ea5149
user:        test
date:        Thu Jan 01 00:00:01 1970 +0000
summary:     msg 1

changeset:   2:db07c04beaca
user:        test
date:        Thu Jan 01 00:00:02 1970 +0000
summary:     msg 2

% test no action
abort: cannot bisect (no known good revisions)
failure
% reproduce AssertionError, issue1445
Testing changeset 3:b53bea5e2fcb (6 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing changeset 2:db07c04beaca (6 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing changeset 4:9b2ba8336a65 (6 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing changeset 1:5cd978ea5149 (6 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing changeset 5:7874a09ea728 (6 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
The first bad revision is:
changeset:   6:a3d5c6fdf0d3
user:        test
date:        Thu Jan 01 00:00:06 1970 +0000
summary:     msg 6

% test invalid command
abort: failed to execute exit 127
% test bisecting command
Testing changeset 15:e7fa0811edb0 (31 changesets remaining, ~4 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Changeset 15:e7fa0811edb0: good
Changeset 7:03750880c6b5: good
Changeset 3:b53bea5e2fcb: bad
Changeset 5:7874a09ea728: bad
Changeset 6:a3d5c6fdf0d3: good
The first good revision is:
changeset:   6:a3d5c6fdf0d3
user:        test
date:        Thu Jan 01 00:00:06 1970 +0000
summary:     msg 6