i18n: mark more strings for translation

shrink-revlog: remove unneeded imports and useless code

shrink-revlog: add strings for translation / import _ before using it

ui: unset ui.slash when HGPLAIN is set

ui: suppress aliases when HGPLAIN is set

merge: fix --preview to show all nodes that will be merged (issue2043). Formerly, it omitted nodes that were not descendants of the least common ancestor of the two merge parents, even though those nodes contribute to the merge. The new algorithm uses revlog.findmissing() instead of ancestor() + nodesbetween().

test-merge-default: make content of test repo clearer. Makes it easier to understand and modify the test. (issue2043).

contrib/wix: MSVC CRT libraries are installed in WinSxS not in %system32%

Add WiX installer scripts to contrib/wix

import: if in doubt, consume stream until start of diff This prevents a header-like line in the message body from causing a spurious split.

bdiff: do not use recursion / avoid stackoverflow (issue1940)

keyword: mark improved demo commit message for translation s/config/configuration/ Inside the quoted command put the message in single quotes in case the translation contains apostrophes.

mq: iterate over a copy of the command table keys (fixes issue2045). I hope.

Merge with stable

progress: mark strings for translation

keyword: do not postpone commit hooks With 0e64d814d7d0 in place, this hack is not needed any more.

inotify/inserve: implement --timeout-idle option (issue885) hg inserve was ignoring and miscomputing the --timeout-idle option (seconds vs. minutes). Thanks to Jesse Glick for the bugreport and the initial patch.

regression: missing arg from 24ce8f0c0a39 dirstate.{walk,status} changes

run commit and update hooks after command completion (issue1827) Previously, the working dir state hadn't been written when these hooks were invoked, so external commands couldn't see all changes.

http: len(x) fails if it doesn't fit into an int, use __len__() instead len(x) raises OverflowError if it's bigger than 2**31-1, we need to call __len__() ourself instead.

filelog: sort meta entries, ensure deterministic order

Merge with i18n

i18n-sv: synchronized with 44b4a2a31623

util: use the built-in any() and all() methods if they are available

mergetools: improve configuration for several merge tools * meld - provide labels for the three panes * diffmerge - add registry key for detection, improve arguments * beyond compare - add linux version * winmerge - improve arguments * araxis - add configuration, including registry key for detection * misc - provide default priorities for more tools

hgrc.5: document use of environment variables on Windows This feature was introduced in c31ac3f7fd8f

url: correctly quote '/' in user and password embedded in urls

i18n-pt_BR: synchronized with 44b4a2a31623

url: fix python < 2.6 with ssl installed _GLOBAL_DEFAULT_TIMEOUT isn't related to ssl, but to python < 2.6, move it to the right hunk.

bugzilla: revert unhelpful check-code changes, module is actually called MySQLdb

mq: unify implementation of qinit and init -Q

bundle: exclude csets given in --base, unless they are in --rev (issue1910) Thanks Jesse Glick for the first version of this patch.

Merge with stable

Merge with default

mq: more instructive use of "--" in qguard help (issue2040)

color: don't crash on invalid status codes (issue2036) If an unknown file with a newline appears in the status output, color shouldn't raise a KeyError trying to parse second line in the filename.

Add progress extension to win32 default config file

test-interhg: test the extension

interhg: fixes regression introduced by 38170eeed18c

progress: use inline literals in help string

Fix test-pull under Windows

Fix test-push-validation under Windows

Fix test-share and test-subrepo under Windows

patch: remove useless copy, cleanup

patch: separate reverse copy data (issue1959)

Add test for progress extension

progress: make progress.refresh=0 always display the progress line This has no effect in real world where progress.refresh in unlikely to be set to zero, but is very useful in tests where all progress output is to be traced. It failed on platforms with coarse time.time() granularity, like Windows+py25.

remove unused imports