diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1107,9 +1107,8 @@ transition = b"bad" state[transition].append(node) ctx = repo[node] - ui.status( - _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition) - ) + summary = cmdutil.format_changeset_summary(ui, ctx, b'bisect') + ui.status(_(b'changeset %s: %s\n') % (summary, transition)) hbisect.checkstate(state) # bisect nodes, changesets, bgood = hbisect.bisect(repo, state) @@ -1125,15 +1124,15 @@ nodes, changesets, good = hbisect.bisect(repo, state) if extend: if not changesets: - extendnode = hbisect.extendrange(repo, state, nodes, good) - if extendnode is not None: + extendctx = hbisect.extendrange(repo, state, nodes, good) + if extendctx is not None: ui.write( - _(b"Extending search to changeset %d:%s\n") - % (extendnode.rev(), extendnode) + _(b"Extending search to changeset %s\n") + % cmdutil.format_changeset_summary(ui, extendctx, b'bisect') ) - state[b'current'] = [extendnode.node()] + state[b'current'] = [extendctx.node()] hbisect.save_state(repo, state) - return mayupdate(repo, extendnode.node()) + return mayupdate(repo, extendctx.node()) raise error.StateError(_(b"nothing to extend")) if changesets == 0: @@ -1146,12 +1145,13 @@ while size <= changesets: tests, size = tests + 1, size * 2 rev = repo.changelog.rev(node) + summary = cmdutil.format_changeset_summary(ui, repo[rev], b'bisect') ui.write( _( - b"Testing changeset %d:%s " + b"Testing changeset %s " b"(%d changesets remaining, ~%d tests)\n" ) - % (rev, short(node), changesets, tests) + % (summary, changesets, tests) ) state[b'current'] = [node] hbisect.save_state(repo, state) diff --git a/tests/test-bisect.t b/tests/test-bisect.t --- a/tests/test-bisect.t +++ b/tests/test-bisect.t @@ -200,25 +200,25 @@ update: (current) phases: 32 draft $ hg bisect -g 1 - Testing changeset 16:a2e6ea4973e9 (30 changesets remaining, ~4 tests) + Testing changeset 16:a2e6ea4973e9 "msg 16" (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) + Testing changeset 23:5ec79163bff4 "msg 23" (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) + Testing changeset 24:10e0acd3809e "msg 24" (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) + Testing changeset 27:288867a866e9 "msg 27" (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) + Testing changeset 29:b5bd63375ab9 "msg 29" (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) + Testing changeset 28:8e0c2264c8af "msg 28" (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: @@ -234,7 +234,7 @@ $ hg bisect -b "0::3" $ hg bisect -s "13::16" $ hg bisect -g "26::tip" - Testing changeset 12:1941b52820a5 (23 changesets remaining, ~4 tests) + Testing changeset 12:1941b52820a5 "msg 12" (23 changesets remaining, ~4 tests) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat .hg/bisect.state bad b99c7b9c8e11558adef3fad9af211c58d46f325b @@ -258,25 +258,25 @@ $ hg bisect -r $ hg bisect -b null $ hg bisect -g tip - Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests) + Testing changeset 15:e7fa0811edb0 "msg 15" (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) + Testing changeset 7:03750880c6b5 "msg 7" (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) + Testing changeset 6:a3d5c6fdf0d3 "msg 6" (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) + Testing changeset 2:db07c04beaca "msg 2" (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) + Testing changeset 0:b99c7b9c8e11 "msg 0" (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) + Testing changeset 1:5cd978ea5149 "msg 1" (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: @@ -295,7 +295,7 @@ $ hg bisect -r $ hg bisect -g null $ hg bisect -bU tip - Testing changeset 15:e7fa0811edb0 (32 changesets remaining, ~5 tests) + Testing changeset 15:e7fa0811edb0 "msg 15" (32 changesets remaining, ~5 tests) $ hg id 5cd978ea5149 @@ -306,13 +306,13 @@ $ hg bisect -r $ hg bisect -b 4 $ hg bisect -g 0 - Testing changeset 2:db07c04beaca (4 changesets remaining, ~2 tests) + Testing changeset 2:db07c04beaca "msg 2" (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) + Testing changeset 1:5cd978ea5149 "msg 1" (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) + Testing changeset 3:b53bea5e2fcb "msg 3" (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: @@ -343,7 +343,7 @@ $ hg bisect -r $ hg bisect -g 0 $ hg bisect -b 2 - Testing changeset 1:5cd978ea5149 (2 changesets remaining, ~1 tests) + Testing changeset 1:5cd978ea5149 "msg 1" (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: @@ -372,19 +372,19 @@ $ hg bisect -r $ hg bisect -b 6 $ hg bisect -g 0 - Testing changeset 3:b53bea5e2fcb (6 changesets remaining, ~2 tests) + Testing changeset 3:b53bea5e2fcb "msg 3" (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) + Testing changeset 2:db07c04beaca "msg 2" (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) + Testing changeset 4:9b2ba8336a65 "msg 4" (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) + Testing changeset 1:5cd978ea5149 "msg 1" (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) + Testing changeset 5:7874a09ea728 "msg 5" (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: @@ -473,17 +473,17 @@ $ hg bisect -r $ hg up -qr tip $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters" - changeset 31:58c80a7c8a40: good + changeset 31:58c80a7c8a40 tip "msg 31": good abort: cannot bisect (no known bad revisions) [20] $ hg up -qr 0 $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters" - changeset 0:b99c7b9c8e11: bad - changeset 15:e7fa0811edb0: good - changeset 7:03750880c6b5: good - changeset 3:b53bea5e2fcb: bad - changeset 5:7874a09ea728: bad - changeset 6:a3d5c6fdf0d3: good + changeset 0:b99c7b9c8e11 "msg 0": bad + changeset 15:e7fa0811edb0 "msg 15": good + changeset 7:03750880c6b5 "msg 7": good + changeset 3:b53bea5e2fcb "msg 3": bad + changeset 5:7874a09ea728 "msg 5": bad + changeset 6:a3d5c6fdf0d3 "msg 6": good The first good revision is: changeset: 6:a3d5c6fdf0d3 user: test @@ -510,13 +510,13 @@ $ hg bisect -r $ hg bisect --good tip --noupdate $ hg bisect --bad 0 --noupdate - Testing changeset 15:e7fa0811edb0 (31 changesets remaining, ~4 tests) + Testing changeset 15:e7fa0811edb0 "msg 15" (31 changesets remaining, ~4 tests) $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" --noupdate - changeset 15:e7fa0811edb0: good - changeset 7:03750880c6b5: good - changeset 3:b53bea5e2fcb: bad - changeset 5:7874a09ea728: bad - changeset 6:a3d5c6fdf0d3: good + changeset 15:e7fa0811edb0 "msg 15": good + changeset 7:03750880c6b5 "msg 7": good + changeset 3:b53bea5e2fcb "msg 3": bad + changeset 5:7874a09ea728 "msg 5": bad + changeset 6:a3d5c6fdf0d3 "msg 6": good The first good revision is: changeset: 6:a3d5c6fdf0d3 user: test @@ -543,17 +543,17 @@ $ hg bisect -r $ hg up -qr tip $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params" - changeset 31:58c80a7c8a40: good + changeset 31:58c80a7c8a40 tip "msg 31": good abort: cannot bisect (no known bad revisions) [20] $ 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 + changeset 0:b99c7b9c8e11 "msg 0": bad + changeset 15:e7fa0811edb0 "msg 15": good + changeset 7:03750880c6b5 "msg 7": good + changeset 3:b53bea5e2fcb "msg 3": bad + changeset 5:7874a09ea728 "msg 5": bad + changeset 6:a3d5c6fdf0d3 "msg 6": good The first good revision is: changeset: 6:a3d5c6fdf0d3 user: test @@ -586,13 +586,13 @@ $ hg bisect --reset $ hg bisect --good 15 $ hg bisect --bad 30 - Testing changeset 22:06c7993750ce (15 changesets remaining, ~3 tests) + Testing changeset 22:06c7993750ce "msg 22" (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 + changeset 22:06c7993750ce "msg 22": good + changeset 26:3efc6fd51aeb "msg 26": good + changeset 28:8e0c2264c8af "msg 28": good + changeset 29:b5bd63375ab9 "msg 29": good The first bad revision is: changeset: 30:ed2d2f24b11c tag: tip @@ -735,11 +735,11 @@ $ hg bisect --reset $ hg bisect --good . $ hg bisect --bad 25 - Testing changeset 28:8e0c2264c8af (6 changesets remaining, ~2 tests) + Testing changeset 28:8e0c2264c8af "msg 28" (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 + changeset 28:8e0c2264c8af "msg 28": good + changeset 26:3efc6fd51aeb "msg 26": good The first good revision is: changeset: 26:3efc6fd51aeb user: test diff --git a/tests/test-bisect2.t b/tests/test-bisect2.t --- a/tests/test-bisect2.t +++ b/tests/test-bisect2.t @@ -252,7 +252,7 @@ $ hg bisect -r $ hg bisect -g 0 $ hg bisect -b 17 # -> update to rev 6 - Testing changeset 6:a214d5d3811a (15 changesets remaining, ~3 tests) + Testing changeset 6:a214d5d3811a "merge 4,5" (15 changesets remaining, ~3 tests) 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg log -q -r 'bisect(pruned)' 0:33b1f9bc8bc5 @@ -274,16 +274,16 @@ 16:609d82a7ebae $ hg log -q -r 'bisect(ignored)' $ hg bisect -g # -> update to rev 13 - Testing changeset 13:b0a32c86eb31 (9 changesets remaining, ~3 tests) + Testing changeset 13:b0a32c86eb31 "13" (9 changesets remaining, ~3 tests) 3 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg bisect -s # -> update to rev 10 - Testing changeset 10:429fcd26f52d (9 changesets remaining, ~3 tests) + Testing changeset 10:429fcd26f52d "merge 6,9" (9 changesets remaining, ~3 tests) 3 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg bisect -b # -> update to rev 8 - Testing changeset 8:dab8161ac8fc (3 changesets remaining, ~1 tests) + Testing changeset 8:dab8161ac8fc "8" (3 changesets remaining, ~1 tests) 2 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg bisect -g # -> update to rev 9 - Testing changeset 9:3c77083deb4a (2 changesets remaining, ~1 tests) + Testing changeset 9:3c77083deb4a "9" (2 changesets remaining, ~1 tests) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg bisect -b The first bad revision is: @@ -350,10 +350,10 @@ $ hg bisect -r $ hg bisect -g 18 $ hg bisect -b 1 # -> update to rev 6 - Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests) + Testing changeset 6:a214d5d3811a "merge 4,5" (13 changesets remaining, ~3 tests) 2 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg bisect -s # -> update to rev 10 - Testing changeset 10:429fcd26f52d (13 changesets remaining, ~3 tests) + Testing changeset 10:429fcd26f52d "merge 6,9" (13 changesets remaining, ~3 tests) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg log -q -r 'bisect(pruned)' 0:33b1f9bc8bc5 @@ -361,7 +361,7 @@ 6:a214d5d3811a 18:d42e18c7bc9b $ hg bisect -b # -> update to rev 12 - Testing changeset 12:9f259202bbe7 (5 changesets remaining, ~2 tests) + Testing changeset 12:9f259202bbe7 "12" (5 changesets remaining, ~2 tests) 3 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg log -q -r 'bisect(pruned)' 0:33b1f9bc8bc5 @@ -381,7 +381,7 @@ 13:b0a32c86eb31 15:857b178a7cf3 $ hg bisect -b # -> update to rev 13 - Testing changeset 13:b0a32c86eb31 (3 changesets remaining, ~1 tests) + Testing changeset 13:b0a32c86eb31 "13" (3 changesets remaining, ~1 tests) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg bisect -g The first good revision is: @@ -414,7 +414,7 @@ $ hg bisect -r $ hg bisect -g 1 $ hg bisect -b 16 # -> update to rev 6 - Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests) + Testing changeset 6:a214d5d3811a "merge 4,5" (13 changesets remaining, ~3 tests) 2 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg log -q -r 'bisect(pruned)' 0:33b1f9bc8bc5 @@ -422,13 +422,13 @@ 16:609d82a7ebae 17:228c06deef46 $ hg bisect -g # -> update to rev 13 - Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests) + Testing changeset 13:b0a32c86eb31 "13" (8 changesets remaining, ~3 tests) 3 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg bisect -s # -> update to rev 10 - Testing changeset 10:429fcd26f52d (8 changesets remaining, ~3 tests) + Testing changeset 10:429fcd26f52d "merge 6,9" (8 changesets remaining, ~3 tests) 3 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg bisect -s # -> update to rev 12 - Testing changeset 12:9f259202bbe7 (8 changesets remaining, ~3 tests) + Testing changeset 12:9f259202bbe7 "12" (8 changesets remaining, ~3 tests) 3 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg log -q -r 'bisect(pruned)' 0:33b1f9bc8bc5 @@ -443,10 +443,10 @@ 16:609d82a7ebae 17:228c06deef46 $ hg bisect -g # -> update to rev 9 - Testing changeset 9:3c77083deb4a (5 changesets remaining, ~2 tests) + Testing changeset 9:3c77083deb4a "9" (5 changesets remaining, ~2 tests) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg bisect -s # -> update to rev 15 - Testing changeset 15:857b178a7cf3 (5 changesets remaining, ~2 tests) + Testing changeset 15:857b178a7cf3 "merge 10,13" (5 changesets remaining, ~2 tests) 3 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg log -q -r 'bisect(ignored)' $ hg bisect -b @@ -500,13 +500,13 @@ $ hg bisect -r $ hg bisect -g 17 $ hg bisect -b 8 # -> update to rev 10 - Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests) + Testing changeset 13:b0a32c86eb31 "13" (8 changesets remaining, ~3 tests) 2 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg bisect -b # -> update to rev 13 - Testing changeset 10:429fcd26f52d (5 changesets remaining, ~2 tests) + Testing changeset 10:429fcd26f52d "merge 6,9" (5 changesets remaining, ~2 tests) 3 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg bisect -b # -> update to rev 15 - Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests) + Testing changeset 15:857b178a7cf3 "merge 10,13" (3 changesets remaining, ~1 tests) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg log -q -r 'bisect(pruned)' 0:33b1f9bc8bc5 @@ -524,7 +524,7 @@ 13:b0a32c86eb31 17:228c06deef46 $ hg bisect -s # -> update to rev 16 - Testing changeset 16:609d82a7ebae (3 changesets remaining, ~1 tests) + Testing changeset 16:609d82a7ebae "16" (3 changesets remaining, ~1 tests) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg log -q -r 'bisect(pruned)' 0:33b1f9bc8bc5 @@ -612,7 +612,7 @@ $ hg bisect -r $ hg bisect -b 17 $ hg bisect -g 11 - Testing changeset 13:b0a32c86eb31 (5 changesets remaining, ~2 tests) + Testing changeset 13:b0a32c86eb31 "13" (5 changesets remaining, ~2 tests) 3 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg log -q -r 'bisect(ignored)' 2:051e12f87bf1 @@ -623,7 +623,7 @@ 9:3c77083deb4a 10:429fcd26f52d $ hg bisect -g - Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests) + Testing changeset 15:857b178a7cf3 "merge 10,13" (3 changesets remaining, ~1 tests) 3 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg bisect -b The first bad revision is: @@ -665,7 +665,7 @@ 9:3c77083deb4a 10:429fcd26f52d $ hg bisect --extend - Extending search to changeset 8:dab8161ac8fc + Extending search to changeset 8:dab8161ac8fc "8" 2 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg log -q -r 'bisect(untested)' $ hg log -q -r 'bisect(ignored)' @@ -677,7 +677,7 @@ 9:3c77083deb4a 10:429fcd26f52d $ hg bisect -g # dab8161ac8fc - Testing changeset 9:3c77083deb4a (3 changesets remaining, ~1 tests) + Testing changeset 9:3c77083deb4a "9" (3 changesets remaining, ~1 tests) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg log -q -r 'bisect(untested)' 9:3c77083deb4a @@ -757,13 +757,13 @@ $ hg bisect -r $ hg bisect -b 13 $ hg bisect -g 8 - Testing changeset 11:82ca6f06eccd (3 changesets remaining, ~1 tests) + Testing changeset 11:82ca6f06eccd "11" (3 changesets remaining, ~1 tests) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg log -q -r 'bisect(untested)' 11:82ca6f06eccd 12:9f259202bbe7 $ hg bisect -g 2 - Testing changeset 11:82ca6f06eccd (3 changesets remaining, ~1 tests) + Testing changeset 11:82ca6f06eccd "11" (3 changesets remaining, ~1 tests) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg log -q -r 'bisect(untested)' 11:82ca6f06eccd diff --git a/tests/test-bisect3.t b/tests/test-bisect3.t --- a/tests/test-bisect3.t +++ b/tests/test-bisect3.t @@ -72,13 +72,13 @@ $ hg bisect --good 4 $ hg bisect --good 6 $ hg bisect --bad 12 - Testing changeset 9:2197c557e14c (6 changesets remaining, ~2 tests) + Testing changeset 9:2197c557e14c "9=8+3" (6 changesets remaining, ~2 tests) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg bisect --bad 10 - Testing changeset 8:e74a86251f58 (4 changesets remaining, ~2 tests) + Testing changeset 8:e74a86251f58 "8" (4 changesets remaining, ~2 tests) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg bisect --skip 7 - Testing changeset 8:e74a86251f58 (4 changesets remaining, ~2 tests) + Testing changeset 8:e74a86251f58 "8" (4 changesets remaining, ~2 tests) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved test template diff --git a/tests/test-template-map.t b/tests/test-template-map.t --- a/tests/test-template-map.t +++ b/tests/test-template-map.t @@ -1606,7 +1606,7 @@ $ hg bisect -g 1 $ hg bisect -b 3 --noupdate - Testing changeset 2:97054abb4ab8 (2 changesets remaining, ~1 tests) + Testing changeset 2:97054abb4ab8 "no person" (2 changesets remaining, ~1 tests) $ hg log -T bisect -r 0:4 changeset: 0:1e4e1b8f71e0 bisect: good (implicit)