tests: unify test-subrepo-svn

tests: unify test-subrepo-relative-path

tests: unify test-subrepo-paths

tests: unify test-subrepo-deep-nested-change

tests: unify test-subrepo

glossary: add entry for "Branch, inactive"

tests: unify test-patchbomb

Merge with mpm

tests: unify test-mq-symlinks

tests: use regular expressions instead of helpers

tests: unify test-mq-strip

tests: drop big sed from test-keyword.t

tests: unify test-keyword

test-walk: enable absolute path tests

tests: unify test-grep

cmdutil: code simplification

tests: unify test-log

log: do not --follow file that is deleted and recreated later (issue732) == What == issue732 is only one example of a buggy behaviour, but there are in fact many intricated cases. For example: ( "o" contains an alive version of the tracked file, "x" does not) tip - o - o - x - o - o - x ... \ o - o - o - o - x ... \ / o - o This repository contains at least two instances of the tracked file, but when calling "hg log -f file" only the latest one (the one alive in tip) matters to us. == How == We must extract from the filelog the history of the file instance we're interested in and discard changes related to other instances of that file. We see that we're only interested in ancestors(node), and that all other nodes in the filelog should not be considered.

tests: unify test-mq-safety

tests: unify test-mq-caches

tests: unify test-mq-guards

tests: unify test-mq-eol

tests: unify test-mq

Merge with stable

encoding: improve handling of buggy getpreferredencoding() on Mac OS X Prior to version 2.7, calling locale.getpreferredencoding() would always return 'mac-roman' on Mac OS X. Previously, this was handled by a call to locale.setlocale(). Unfortunately, Python 2.6.5 and older have a bug where isspace() would incorrectly report True for 0x85 and 0xa0 after such a call. In order to fix this, we replace the previous _encodingfixup mapping to an _encodingfixers mapping. Rather than mapping encodings to their replacement, it maps them to a function returning the replacement. This allows us to provide an simplified implementation of getpreferredencoding() which extracts the expected encoding and restores the locale. This fix is based on a patch originally submitted by Martijn Pieters as well as feedback from Brodie Rao.

templatefilters: unnest uescape()

templatefilters: use \uxxxx style escape for JSON string It's embeddable in plain javascript, and also conforms to JSON standard.

test-notify: make it pass on Mac OS X (again) Changeset 25e74cd3f023 (from 2008) introduced a hack to handle the very long values of $TMPDIR typically seen on Mac OS X. This hack expected continuation lines to begin with a tab. However, as a result of a change in Python 2.7, changeset 594b98846ce1 made it so continuation lines began with a tab. Since then, `test-notify' has been broken on Mac OS X. Merely replacing the tab in the regular expression with a space will not work: not only do tab continuations still occur in the message, but other lines -- in the body of the message -- also start with a space. Luckily, all broken up lines appear to end with either a colon or an n, so we can match those, and reinsert them in the replacement.

tests: combine test-dirstate-future.t into test-dirstate.t

tests: unify test-dirstatedirs

Merge with stable

dagparser: transplant part of 4e804302d30c