diff: always use / in paths in diff Subrepo diffs would sometimes use backslash on windows.

cmdutil: don't use repr on paths in pathauditor - it looks strange on windows

tests: make '(esc)' matching in run-tests.py work as intended The code for match on (esc) lines didn't work, and it would thus always end up emitting another suggestion ... which however would match the old one.

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

phases: basic I/O logic Add function to read and write phase roots. Add a _phaseroots filecache on localrepo class to access the phaseroots data.

phases: Minimal first add.

run-tests: minor cleanups

run-tests: pull out line matching function

run-tests: pull out unified matching funcs

tests: add some comments to the unified test code

tests: rewrite inline Python support Tests with inline Python could turn '>>>' into their underlying python invocation if the test got updated with -i.

merge with stable

add: support adding explicit files in subrepos Change the behavior of the add command such that explicit paths in subrepos are always added. This eliminates the previous behavior where if you called "hg add" for an explicit path in a subrepo without specifying the -S option, it would be silently ignored. If you specify patterns, or no arguments at all, the -S option will still be needed to activate recursion into subrepos.

tests: add test for add of explicit path in subrepo Add test coverage for the existing behavior where adds of explicit paths in subrepos are silently ignored. This is in preparation for changing the behavior of the add command to have better support for subrepos.

largefiles: ensure destination directory exists before findfile links to there When (1) findfile links a largefile from the user cache to the store and (2) the store directory doesn't exist yet, findfile errors out. A simple call to util.makedirs fixes it.