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.

Merge with crew-stable

convert: teach cvsps to handle . repository (issue1649) For a CVS repository checked out with "cvs co .", the prefix used to strip of what we get from CVS was previously erroneously set to "repopath/.". We now prevent the dot to be added. Test folded in test-convert-cvs and simplified by Patrick Mézard <pmezard@gmail.com>.

record: separate each hunk with a blank line This makes it easier for the eye to find the beginning of a hunk when scrolling up in the terminal.

mq: do not try to delete non-existent files (regression from e8e56d8377ab)

Merge with stable

mq: fix init with nonexistent or non-local repository

mq: no longer refer to deprecated qinit -c command

mq: don't mention qinit as a "common task" Without -c, it is a no-op (the queue is implicitly initialized by all relevant commands if needed), and queue repositories with -c are an advanced usage of mq, and not otherwise required.

mq: don't use regexp when not necessary

mq: use xrange/enumerate instead of += 1

mq: don't use len(list) unless necessary

mq: find_series() simplify and don't use regexps

mq: fix coding style (missing space)

mq: qsave creates entries with the left part empty (':patchname')

mq: simplify statusentry(), fix restore broken by ee48e5ef8753

mq: use context API

mq: simplify qparents calculation

mq: simplify commit message generation

mq: avoid many hex/bin conversions, keep the binary node when possible

rebase: add option to not commit after a collapsing This option is useful when other extensions (e.g., pbranch) want to use rebase --collapse and append other things before committing. This is not intended to be used from command line.

Merge with crew-stable

hgweb: make code to join url path simpler Now SCRIPT_NAME never contains http://host:port part, we don't need to care about '://'.

hgweb: fix broken URLs of RSS/Atom feeds (issue1772) This fixes doubled URL, e.g. http://example.orghttp://example.org/..., which appears on RSS/Atom feeds served by hgwebdir. It splits baseurl to update SERVER_NAME, SERVER_PORT and SCRIPT_NAME, according to RFC 3875. Updated the test output since SCRIPT_NAME becomes not to contain http://host:port part.

hgweb: introduce helper method to update req.env

rebase: always check if rebasing onto an applied mq patch. Previously, it only checked for an mq patch if the user explicitly passed -d/--dest. But rebasing onto an mq patch is a bad idea regardless of how we determine the rebase destination.

subrepo: wrap long line

merge with stable

test-extension: fix disabled extension tests for run-tests.py --local One test that requires inserting a broken extension into hgext does this by modifying PYTHONPATH. This doesn't work when run with --local because the 'hg' script being used is in the same directory as the local hgext. Instead of modifying PYTHONPATH, a secondary extension is enabled using --config that inserts the dummy hgext at the beginning of sys.path, before the script's path.

subrepo: print subrepo pulling URL

merge with stable