Merge with crew-stable

hgwebdir: normalize virtual paths before stripping the separator It is not even clear that virtual paths should be normalized as normal paths at all, we could expect slash to be the natural separator.

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.

convert: fix svn file:// URL generation under Windows

mq: avoid qnew committing everything on invalid paths (issue 803) If paths are supplied but resolve to nothing, localrepo.commit() is called with an empty set and commits the whole dirstate. Avoid this by passing the match function to commit.

highlight: clean up coding style a little

extension for synax highlighting in the hgweb file revision view Depends on the pygments syntax highlighting library: http://pygments.org/

Change standard streams mode to binary at hg startup Standard streams are expected to operate in binary mode everywhere, especially with archive, cat, diff and export commands. Rewriting these to separate informational output from binary content is complicated to do and to maintain, nonwithstanding mode switching reliability. Changing all output mode to binary should not have much impact on Windows were stream processing tools are barely used and usually cope with unix style endings. Streams mode being process wide, the switch is performed in the startup script to avoid polluting existing API users who may have solved this issue already or ignored it at least for the mercurial part.

test-import: read email payload in binary mode

convert: fix util.popen regression in darcs converter

merge with crew-stable

mq: really remove undo after a qpush (and after a strip) For qpush, removeundo has to be called after the transaction has finished. strip may use unbundle, which also leaves an undo file. Fixes issue780.

httprepo: give self._url and the netloc to the password manager This should hide some differences between different python versions.

Do not display passwords with pull/push/incoming/outgoing Passwords specified in the repository URL are now displayed as '***' when accessing the remote repository.

run-tests.py: add a default --date "0 0" argument to commit et al Part of test-tags was modified just to be sure this works. The change in test-archive-symlinks is necessary to avoid a "helpful" warning from GNU tar ("implausibly old time stamp 1970-01-01 00:00:00").

tests/*: avoid losing the original settings from $HGRCPATH

convert: make sure mercurial_source has a local hg repo

convert: display all errors if we couldn't open the source repo This should give the user a better hint of what's going wrong. Improve some error messages. In particular, mention "CVS checkout" instead of "CVS repo". Fixes issue822 and issue826.

test-convert-darcs: skip if we can't find the elementtree module This patch is a bit dirty to avoid having to repeat the dance required to import elementtree.

test-permissions: add a chmod +w to allow the directory to be removed

run-tests.py: don't print a dot for skipped tests

purge: simplify safety net for case mangling filesystems Relying on the exact return of statwalk would cause us to abort when there was at least one tracked file inside an ignored directory. This patch forces an extra walk of the whole working directory even on sane filesystems, where it wouldn't be needed. Fixes issue621.

Fix dir-changed-to-file updates on clean workdir. Workaround for dir-changed-to-file updates mentioned in rev 7a64931e2d76 doesn't actually work since tests introduced in mentioned changeset prevented dirstate updates even if working directory updates succeded. Make tests more relaxed for dirstate operations not directly accessible from cli. See also issue660. While here, move _dirs existance check from _decpath() to _changepath() for unification.

Merge with crew

Add note to CONTRIBUTORS file

convert: add support for Subversion as a sink

convert: abstract darcs's commandline handling

convert: iterate

convert: abstract map files into a class

Mark failing test as a known bug

Merge with -stable

Support qgoto in contrib/bash_completion.

hgk: change config file from .gitk to .hgk Git's gitk and Mercurial's hgk have diverged enough that their configuration information is no longer entirely compatible. Whenever I run one, the other gets reset to the default screen position. This patch changes hgk to store and read its configuration from ".hgk" instead of ".gitk", so as not to conflict with the "real" gitk anymore.

Merge with crew-stable

Merge with stable.

Test a merge of a symlink against an executable file. This should result in a conflict, but the symlink always wins.

Merge with -stable.

Merge with crew.

Merge with crew-stable.

Merge with crew-stable.

Merge with crew-stable

convert: fail if an external required tool is not found

Merge with crew-stable

test-execute-bit: skip if execute-bit is not supported

See if execute bit is honoured when we go back in time

merge with -stable

merge with crew-stable

Merge with crew-stable

See if execute bit is honoured when we go back in time