merge with crew-stable

hgwebdir: try to get web.style and web.motd from the ui.config system This finishes fixing issue253. As a bonus, web.style and web.motd settings from ~/.hgrc will be used for the hgwebdir index page.

Pass a ui from create_server to hgwebdir and a repo from hgwebdir to hgweb This allows repo pages to respect hg serve --webdir-conf <file> --style=gitweb (part of issue253). Since we're creating a ui object anyway, use it as the parentui of the ui objects created for every repo entry. This has the unintended side-effect that --name=foo on the command line will set the name of all repos. If one of the repos being served has a .hg/hgrc owned by a user that is not trusted, hg will now print the "Not trusting file..." warning when reading it. This is consistent with the behaviour from a hg serve from inside the repo.

hg serve: call setconfig on the parentui It makes sense to do this on the "global" ui object, since command line options should affect the whole process. This should fix hg serve --style=gitweb inside a repo (part of issue253).

Prevent type exception on concatenation if diffstat returns None. This will most often occur if diffstat is not installed in the target platform, though may also happen in other cases where diffstat fails to execute. Signed-off-by: Sean Dague <sean@dague.net>

Switch CGI stdout to binary on windows Problem diagnosed by Andrei Vermel.

Fix dirstate fail at drive root on Windows

Try to pass repo.ui to reposetup hooks The ui object we received in this function may belong to another repo, which could be confusing from the hook point of view. Trying to use the ui object from the newly created repo should avoid this confusion.

BeOS compatibility support

transplant: remote bundle source was not closed before deleting the fetched bundle. It fails under win32 because "normal" opened files cannot be removed.

mq: qinit -c creates a repo even after a regular qinit

Handle functions as the value of a hooks.<name> config variable This should make it easier for extensions to add a hook when they're loaded.

allow values that aren't strings in util.configparser

Merge with stable

Fix wrong module reference in copyfile exception

setup.py: reload __version__.py after writing it. write_version loads __version__.py before writing it (see 7eb694a1c1af), so we have to explicitly reload it to use the correct version. Problem diagnosed by Christian Ebert.

fix strip'ping the second parent of a merge

install reposetup hook right after loading the extension

Open bundle files in binary mode

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.