sync with -stable

Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback

various doc fixes - update can no longer be used to merge - short summary start with lowercase - add merge to short help list - fix tests

catch socket.error fix issue394

fix handling of multiple Content-type headers This can happen if an error happens while sending application/mercurial-0.1 content. The error page will be sent resulting (for at least lighttpd) in the following headers: Content-type: application/mercurial-0.1 Content-type: text/html which result in req.proto = 'application/mercurial-0.1, text/html' fix issue344

add [diff] section to hgrc documentation

inst.reason isn't alway in the form (errno, strerror) urllib2.urlopen("foobar://foo") is an example where inst.reason is a string fix issue383

fix hg help <ext> for extension that do not define any command solve issue462

mq: fix strip failing to unlink a bundle os.unlink doesn't know how to deal with urls

symlinks: minimal support for symlinks in merge/update This will get angry, confused, and sad if you try to merge a symlink with a regular file.

symlinks: add flags param to wwrite Now wwrite can set symlink and exec for files

replace filehandle version of wwrite with wwritedata

unify encode/decode filter routines

symlinks: add _link checking function

symlinks: use is_link wherever is_exec is used

symlinks: don't complain about symlinks

symlinks: add a linkfunc

symlinks: add basic symlink functions to util.py

symlinks: check whether a filesystem supports symlinks

exec: remove last flag from is_exec

exec: add execfunc to simplify exec flag support on non-exec filesystems

pull umask-checking up

exec: checkexec checks whether filesystem supports exec flags

expanded bash_completion for transplant extension

Yield entries from [paths], too, when completing -R/--repository.

Corrected synopsis for transplant.

Improved error message for extensions overriding commands (with test): - Old text "module foo overrides bar" was misread as overriding module bar. - Only print a single warning line per extension instead of one for each command.

sync with stable

Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.

test-manifest-merging: we only need to remove files

Make test-manifest-merging less likely to delete the whole filesystem

Send encoding information in rss header

Fix a pygettext complaint

spelling fix

mq: remove unecessary code, duplicate with util.opener

hgk: (re)optimize reading of changelog and manifest

mq: use contexts

hgk: use contexts

hgk: remove unused code, node2 is always set

extdiff: use contexts

bugzilla: use contexts, simplify

acl: use contexts

hgweb: fix unused import

hgweb: use contexts, fix coding style

commands.py: use contexts in various places (debug*state, revert)

cmdutil.py: use contexts in findrenames

commands.py: use contexts in export

add possibility to pass flags when testing with the Makefile

archival.py: use contexts

patch: use contexts for diff

context: create a filectxt with filelog reuse

context: fix a bug in workingfilectx.renamed

make it possible to use changectx to create a filectx

remove various unused import

add date attribute to workingfilectx

fix tab vs space

test-manifest-merging: we only need to remove files

Merge with mpm

convert-repo: add option to attempt to sort by date

convert-repo: add CVS exec bit support

Fix removed file cornercase for CVS convert-repo

convert-repo: add CVS branch support

convert-repo: add basic CVS import support

Make test-manifest-merging less likely to delete the whole filesystem

merge with crew

grep: remove count handling, simplify, fix issue337

grep: incrementing is always False during 'iter'

Merge with crew

Update convert-repo usage comments

convert-repo: add some smarts autodetect source and destination repo types autodetect read and write capabilities of converters default destination directory (<src>-hg) default map file (<dest>/.hg/shamap) more verbose by default add a -q switch add IO functions

Send encoding information in rss header

pass the extra dict in rawcommit

Merge with mpm

Merge with crew

Move README info to wiki

Move test suite docs to the wiki

hg in: if no incoming csets, remove existing bundle

Merge with crew-stable

sample.hgrc: hgk extension is now in hgext. Use churn as example for contrib.

purge extension doesn't need "#!/usr/bin/env python". (from the Debian package: deb_specific__hgpurge.py.patch)

hgweb: simple tests

hgweb: add raw manifest template

hgk - fix CR issues on windows

Teach hgweb about revlog.LookupError

writebundle: overwrite existing bundle file

incoming/outgoing: return failure if no changes found

Add revlog.LookupError exception, and use it instead of RevlogError. Remove repo.LookupError, which devolves to the revlog version.

Add some modules to the demandimport ignore list for Windows

Sync with -stable

Added signature for changeset 27230c29bfec36d5540fbe1c976810aefecfd1d2

Added tag 0.9.3 for changeset 27230c29bfec

fix calculation of new heads added during push with -r fix issue450

demandimport: blacklist _hashlib again (imported in ImportError try block)

demandimport: handle already-loaded nested modules in subload

Merge with crew

demandimport: fix import x.y.z as a when x.y is already imported.

Merge with stable

merge with crew-stable

Adjust test-help output for the change in 3c82ab166eea.

Fix test-hup for different output of ls on at least MacOS X and Solaris 8.

convert-repo: update usage information

Make 'hg sign' behave like other commands: Default to current parent.

doc fix: hg tags defaults to current parent revision, too. Additionally use better language for the help text for tag, cat and manifest.

doc string fix: hg cat and manifest default to current parent revision.

Using --date "" isn't possible, so don't document epoch. (see issue447)

convert-repo: avoid adding bogus value to shamap on tag update

convert-repo: fix recoding of committer

merge with crew-stable

Include hg.1.gendoc.txt in doc/MANIFEST to prevent unnecessary rebuild.

Regenerate hg.1 manpage if help text in help.py changes.

merge with crew-stable

util.system: fix quoting on windows

templater.py: fix obfuscate

Make demandimport pass all tests on python2.5.

Merge with crew-stable

fix strip on windows c: was interpreted as a protocol, prepend file: to the bundle file name

Don't use node length for calculating revision number length. Done by moving repo.lookup of revisions from commands.export to patch.export

Make sequence number on hg export start at 1 (as documented for %n). Add test.

Merge with main

demandimport: ignore _hashlib and email.mime This makes things work with Python2.5. A better fix would be to fix demandload to use __getattribute__ to be more transparent.