win32: read system rcpath from registry Using the module name was not always helpful. It breaks down when Mercurial is installed as source and when the Mercurial libs are used by external applications. This patch allows Mercurial installers to store the system wide rcpath in the registry, where it can always be found. HGRCPATH is a poor option for storing the system wide rcpath, since it overrides both the system and user rcpaths.

Merge with crew-stable

mq: missing target files do not make qpush to fail immediately (issue 835) Reported and explained by Peter Arrenbrecht <peter.arrenbrecht@gmail.com>. Following file additions were skipped but empty files were still created. This situation could lead to qrefresh losing patch information.

Fix style nit and add some comments to tests.

Use SCRIPT_NAME and PATH_INFO instead of REQUEST_URI. This is required by WSGI (fixes issue846).

Add tests for hgwebdir repository names with slashes in them.

CGI compatibility fix for d74fc8dec2b4.

doc: add repo/ to .hgignore and .hgtags These names were disappearing in the asciidoc output and no form of escaping seems to help. Let's just add repo/ to make it explicit that they're in the repository root.

imported patch rollback-help

imported patch rev-help

clarify rm -A

hgweb: make web.name default to repo basename Providing the full path to the repository by default could be considered a security risk.

fix calloc(0, ...) issue

update: default to tipmost branch if default branch doesn't exist

clone: fix race with same target directory (issue716) Whichever side creates .hg first wins the race, and the other aborts politely without deleting the tree.

backout: disallow across branches (issue655)

rename: add test for moving untracked files in directories

Less indirection in the WSGI web interface. This simplifies some code, and makes it more compliant with WSGI.

Drop a bad import that snuck in.

hgweb: account for Python 2.4 in one test

hgweb: fix breaking tests on Python < 2.5

Merge with crew

hgweb: return meaningful HTTP status codes instead of nonsense

hgweb: make notfound templates more informative

hgweb: flesh out raw templates

make LookupError more detailed

Merge with crew-stable

convert: some tidyups, doc improvements, and test fixes The various back end options are now documented. The hg source can now be configured not to hand out a revision ID.

Merge with crew

convert: tell the source repository when a rev has been converted This lets us roundtrip changes between svn and hg.

convert: save hg revision during a convert This breaks hg->hg hash roundtripping, but that was fragile, didn't work reliably, and hence arguably of little value.

Merge with mpm.

Merge with crew-stable

cmdutil: make "files" list all files, add "file_mods" for modified files

hgweb.server: flush log files after every access

test-import: test fuzziness, ambiguous patch locations

patch: fix sort() comparator argument 'hg import' fails under Python 2.3. The name of the compare function parameter in the call to list.sort() is 'cmpfunc' in Python 2.3 and 'cmp' in Python 2.4+. Passing the compare function as a named parameter is therefore problematic.

Merge with crew

cmdutil: always expose "files_add", "files_del" and "manifest" templater properties

revlog: make revlogv0 loading more robust against corruption

push/pull: abort if we try to visit a missing or empty revlog

i18n: fix complaints from pygettext

verify: improve handling of empty or missing files - explicitly notice empty or missing changeset, manifest or file revlogs - shortcircuit warnings relating to missing changeset or manifest revlogs - fix changeset/manifest crosscheck swapped variables - properly sort crosscheck messages

Merge with crew-stable

convert: read CVS files in chunks (issue 800) socket.makefile() fails on large read requests (more than 10MB) with MemoryError.

test-convert-svn-sink: test directory additions

convert: add directories to subversion from root to leaves

convert: force svn:executable when execute-bit is not supported The util.is_exec fallback would be to ask subversion for the current value of svn:executable. Setting it directly is just simpler.