cached data was wrong: rev is different from self.rev(node) in bundlerepo.py

Merge with crew

Allow 'hg serve --webdir-conf foo' to be run outside a repository.

Use <link> tag instead if CDATA import for CSS stylesheets. Fixes issue200.

Use string literal concatenation for optlist and import -p option

Cleaned trailing whitespace in hgweb.py, removed command line shortcut for webdir-conf.

Fixed path handling of the standalone server, fixed typo.

Added hgwebdir support to hg serve.

Added threading support to hg serve.

Added my name to the contributors list.

Cleaned hgweb.py a little bit

merge with crew.

fix issue 217. fall back to fixed path if windows >= nt function not present.

Merge with upstream

Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails

update tests after changing archival code. test-archive now contains tests for archive command.

make hgweb use new archival module. also use "x-gzip" encoding for ".tar.gz" files, so mozilla and firefox will not transparently decompress stream and save with wrong name.

add "archive" command, like "cvs export" only better. most code in mercurial/archival.py module, for sharing with hgweb.

Merge with crew

Add a pure python version of run-tests. If this works well for most people, it should replace the shell version of run-test.

Revert push new heads logic This breaks push -r's new head detection but fixes the common case. For now we'll assume that someone doing push -r knows what they're doing.

Move empty local repo logic for pull into findincoming This fixes a silly attempt to pull a changegroup from an empty repo.

Don't die calling outgoing hook if we have no changesets

Merge with crew

Merge with cmason

Add tests/test-committer This checks to see if the EMAIL environment variable is being used for commit.

Use application/octet-stream as the content-type of unknown binary files

remove appendfile data as soon as not needed.

Make bundlerepo use proper index format for revlogng bundlerepo just appends index entries from the bundle onto the index for the current repo. This patch makes sure it appends the correct format.

Merge with crew

Merge with cmason

Remove bogus raise from localrepo.lookup()

Fix hg qdiff <file>

Ignore EPIPE in pipefilter This hides the following traceback (there's a race condition involved, so you may have to try a few times to hit it): $ hg sign --key key-that-does-not-exist Signing 2062:4bad92f4ea65 gpg: skipped "key-that-does-not-exist": secret key not available gpg: signing failed: secret key not available Exception in thread Thread-1: Traceback (most recent call last): File "threading.py", line 442, in __bootstrap self.run() File "threading.py", line 422, in run self.__target(*self.__args, **self.__kwargs) File "mercurial/util.py", line 24, in writer pin.close() IOError: [Errno 32] Broken pipe abort: Error while signing

Don't send "Content-Type: none" mimetypes.guess_type will return (None, None) when it can't detect the filetype.

Fix filerevision-raw.tmpl Two bugs: - conteXt-type instead of conteNt-type - trailing newline The easiest way to fix the second one (and keep it fixed) is to put everything inline in map-raw.

convert-repo: fix reversed time zone offset

catch SIGBREAK on windows.

update windows readme to document msys/mingw rxvt problems.

fix util.canonpath on windows. old test for absolute path was not portable. use os.path api instead.

make appendfile simpler so it does not break with revlogng on windows. it used to cache open files. this made revlogng break because it wants to rename files when splitting .i into .i/.d, but cannot rename or unlink open files on windows. new code is bit slower, but safe on linux and windows. proper fix for too many open/close of changelog/manifest belongs in different place. can get 10% speed improvement back.

Exit test-hup only after the background process has died. Otherwise the open file might let the tests fail on NFS.

merge with mainline.

mq: do not fail if directory to create exists

merge revlogng with mpm tip

Fix transaction handling during interleaved file split.

merge 0.8.1 with revlogng

Additional appendfile fixes for interleaved data/index files The appendfile code was not passing default version info to the changelog or manifest classes, and so they were always being created as version 0. revlog.checkinlinesize had to be corrected to seek to the end of the index file when no index file was passed (only clone does this)