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

Honour the exec bit when we go back in time. Fixes issue801.

fix typo in convert help text, update test

Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.

hgweb_mod: update unidiff() calls and finish e5eedd74e70f job

Fix context iterator.

Update convert help text Add Mercurial as a source format, clarify that the include directive triggers the exclusion of all not explicitely included files/dirs and use MAPFILE instead of revmapfile in the text, following the short message convention.

Handle patches with misformatted empty lines Insert a space on empty lines which are missing a control character. Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com> --- I frequently receive emailed patches with empty lines represented as "\n\n", where Mercurial expects them to be "\n \n". patch(1) applies these patches without complaint, but qpush fails all hunks.

Use both the from and to name in mdiff.unidiff. This fixes a compatibility issue with git diffs. * * *

Fix Windows os.popen bug with interleaved stdout/stderr output See python bug 1366 "popen spawned process may not write to stdout under windows" for more details.

https url handling: usernames and passwords were registered to the wrong url

patchbomb: no traceback if (diffstat) confirmation is refused

patchbomb: fix traceback when diffstat isn't available

Only set mode of new patch if the target file was removed before. If the file is writable by the user, but owned by a different user, the chmod will otherwise fail with "Operation not permitted". Additionally make very sure that the file is only written if either the number of links is <= 1 or the file was successfully removed. Maybe this minimal COW code should be replaced by something from util.

httprepo: ignore environment proxies when proxies are disabled

gpg: use the same log message format as hg tag

Added signature for changeset 23889160905a1b09fffe1c07378e9fc1827606eb

Added tag 0.9.5 for changeset 23889160905a

Catch smtp exceptions

tests: make test-mq-guards work with ksh

tests: tidy up reporting of skipped tests if not verbose: - print 's' rather than '.' - pass skipped test reports back to parent for -j - report which tests were skipped at the end - print '.' after test completion