Merge with stable

localrepo: more specific warning on adding large files With better language as suggested by timeless.

progress: drop extra args for pos=None calls (issue2087)

check-code: fix check-code complaint

check-code: improve quote detection regexp, add tests

Merge with stable

check-code: add a return value to checkfile function The checkfile function returns True if the file is correct, False otherwise.

code-code: Add a logfunc argument to checkfile This helps external tool customisation. The logfunc argument must be a function called to report errors. A new logger class is also added to keep the old behaviour by default.

check-code: Add a ``maxerr`` argument to the ``checkfile`` function check-code.py used to halt after 15 errors. This changeset adds a new argument to the checkfile function to control this limit.

check-code: Add a ``checkfile`` function The part of the code actually checking each file is moved in the ``checkfile`` function to allow external reuses.

check-code: Only call check-code if __name__ = "__main__". This changeset moves the code that actually executes something to the "if __name__ = '__main__'" section to allow the file to be imported as a module.

add a small test for contrib/check-code.py This changeset adds a test file for contrib/check-code.py. This test runs check-code.py against two small files. The first file should not raise any check-code.py error while the second should. A line contains multiple errors to verify the check-code.py behaviour: In the case of multiple errors at the same line, the context line should only be displayed once.

keyword: do not bother about detecting extension path in demo Detecting and showing the path to a keyword extension in a non-standard place only made sense while keyword.py was not shipped with Mercurial. The test output has changed because we do not have a spurious space at eol anymore.

keyword: make kwdemo less verbose 1) Set the branchname always silently with dirstate.setbranch(). We create a branch so that testing the {branches} template does not come up empty. But kwdemo is hardly the place to inform the user by inference why {branches} is empty on the default branch. "demobranch" is ascii and cannot be changed, so using the internal command instead of commands.branch() is safe. 2) Do not show full path to temporary directory (distracting long lines on Mac OS X). 3) No special debug output. Output only related to keyword, no internals like unsetting of commit hooks etc.

keyword: 1 variable name for overwriting candidates

keyword: do not customize ui.note() when overwriting Behaviour change: hg commit --verbose now prints out the names of the files which are overwritten.

mq: test for init --mq with a destination argument

contrib/wix: fix product name to include version Without this, Mercurial is registered under the installed programs on Windows as just 'Mercurial', which is unusual for a program to do on Windows. Including the version in the registered product name registers the software in the Windows control panel of installed programs as, for example, 'Mercurial 1.5' (for 1.5), or as 'Mercurial 1.5.1032' for a stable 1.5+32-35893dcfd40c 'Mercurial 1.5.5080' for a unstable 1.5+80-1ee60e82333c when using http://bitbucket.org/tortoisehg/thg-winbuild to create daily builds. Furthermore, the install UI texts in the built installer database (MSI file) are more clear on what the user is about to install, as, for example, the text in the initial installer dialog now reads "The Setup Wizard will install Mercurial 1.5 on your computer" instead of just "The Setup Wizard will install Mercurial on your computer"

help: it's not necessary to escape quotes

check-code: remove simple quotes first

merge with stable

filelog: no need to optimize an uncommon case, assume meta = {}

filelog: text is stored modified when it starts with '\1\n'

Merge with stable

check-code: add check for any/all

cvsps: fix traceback involving 'synthetic' https://bugzilla.redhat.com/show_bug.cgi?id=573666 Reported by Sjoerd Mullender

progress: use a verb in present participle

Merge with stable

progress: use a verb (+noun) in present participle

subrepo: fix hgrc paths section during subrepo pulling There are two bugs in current subrepo ctor: - hgrc paths were using parent repo (ctx._repo) instead of self._repo - it was joined with local extract path, not its source repo path Fixed both bugs using _abssource on self once it is fully initialized. It gets the job done perfectly for pull and push urls.