convert-repo: handle packed git tags

lazyindex: handle __delitem__ in loadblock

commit: catch IOError filecommit can still raise IOError if we're on a filesystem without support for symlinks.

Merge with crew-stable

filecommit: don't forget the local parent on a merge with a local rename

Fallback to ascii if getpreferredencoding raises an exception Fixes issue478.

unbundle: don't use urllib if it's a local file

docopy: deal with globs on windows in a better way

Explicitly expand globs on Windows

mtime can be -1 after a merge and cause tracebacks on win32. Output "unset" instead.

Adjust documentation for 78a0dd93db0b (empty username to force specifying it)

hgwebdir: class hgwebdir should also accept a configparser instance

transplant: test non-local source

transplant: update to current writebundle API

mq: Mention usage of hg add/remove/copy/rename in qrefresh help text.

add pserver support to convert_repo

gitweb: prevent wrapping of "changeset | manifest" links

merge with stable

Abort on empty username so specifying a username can be forced. This behaviour was introduced by c3345b0f2fcd and broken by 98f2507c5551. Added test for this.

Copied files sources were not shown by status -C under Win32. repo.dirstate.copied() takes a normalized paths while local paths were passed.

add test for 540d1059c802

merge with upstream

hgk: remove embedded nulls in descriptions

mq: allow push if -r is given explicitly

Don't use ints in HTTP headers

Enforce unixish style for all generated patch names. User supplied names are left unchanged (including those loaded from series).

Make test-transplant test pull case

Update transplant's merge.update call

Minor test-transplant cleanup

merge with jsmith

use DESTDIR both places its needed

honor DESTDIR env variable for docs' make install

install man pages by default into $(PREFIX)/share/man not $(PREFIX)/man since the FHS puts them there

merge with -stable

bundlerepo: it was meant to be revdiff() instead of chunk()

patchbomb: fix timezone offset in message date header Use mercurial.util instead of time to set and format dates.

fix for digest auth when using keepalive.py The problem was with python > 2.3 which stores part of the headers in unredirected_hdrs. Furthermore, we simplify the code to use httplib directly. fix issue473

Subclass file with a __len__ method instead of setting Content-length This is necessary for the next patch to work with python2.3 Refactor the subclassing of send()

hgweb: add raw template to hgwebdir

Flush stderr after write. stderr can be buffered under win32 when redirected to a file, including stdout.

Merge branchname changes in localrepo.commit.

Use local encoding for "HG: branch" line in commit editor.

Add branch name to editor text.

When committing, record the changeset in the branchcache.

Allow adding symlinks that don't point to files

catch AttributeError in util.checklink There's no symlink function in the os module on windows. Fixes issue468

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