context: improve memctx documentation

churn: py2.3 compatibility fix - generator expressions appeared in py2.4 - sort doesn't have any arguments except sorting function

Merge with crew-stable

convert: properly encode subversion URLs (issue 1224)

convert: tolerate embedded spaces in filemap source revisions

Show added files as "added" in editor commit message (issue 1330)

zeroconf: initial implementation This is a basic, hopefully portable, zeroconf extension. Enabling it will allow hg paths/pull/push/clone/etc. to automatically discover services advertised as "_hg". And naturally, running hg serve will advertise itself as a "_hg" service as well as a "_http" service for use by browsers.

churn and stats commands merged

Eliminate normpath from foldmap calls. Normcase already takes care of upper/lower case and /->\ conversions. What's left for normpath is folding of a/../a sequences but this should be either done consistently on both non-folding and folding code path or not at all, otherwise we are introducing inconsistent behavior between the two that has nothing to do with case folding. Second argument against it - normpath being pure Python function is very slow - as much as 50% of time is spend just inside normpath call on my repository.

issue 1286: dirstat regression on case folding systems This patch fixes regression reported in 1286 that causes util.fspath to be called for every file not in current manifest - including ignored files. The regression is quite severe - the time for simple hg st goes from 5s to 1m38s on one of my source trees - which basically renders mercurial useless.

status: don't warn about missing files present in base revision (issue1323)

merge: fix bug going backwards for already reverted files (issue1303)

churn: generalisation, now it is possible to see statistics grouped by custom template

Merge with crew-stable

Add missing catch of a TypeError

provide nicer feedback when an unknown node id is passed to a command Previously, an unknown node id would lead to the following error: abort: 00changelog.i@343445453433: no node! All other unknown revision would instead display as: abort: unknown revision '343445453'! The former error message has been suppressed in favor of the latter.

tests: check for bzr support by importing bzrlib This is better than starting bzr --version, because it works correctly when running tests with a non-default Python (version).

convert: fixed python2.3 incompatibility in bzr source (generator expression)

Improve error handling in osutil.c 1) In posix part set error when path is too long so instead of SystemError: error returned without exception set it will raise ValueError: path too long 2) In Win32 part replace generic PyErr_SetExcFromWindowsErrWithFilename by PyErr_SetFromWindowsErrWithFilename The exception returned is WinError(based on OSError) and some rudimentary errno translation is performed from Windows error range to errno module friendly range so errors like ENOENT can be handled via symbolic constant and consistently between Win32 and Posix.

`source` doesn't work for some /bin/sh, use `.` instead

fix conflicting variables when no native osutil is available thanks weijun for the bug report and patch, fix issue1309

osutil: implementation for Win32 Use information provided by FindFile... Win32 calls to generate stat information without lstat call per file. rwx bits in st_mode are ignored as they are not stored in Win32 fs and Mercurial does not use them Unicode path / path names over _MAX_PATH are intentionally not supported.

convert: improve convert_source documentation

get-with-headers: fix stream modes under Windows

convert: add bzr source

merge with crew-stable

i18n, churn: mark string for translation

merge with crew-stable

fetch: use dirstate branch instead of first parents

merge with -stable