convert: make built-in cvsps the default Reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>

merge with crew

dirstate.walk: skip unreadable directories (issue1213) Do not abort on permission denied error, just skip the directory.

osutil.c: refactor argument parsing, allow skip=None being passed

convert: fix builtin cvsps under Windows Drafted and reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>.

dirstate._dirs: fix refcounting broken by 7dfac37cfabf reported by Patrick Waugh

patchbomb: consistently use opts.get

annotate: fix bug when annotating multiple files

dirstate: C parsing extension

parsers: speed up hex decoding for manifests

parsers: clean up whitespace

diff: pass contexts to status Allow status() to take contexts as well as nodes. This lets us avoid unpacking manifests multiple times and intelligently unpack manifests in revision order. Also, we can avoid unpacking manifests at all when there are no changes in the working directory.

revlog: fix heads performance regression

zeroconf: advertise a proper hostname for _hg services

zeroconf: use only first part of hostname for building local name

inotify: avoid status getting out of sync Always looking up oldstatus keeps us from failing to update our state when we disagree with the dirstate.

inotify: fixup rebuilding ignore

inotify: add a test for lookup bug

inotify: skip deactivation message

inotify: fix confusion on files in lookup state

Add hgext.zeroconf to the package list so it gets installed by setup.py.

tests: Windows compatibility fixes - printenv.py, md5sum.py, simplemerge, test-archive, test-merge1, test-merge-symlinks: set standard streams to binary mode - test-encode: replace "gunzip" by "gzip -d" - test-hup: requires fifo

Merge with crew-stable

test-doctest: remove TERM env variable only if it's there

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

Update coverage.py There is no technical reason to update it except it contains all the patches already done in mercurial plus other stuff. It will be easier to update and maintain in the future.

gitweb: correct tags page feed autodiscovery links

clone: honor -r even when pulling named branches

Escape '%' when writing to hgrc (issue1199) Fixes clone with paths containing '%'. Patch provided by mjc.

tests: add test for notify extension as changegroup hook

tests: fix reported patch tool name in test-mq Strip any path of the patch executable, which it might return on failure.

tests: fix readline escape characters in output for test-doctest.py

merge with crew-stable

hgk: Display branch name for each head (issue 740) In the graphical view, each head is decorated with an additonal tag containing the branch name, if that head is not on the default branch.

tests: fix test-highlight for compatiblity with newer Pygments

update: mention null revision in help text

allow Mercurial to compile on Haiku

forbid username with '\n' at the changelog level It was already forbidden for ui.username() but no verification were made for username passed through the commandline.

listdir: add support for aborting if a certain path is found This lets us bail out early if we find '.hg', letting us skip sorting and bisecting for it.

osutil: fix some braindamage - entkind returns -1 on failure - compile if AT_SYMLINK_NOFOLLOW is missing - avoid fullpath overflow

dirstate: improve performance for building _dirs

osutil: major listdir cleanup

hgweb: let the web graph cope with low revisions/new repositories (issue1293)

hgweb: Respond with HTTP 403 for disabled archive types instead of 404 This makes it easier for clients/users to distinct between supported but disabled and unsupported archive types.

coal/paper: fix error page markup to show navigation again

merge with -stable

osutil: proper error checking and reporting

run-tests.py: fix the check for the hg installation with -jn (n > 1)

inotify: add client code for long pathname handling

dirstate: use the right variable (f, not ff)

osutil: proper error checking and reporting

hgcommand.vim: refer Vim7 users to vcscommand plugin

make test-mq-qdelete work reliably (issue1180) if after a and b has been applied, their hash starts with c, then the test would fail (because there would be a rev c which would be seen as "applied") so probability of failure would be 2*1/16.

Add support for Bugzilla 3.0 series to bugzilla hook. The only difference is 'fieldid' in table 'fielddefs' got renamed to 'id' for 3.0.

run-tests.py: fix the check for the hg installation with -jn (n > 1)

merge backout

Backed out changeset 3d54cf97598d (see issue916 for details)

i18n, record: improve use of translated docstring in prompts The old code would confuse the user if the translator actually translated the letters "Ynsfdaq?" in the prompt, since the user input would be matched against the English string, despite the translation. The new code fixes this, but the translator must be 100% consistent. Also, the translation of single character strings is problematic if they are used differently by different pieces of code.

i18n: use gettext instead of _ Both gettext and _ trigger a translation at runtime, but _ can only be used with a string argument since it also triggers string extraction.

i18n: mark help strings for translation The gettext function is just another name for the normal _ function and it is used for translating docstrings when using _ would make pygettext.py output a warning.

restructure helptable When looking up a help topic, the key is now only matched against the short names for each topic, and not the header. So hg help 'Environment Variables' must be replaced with hg help env

Do not try to load extensions twice (issue811)

enhance the error output in case of failure during http push

tag: without a checkout, base the tag changeset on tip instead of nullid issue916

use Exception(args)-style raising consistently (py3k compatibility)

fetch: added support for named branches Previously, fetch didn't really work when there were multiple named branches in the repository. Now it tries to do the right thing(tm) in all situations.

branch: added more support for named branches hg branch now has a -C (--clean) option, to reset the current (dirstate) branch to the branch of the last commit (first parent).