merge with crew-stable

test: remove invalid hidden rev in graphlog test The hidden set of revision can not have descendant outside this set. The extension is patched to raise and exception when this happen.

Merge with stable

test-hybridencode: more testcases

remove template-vars.txt - it is outdated and neither usable nor necessary

largefiles: minor code cleanup Fix: * unnecessary use of map and lambda * comment instead of readable code * comparing None with 0 * and...or anti-pattern for 'ternary if' with very clever handling of i=None

declare local constants instead of using magic values and comments

avoid using abbreviations that look like spelling errors

improve some comments and docstrings, fixing issues found when spell checking

delete some dead comments and docstrings

fix wording and not-completely-trivial spelling errors and bad docstrings

fix trivial spelling errors

strip: fix revset usage (issue3604) The `repair` code builds a giant revset query instead of using the "%lr" idiom. It is inefficient and crash when the number of stripped changeset is too big. This changeset replaces the bad code by a better revset usage.

mergetools.hgrc: set vimdiff to check=changed The standard reaction in from of unexpected vimdiff is to ":quit". This will make vimdiff return a 0 status even if no merge were done at all. This change detect that nothing have been changed in vimdiff as a potential unresolved conflict.

hgweb: avoid bad $$ processing in graph (issue3601) JavaScript .replace always magically processed $$ $& $' $` in replacement strings and thus displayed subject lines incorrectly in the graph view. Instead of regexps and .replace we now just create the strings the right way in the first place.

wix: pick up new template files