pager: set ui.interactive=False when enabled This stops interactive-only things like progress bars from showing up inside the pager.

identify: don't include unknown in status

zeroconf: suppress traceback during shutdown If the read thred is in select when the main thread is in close, the main thread may close the socket between select and read, generating a noisy traceback. This can be ignored if the shutdown flag is set.

contrib/wix: switch *.wxs files to LF eol

Merge with stable

url: *args argument is a tuple, not a list (found by pylint) E1101:514:httpshandler._makeconnection: Instance of 'tuple' has no 'pop' member E1101:516:httpshandler._makeconnection: Instance of 'tuple' has no 'pop' member

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