Merge with crew

mercurial/commands.py

@@ -339,6 +339,8 b' def bisect(ui, repo, rev=None, extra=Non'
 
     if command:
         commandpath = util.find_exe(command)
+        if commandpath is None:
+            raise util.Abort(_("cannot find executable: %s") % command)
         changesets = 1
         try:
             while changesets:
@@ -355,9 +357,9 b' def bisect(ui, repo, rev=None, extra=Non'
                     raise util.Abort(_("%s killed") % command)
                 else:
                     transition = "bad"
-                node = repo.lookup(rev or '.')
-                state[transition].append(node)
-                ui.note(_('Changeset %s: %s\n') % (short(node), transition))
+                ctx = repo[rev or '.']
+                state[transition].append(ctx.node())
+                ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
                 check_state(state, interactive=False)
                 # bisect
                 nodes, changesets, good = hbisect.bisect(repo.changelog, state)

mercurial/dirstate.py

@@ -473,7 +473,7 b' class dirstate(object):'
 
         # step 1: find all explicit files
         for ff in sorted(files):
-            nf = normalize(normpath(ff), True)
+            nf = normalize(normpath(ff), False)
             if nf in results:
                 continue
 

tests/test-bisect

@@ -82,3 +82,25 b' hg bisect -s'
 hg bisect -s
 hg bisect -s 
 hg bisect -g
+
+set +e
+
+echo % test invalid command
+hg bisect -r
+hg bisect --command 'foobar'
+
+echo % test bisecting command
+cat > script.py <<EOF
+#!/usr/bin/env python
+import sys
+from mercurial import ui, hg
+repo = hg.repository(ui.ui(), '.')
+if repo['.'].rev() < 6:
+    sys.exit(1)
+EOF
+chmod +x script.py
+hg bisect -r
+hg bisect --good tip
+hg bisect --bad 0
+hg bisect --command "`pwd`/script.py"
+true

tests/test-bisect.out

@@ -303,3 +303,19 b' user: test'
 date:        Thu Jan 01 00:00:06 1970 +0000
 summary:     msg 6
 
+% test invalid command
+abort: cannot find executable: foobar
+% 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
+