He's a pull request pre-merged. I rebased my previous change.
On my mac, I get a test failure on test "fail: hg_bookmarks bookmark: expected "hg:blah", but got "hg:-n blah"" have not figured the reason but I suspect it's unrelated to this change. Same code passes unit tests on Centos6. v0v