Merge with hg-i18n

i18n-ja: synchronized with bb4561401c84

alias: fixes exception when displaying translated help text __doc__ of aliased command shouldn't cointain non-ASCII characters, because it'll be gettext-ed later by commands.help_(). Here gettext can raise UnicodeDecodeError. Once concatenated two translatable strings into one, it become untranslatable. So this patch moves 'alias for:' from dispatch.cmdalias to commands.help_, where help texts are translated. 'alias for:' was introduced by 6e8a16dd3e30.

Merge with hg-i18n

i18n-sv: synchronized with d1bbf01c4a8e

tests: update output to match b1339234080e

Add ElementPath to the list of package ignored by demand import The bzrlib try to import the ElementPath module but had a fallback in case the import fails. Lazy import of this module leads to later failure. The bzrlib is used by the convert extension.

resolve: rewrite help to be clearer and more complete (issue2030).

mq: simplify --mq handling / keep compatibility with other extensions reported by edgimar on IRC

Merge with stable

i18n-da: synchronized with 091dddf05764

doc/Makefile: fix doc generation when LANGUAGE is set

i18n-ja: synchronized with 4462760d6cfc

i18n-pt_BR: synchronized with dd3526162436

contrib/wix: add COPYING.rtf Moving the file from the misc directory of the thg-winbuild repo, which uses mercurial's contrib/wix. This file is displayed by the install UI sequence, so it belongs to the WiX sources quite closely. It happens to be installed by the msi installer, too.

fix test-mq-eol under --pure (mimic diffhelper.c behaviour) bug discovered by apycot (apycot.hg-scm.org)

Updated contrib/vim/patchreview.* to version 0.2.2 - Security fixes by removing custom tempfile creation - Removed need for DiffReviewCleanup/PatchReviewCleanup - Better command execution error detection and display - Improved diff view and folding by ignoring modelines - Improved tab labels display

Merge with hg-i18n

i18n-sv: synchronized with fc5908d01ed7

strip: invalidate all caches after stripping (fixes issue1951) test thanks to Stefano Tortarolo

fix test output changed by 2e1a9b811d13

Updated contrib/vim/patchreview.* to version 0.2.1 1) adds a :DiffReview command to review code changes in the current workspace. 2) removes the need to have patchutils (specifically filterdiff) installed on the system by implementing patch extraction in pure vim script.

httprepo: normalize output from unbundle with ssh Lines from the remote are prefixed with 'remote: ' and written locally using ui.status, similar to what sshrepo does.

merge with default

shrink: handle all combinations of inline/non-inline revlogs

commands: clarify --config syntax

progress: provide an explicit disable method for developers The other three checks for disabling the progress bar have serious side effects for any class that derives from ui.ui()

url: only mark format string for translation

Merge with hg-i18n

i18n-da: fixed typo

i18n-ja: synchronized with eddf859343de

i18n-pt_BR: synchronized with 076e8a8000a3, minor fixes

url: avoid traceback when parsing [auth] (issue2056)

filemerge: use native path separators when merging (issue1399)

gpg: make 13448eab08ca work when not on repo root

hgweb: use string join instead of slower cStringIO

hgweb: fix handling of arguments in the between command The 'pairs' argument was coded to be optional, but the code would crash if it was not provided.

hgcia: report RPC errors

merge with stable

commands: correct diff -c explanation

httprepo: send Content-Type instead of content-type

httprepo: use content-type application/mercurial-0.1 for POST Previously, application/octet-stream was used. The content-type is currently ignored by the server.

patch: fix patching with fuzz and eol normalization

make the progress extension honor ui.quiet

subrepo: Update .hgsubstate in case of deleted subrepo When a subrepo is deleted from .hgsub, it also needs to be removed from .hgsubstate. Previous code was updating .hgsubstate only in case of newly or modified subrepo.

Do not use osutil.c with python 2.4 and Windows (issue1364) Windows python 2.4 os.stat() reports times including DST offset, while osutil.c reports the correct value, which makes status() systematically compare files content. This bug is fixed in python 2.5. Using osutil.py instead of osutil.c is 4x times slower on large repositories but current code is completely unusable. Given few people are likely to use python 2.4 on Windows this solution was considered a good trade-off compared to more invasive solutions trying to address the offset issue.

commands: mention diff -c

progress: mark units for translation

patch, i18n: avoid parameterized messages Singular message removed for simplicity.

gpg: do not call status on the whole repository, only on '.hgsigs'

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

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