##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

context: add an assertion checking linerange consistency in blockdescendants()...
context: add an assertion checking linerange consistency in blockdescendants() If this assertion fails, this indicates a flaw in the algorithm. So fail fast instead of possibly producing wrong results. Also extend the target line range in test to catch a merge changeset with all its parents.
Yuya Nishihara - - Load All Authors

File last commit:

r30559:d83ca854 default
r31991:55987fc8 default
Show More
test-bisect.t
606 lines | 16.6 KiB | text/troff | Tads3Lexer
/ tests / test-bisect.t
History | Source | Raw |Copy content |Copy permalink
Nicolas Dumazet
tests: convert test-bisect
 r12094 $ hg init
committing changes
$ count=0
$ echo > a
$ while test $count -lt 32 ; do
> echo 'a' >> a
> test $count -eq 0 && hg add
> hg ci -m "msg $count" -d "$count 0"
> count=`expr $count + 1`
> done
adding a
$ hg 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
$ hg bisect -r
$ hg bisect -b
Bryan O'Sullivan
summary: add tests for some extensions we plan to modify
 r19213 $ hg summary
parent: 31:58c80a7c8a40 tip
msg 31
branch: default
commit: (clean)
update: (current)
Gilles Moris
summary: move the parents phase marker to commit line (issue4688)...
 r25382 phases: 32 draft
Nicolas Dumazet
tests: convert test-bisect
 r12094 $ hg bisect -g 1
