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.

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

merge with -stable

patchbomb: fix traceback when diffstat isn't available

merge with crew-stable

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.

Merge with crew-stable

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

import gettext since '_' is used

explicitely use integer division

fix UnboundLocalError, refactor a bit bin wasn't defined in all branches (bug introduced in 82b4ff3abbcd

bdiff: tweaks for large files - adjust the common line threshold to .1% this speeds up a delta of 7M lines of source from 10m to 40s - adjust the scaling of the hash array down a bit as it was raising the peak memory usage significantly

revlog: break up compression of large deltas Python's zlib apparently makes an internal copy of strings passed to compress(). To avoid this, compress strings 1M at a time, then join them at the end if the result would be smaller than the original. For initial commits of large but compressible files, this cuts peak memory usage nearly in half.

revlog: fix caching of buffer objects

chunkiter: handle large reads more efficiently - for large reads, don't attempt to read more than necessary - if we've gathered the exact number of bytes needed, avoid a string copy

revlog: avoid large yields in group() Split large yields so that the downstream consumer (chunkbuffer) will avoid some pain when reading ahead.

chunkiter: simplify iter logic

chunkbuffer: removed unused method and arg

revlog: reduce memory usage in addgroup - use a buffer to extract the delta from a chunk - avoid concatenating to a compressed delta - use a buffer to directly extra full text from a trivial delta - delete chunk and delta objects after use

mpatch: allow buffer objects for input

Merge with crew Those crew folks are getting lazy about pulling from upstream before committing.

Merge with crew

Merge with -stable

findcopies: fix rename bug We've fiddled with this line several times, and an old bug has reappeared from it. Let's take a peek at the history. The original "or" (rev 3674, in 0.9.2 and 0.9.3): http://www.selenic.com/hg/rev/9103dab96093 Then I changed it to an "and" to fix a bug (rev 4304): http://www.selenic.com/hg/rev/4787e2b0dd03 Then for reasons now lost in the mists of time, I dropped half (rev 4399): http://www.selenic.com/hg/rev/93652499bed3 Then we added back the "or" (rev 4416, in 0.9.4): http://www.selenic.com/hg/rev/bb1800a7d7e1 So it seems it ought to be "and".

mq: clarify queue top message

test-convert-darcs: don't let $HOME/.darcs pollute the test environment

convert: refactor sink initialisation, to remove hardcoding of hg We also introduce options to explicitly set the source and destination repository types. Improve testing of corner cases a little.

convert: add default constructor for converter_sink

convert: make contents of "extra" dict available from sources, for sinks. This breaks hash preservation for hg->hg conversion, as each converted change gets a convert_revision item added to its extra dict. Ugh.

convert: rename convert_svn to svn_source

convert: report errors more meaningfully if run with --traceback

osutil: Solaris build fix

Fix build error with Sun C compiler.

osutil.c: use strncpy instead of strncat

findcopies: fix rename bug We've fiddled with this line several times, and an old bug has reappeared from it. Let's take a peek at the history. The original "or" (rev 3674, in 0.9.2 and 0.9.3): http://www.selenic.com/hg/rev/9103dab96093 Then I changed it to an "and" to fix a bug (rev 4304): http://www.selenic.com/hg/rev/4787e2b0dd03 Then for reasons now lost in the mists of time, I dropped half (rev 4399): http://www.selenic.com/hg/rev/93652499bed3 Then we added back the "or" (rev 4416, in 0.9.4): http://www.selenic.com/hg/rev/bb1800a7d7e1 So it seems it ought to be "and".

osutil: more tidying - do_stat -> keep_stat - all_kinds -> !need_stat - simplify main error logic - reorder declarations

osutil: move file list loop to its own function

osutil: simplify DT_REG support

osutils: pull file stat loop into its own function

osutil: fold stat paths together - simplify st/py_st logic - use stp to point to stat buffer - combine stat paths