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

Allow explicit disabling of extensions If the first character of an extension path is '!', the extension is silently skipped.

mq.el: define keymaps as convensions

mercurial.el: mark-marker() returns non-nil with no active mark on GNU Emacs

mq.el: declare variable mq-top

mercurial.el, mq.el: remove runtime dependencies on CL package * (require 'cl) at compile-time * don't use map()

hgk: colorize commits by authors Color commits by author. Colors will be assigned to authors by using a configurable list of colors. The line corresponding to current id (the version currently in the working tree) is highlighted in a special font which is also configurable. There is provision to assign fixed colors to authors. See .gitk comment for details.

osutil: use fdopendir instead of dirfd

convert: svn -- fix tags handling They were simply not detected.

convert: svn -- fix 'exists' Previously 'exists' erroneously returned False for empty dirictories. This is wrong since we want to detect even empty 'branches/' or 'tags/'.

merge with goto

mpatch: Define Py_ssize_t for old pythons and use it instead of ssize_t. See also PEP 353. NOTE: Microsoft compilers (8 or earlier) does not have ssize_t.

mpatch: use int rather than ssize_t We might need to be more clever than this to make Py2.5 happy.

osutil: improve portability - manually inline mode_to_kind - remove unused alloca include - remove fstatat and associated bits It's not obvious that there's an advantage to using fstatat in terms of performance. The race-avoidance properties of fstatat aren't terribly useful to us either. So best to avoid it until we figure out how to use it portably.

fix typo