tests: make (glob) on windows accept \ instead of / Globbing is usually used for filenames, so on windows it is reasonable and very convenient that glob patterns accepts '\' or '/' when the pattern specifies '/'.

tests: use 'hghave serve' to guard tests that requires serve daemon management

tests: use 'hghave system-sh' to guard tests that requires sh in system()

tests: use 'hghave no-windows' to avoid testing reserved file names on windows

tests: use 'hghave unix-permissions' for tests that really use chmod chmod of helper scripts is not included. tests that exercise the x bit in the file system uses 'hghave execbit'.

tests: use 'hghave execbit' for tests that manipulate x bit in file system

tests: use 'hghave symlink' for tests using symlinks

windows: use umask 022 in debugstate output debugstate would always report files as mode 666 or 777 on Windows. umask is not used on Windows, but faking and using a defalt value of 022 matches what the test suite uses on Unix.

dispatch: exit with 8-bit exit code The exit code returned from a program to the shell is unsigned 8-bit, but Mercurial would sometimes try to exit with negative numbers or None. sys.exit on Unix will convert that to 8-bit exit codes, but on Windows negative values showed up as 0. The exit code is now explicitly converted to unsigned 8-bit.

tests: don't let time go back before 0 o'clock in bisect3.t Windows agree that it was Thu Jan 01 00:00:00 1970 +0000 but it also claims that it was Thu Dec 31 23:59:59 1969 -0000

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.