graphlog: don't truncate template value at last \n Most uses of templates requires a trailing newline to get vertical output. Graphlog with a template without trailing newline did however not just create horisontal output like other commands would but truncated the output at the last \n. Template values without any \n were ignored completely. Graphlog will now only eat one trailing newline before it lets the flow of the graph add the necessary vertical space.

graphlog: display obsolete changeset as "x" Changeset detected as obsolete will be displayed as "x" instead of 'o': o new rewritten changeset | | x old obsolete changeset |/ | o base This will be useful even when some obsolete changeset will be "hidden" because not all obsolete changeset can be hidden. If an obsolete changeset have non-obsolete descendant we can't simply hide it. And having a clear visual hint that the changeset is obsolete is useful. The main reason to make this minor change right now is to: 1) introduce an officiel user of the `ctx.obsolete()` method that will detect breakage earlier than third party code (mutable, hgview) 2) Do not display any vocabulary related to obsolete. Such vocabulary will require discussion.

obsolete: fix context.obsolete() method - obsstore attribut name changed. - public changeset can't be obsolete

obsolete: fix error message at marker creation precursors content where printed for invalid successor.

help: explain effect of .hgignore on tracked files

hgignore: simply ignore all *.exe's everywhere it's not like we're going to add any exe anywhere ever

tests: ignore pax_global_header in test-subrepo-git.t Failure seen on hgbuildbot 2.4 and 2.5 after 1894dac619de. Hide '../archive_x/s/pax_global_header' with same strange trick as in 5dda6c708138.

tests: remove GNU quoting in test-subrepo-deep-nested-change.t Test failure on non-GNU systems introduced in 1894dac619de.

tests: add '(glob)' for Windows paths in test-subrepo-deep-nested-change.t Test failure was introduced in 1894dac619de.

check-code: verify that 'saved backup bundle to ...' is '(glob)'ed This is the most frequent trivial reason tests fail on Windows.

tests: fix test markup in test-merge-types.t ca5cc2976574 introduced some tests that because of incorrect indentation wasn't run.

test-hgweb-diffs: partially adapt for Windows Since chmod isn't supported on Windows (or vfat), I'm importing a here-doc instead (<<EOF ..). Option --bypass on import of the here-doc is required on Windows (or vfat) to bypass the working directory (see hg help import). Not using --bypass would lose the mode changing bits. I've had to insert a --bypass on the preexisting import call futher down in the test, because importing a patch with --exact and mode changes will fail on Windows (and vfat). As the point of this test is not to test commit, I'm using the import procedure for all platforms unconditionally, that is, I'm intentionally not keeping the original sequence of hg and chmod calls for platforms that support exec either, which saves us having to insert an #if exec ... #else ... #endif.

subrepo: propagate matcher to subrepos when archiving Add a match object to subrepo.archive(). This will allow the -X and -I options to be honored inside subrepos when archiving. They formerly only affect the top level repo.

largefiles: remove a standin check that could never be true

largefiles: fix the directory structure when archiving a subrepo in a subrepo Previously, a repo consisting of main/sub/subsub archived sub and subsub as siblings under main.