run-tests: replace inline python handling with more native scheme Normally changes in tests are reported like this in diffs: $ cat foo - a + b Using -i mode lets us update tests when the new results are correct and/or populate tests with their output. But with the standard doctest framework, inline Python sections in tests changes instead result in a big failure report that's unhelpful. So here, we replace the doctest calls with a simple compile/eval loop.

merge with crew

merge with stable

merge with main

merge with main

subrepo: improve help for svn subrepo support Add details on which commands are supported for Subversion subrepos.

subrepo: improve help for git subrepo support Add details on which commands are supported for git subrepos.

subrepo: update help for commit to reflect new default behavior Update the subrepo help to be consistent with the new default behavior, which is to abort if any subrepo is dirty.

merge with stable

i18n: disable translations with conflicting prompt keys (issue3082) This is just a stopgap until a proper solution is implemented.

log: hide hidden option until it actually does something

phases: add a very simple test Note that the expected output is wrong as is should be phase-1. But the machinery to plant new root is to come in later commit.

phases: add a phase template keyword

phases: add a phase method to context

phases: add a cache allowing to know in which phase a changeset is

phases: handle errors other than ENOENT appropriately