Testing changeset 16:a2e6ea4973e9 (30 changesets remaining, ~4 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -g
Testing changeset 23:5ec79163bff4 (15 changesets remaining, ~3 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
skip
$ hg bisect -s
Testing changeset 24:10e0acd3809e (15 changesets remaining, ~3 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -g
Testing changeset 27:288867a866e9 (7 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -g
Testing changeset 29:b5bd63375ab9 (4 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -b
Testing changeset 28:8e0c2264c8af (2 changesets remaining, ~1 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -g
The first bad revision is:
changeset: 29:b5bd63375ab9
user: test
date: Thu Jan 01 00:00:29 1970 +0000
summary: msg 29
Dirkjan Ochtman
bisect: allow revsets in addition to single revs (issue2360)
 r12177 mark revsets instead of single revs
$ hg bisect -r
$ hg bisect -b "0::3"
$ hg bisect -s "13::16"
$ hg bisect -g "26::tip"
Testing changeset 12:1941b52820a5 (23 changesets remaining, ~4 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat .hg/bisect.state
bad b99c7b9c8e11558adef3fad9af211c58d46f325b
bad 5cd978ea51499179507ee7b6f340d2dbaa401185
bad db07c04beaca44cf24832541e7f4a2346a95275b
bad b53bea5e2fcb30d3e00bd3409507a5659ce0fd8b
Mads Kiilerich
bisect: store state sorted
 r18358 current 1941b52820a544549596820a8ae006842b0e2c64
Dirkjan Ochtman
bisect: allow revsets in addition to single revs (issue2360)
 r12177 good 3efc6fd51aeb8594398044c6c846ca59ae021203
good 288867a866e9adb7a29880b66936c874b80f4651
good 8e0c2264c8af790daf3585ada0669d93dee09c83
good b5bd63375ab9a290419f2024b7f4ee9ea7ce90a8
good ed2d2f24b11c368fa8aa0da9f4e1db580abade59
good 58c80a7c8a4025a94cedaf7b4a4e3124e8909a96
Mads Kiilerich
bisect: store state sorted
 r18358 skip 9d7d07bc967ca98ad0600c24953fd289ad5fa991
skip ce8f0998e922c179e80819d5066fbe46e2998784
skip e7fa0811edb063f6319531f0d0a865882138e180
skip a2e6ea4973e9196ddd3386493b0c214b41fd97d3
Nicolas Dumazet
tests: convert test-bisect
 r12094
bisect reverse test
$ hg bisect -r
$ hg bisect -b null
$ hg bisect -g tip
Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -g
Testing changeset 7:03750880c6b5 (16 changesets remaining, ~4 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
skip
$ hg bisect -s
Testing changeset 6:a3d5c6fdf0d3 (16 changesets remaining, ~4 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -g
Testing changeset 2:db07c04beaca (7 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -g
Testing changeset 0:b99c7b9c8e11 (3 changesets remaining, ~1 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -b
Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -g
The first good revision is:
changeset: 1:5cd978ea5149
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: msg 1
$ hg bisect -r
$ hg bisect -g tip
Matt Mackall
tests: cleanup exit code handling in unified tests
 r12365 $ hg bisect -b tip
Mads Kiilerich
bisect: report "both good and bad" as such, not as "not directly related"
 r20094 abort: inconsistent state, 31:58c80a7c8a40 is good and bad
Matt Mackall
tests: drop a bunch of sed calls from unified tests
 r12366 [255]
Nicolas Dumazet
tests: convert test-bisect
 r12094
$ hg bisect -r
$ hg bisect -g null
$ hg bisect -bU tip
Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests)
$ hg id
5cd978ea5149
Martin Geisler
tests: added a short description to issue numbers...
 r12399 Issue1228: hg bisect crashes when you skip the last rev in bisection
Issue1182: hg bisect exception
Nicolas Dumazet
tests: convert test-bisect
 r12094
$ hg bisect -r
$ hg bisect -b 4
$ hg bisect -g 0
Testing changeset 2:db07c04beaca (4 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -s
Testing changeset 1:5cd978ea5149 (4 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -s
Testing changeset 3:b53bea5e2fcb (4 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -s
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
$ hg bisect -r
$ hg bisect -g 0
$ hg bisect -b 2
Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -s
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
$ hg bisect -r
Matt Mackall
tests: cleanup exit code handling in unified tests
 r12365 $ hg bisect
Nicolas Dumazet
tests: convert test-bisect
 r12094 abort: cannot bisect (no known good revisions)
Matt Mackall
tests: drop a bunch of sed calls from unified tests
 r12366 [255]
Nicolas Dumazet
tests: convert test-bisect
 r12094
reproduce AssertionError, issue1445
$ hg bisect -r
$ hg bisect -b 6
$ hg bisect -g 0
Testing changeset 3:b53bea5e2fcb (6 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -s
Testing changeset 2:db07c04beaca (6 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -s
Testing changeset 4:9b2ba8336a65 (6 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -s
Testing changeset 1:5cd978ea5149 (6 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -s
Testing changeset 5:7874a09ea728 (6 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect -g
The first bad revision is:
changeset: 6:a3d5c6fdf0d3
user: test
date: Thu Jan 01 00:00:06 1970 +0000
summary: msg 6
"Yann E. MORIN"
revset: rename bisected() to bisect()...
 r15134 $ hg log -r "bisect(good)"
Benoit Boissinot
revset: add a revset command to get bisect state.
 r13602 changeset: 0:b99c7b9c8e11
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: msg 0
changeset: 5:7874a09ea728
user: test
date: Thu Jan 01 00:00:05 1970 +0000
summary: msg 5
"Yann E. MORIN"
revset: rename bisected() to bisect()...
 r15134 $ hg log -r "bisect(bad)"
Benoit Boissinot
revset: add a revset command to get bisect state.
 r13602 changeset: 6:a3d5c6fdf0d3
user: test
date: Thu Jan 01 00:00:06 1970 +0000
summary: msg 6
Bryan O'Sullivan
bisect: track the current changeset (issue3382)...
 r16647 $ hg log -r "bisect(current)"
changeset: 5:7874a09ea728
user: test
date: Thu Jan 01 00:00:05 1970 +0000
summary: msg 5
"Yann E. MORIN"
revset: rename bisected() to bisect()...
 r15134 $ hg log -r "bisect(skip)"
Benoit Boissinot
revset: add a revset command to get bisect state.
 r13602 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
Nicolas Dumazet
tests: convert test-bisect
 r12094
"Yann E. MORIN"
revset: rename bisected() to bisect()...
 r15134 test legacy bisected() keyword
$ hg log -r "bisected(bad)"
changeset: 6:a3d5c6fdf0d3
user: test
date: Thu Jan 01 00:00:06 1970 +0000
summary: msg 6
Nicolas Dumazet
tests: convert test-bisect
 r12094 $ set +e
test invalid command
assuming that the shell returns 127 if command not found ...
$ hg bisect -r
$ hg bisect --command 'exit 127'
abort: failed to execute exit 127
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
Nicolas Dumazet
tests: convert test-bisect
 r12094
test bisecting command
$ cat > script.py <<EOF
> #!/usr/bin/env python
> import sys
> from mercurial import ui, hg
Yuya Nishihara
ui: factor out ui.load() to create a ui without loading configs (API)...
 r30559 > repo = hg.repository(ui.ui.load(), '.')
Nicolas Dumazet
tests: convert test-bisect
 r12094 > if repo['.'].rev() < 6:
> sys.exit(1)
> EOF
$ chmod +x script.py
$ hg bisect -r
Mads Kiilerich
bisect: --command without --noupdate should flag the parent rev it tested...
 r20237 $ hg up -qr tip
Adrian Buehlmann
test-bisect: adapt for Windows
 r16960 $ hg bisect --command "python \"$TESTTMP/script.py\" and some parameters"
Mads Kiilerich
bisect: --command without --noupdate should flag the parent rev it tested...
 r20237 changeset 31:58c80a7c8a40: good
abort: cannot bisect (no known bad revisions)
[255]
$ hg up -qr 0
$ hg bisect --command "python \"$TESTTMP/script.py\" and some parameters"
changeset 0:b99c7b9c8e11: bad
Martin Geisler
bisect: lowercase status message
 r16936 changeset 15:e7fa0811edb0: good
changeset 7:03750880c6b5: good
changeset 3:b53bea5e2fcb: bad
changeset 5:7874a09ea728: bad
changeset 6:a3d5c6fdf0d3: good
Nicolas Dumazet
tests: convert test-bisect
 r12094 The first good revision is:
changeset: 6:a3d5c6fdf0d3
user: test
date: Thu Jan 01 00:00:06 1970 +0000
summary: msg 6
Bryan O'Sullivan
bisect: set HG_NODE when runing a command...
 r16648
test bisecting via a command without updating the working dir, and
ensure that the bisect state file is updated before running a test
command
$ hg update null
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ cat > script.sh <<'EOF'
> #!/bin/sh
> test -n "$HG_NODE" || (echo HG_NODE missing; exit 127)
> current="`hg log -r \"bisect(current)\" --template {node}`"
> test "$current" = "$HG_NODE" || (echo current is bad: $current; exit 127)
> rev="`hg log -r $HG_NODE --template {rev}`"
> test "$rev" -ge 6
> EOF
$ chmod +x script.sh
$ hg bisect -r
$ hg bisect --good tip --noupdate
$ hg bisect --bad 0 --noupdate
Testing changeset 15:e7fa0811edb0 (31 changesets remaining, ~4 tests)
Adrian Buehlmann
test-bisect: adapt for Windows
 r16960 $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" --noupdate
Martin Geisler
bisect: lowercase status message
 r16936 changeset 15:e7fa0811edb0: good
changeset 7:03750880c6b5: good
changeset 3:b53bea5e2fcb: bad
changeset 5:7874a09ea728: bad
changeset 6:a3d5c6fdf0d3: good
Bryan O'Sullivan
bisect: set HG_NODE when runing a command...
 r16648 The first good revision is:
changeset: 6:a3d5c6fdf0d3
user: test
date: Thu Jan 01 00:00:06 1970 +0000
summary: msg 6
ensure that we still don't have a working dir
$ hg parents
Pierre-Yves David
bisect: use changelog for iteration...
 r18463
Mads Kiilerich
bisect: --command without --noupdate should flag the parent rev it tested...
 r20237 test the same case, this time with updating
$ cat > script.sh <<'EOF'
> #!/bin/sh
> test -n "$HG_NODE" || (echo HG_NODE missing; exit 127)
> current="`hg log -r \"bisect(current)\" --template {node}`"
> test "$current" = "$HG_NODE" || (echo current is bad: $current; exit 127)
> rev="`hg log -r . --template {rev}`"
> test "$rev" -ge 6
> EOF
$ chmod +x script.sh
$ hg bisect -r
$ hg up -qr tip
$ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params"
changeset 31:58c80a7c8a40: good
abort: cannot bisect (no known bad revisions)
[255]
$ hg up -qr 0
$ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params"
changeset 0:b99c7b9c8e11: bad
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
Pierre-Yves David
bisect: use changelog for iteration...
 r18463 Check that bisect does not break on obsolete changesets
=========================================================
Durham Goode
obsolete: update tests to use obsolete options...
 r22955 $ cat >> $HGRCPATH << EOF
> [experimental]
> evolution=createmarkers
Pierre-Yves David
bisect: use changelog for iteration...
 r18463 > EOF
tip is obsolete
---------------------
$ hg debugobsolete `hg id --debug -i -r tip`
$ hg bisect --reset
$ hg bisect --good 15
$ hg bisect --bad 30
Testing changeset 22:06c7993750ce (15 changesets remaining, ~3 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect --command true
changeset 22:06c7993750ce: good
changeset 26:3efc6fd51aeb: good
changeset 28:8e0c2264c8af: good
changeset 29:b5bd63375ab9: good
The first bad revision is:
changeset: 30:ed2d2f24b11c
tag: tip
user: test
date: Thu Jan 01 00:00:30 1970 +0000
summary: msg 30
Changeset in the bad:good range is obsolete
---------------------------------------------
$ hg up 30
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 'a' >> a
$ hg ci -m "msg 32" -d "32 0"
$ hg bisect --reset
$ hg bisect --good .
$ hg bisect --bad 25
Testing changeset 28:8e0c2264c8af (6 changesets remaining, ~2 tests)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg bisect --command true
changeset 28:8e0c2264c8af: good
changeset 26:3efc6fd51aeb: good
The first good revision is:
changeset: 26:3efc6fd51aeb
user: test
date: Thu Jan 01 00:00:26 1970 +0000
summary: msg 26