Merge with main

Corrected tests for commit now consistently stripping last newline.

Corrected test for date in output of 'hg export'.

Strip empty lines and trailing spaces around commit messages. Fixes issue213 and part of issue249 (trying to keep node id on import)

Use "# Date" instead of "# Timestamp" for dated export/import of patches. And don't break up list for % formatting.

Add timestamp field to export format. Make import and mq use it.

Merge with crew

Fix hg view if author's name contains unmatched quotes. (issue248) This was caused by the often seen Tcl list vs. string programming error.

notify changeset diff should be against current node instead of tip

fix a typo in an error message

Catch urllib's HTTPException and give a meaningful error message to the user. Usually urllib only throws HTTPError exceptions, which already are a subclass of IOError.

add --config global option. allows to set hgrc option on command line. syntax: --config section.name=value also add new test-globalopts to test all global options in one place.

allow to send email using sendmail. default is still smtp. update hgrc doc with sendmail info.

merge with crew.

add test for revlog.parseindex

Fix revlog.parseindex parseindex could fail if read returns too little data in the right moment (e.g. when there's still leftover data from the previous iteration and read returns less than "s" bytes).

remove non-prefixed environment variables from hooks.

Update debugindexdot to work with RevlogNG.

do not set smtp host by default - raise error instead

win98: fall back to win32api.GetModuleFileName if needed.

On win98 os.path.expanuser('~') does not result in a useable directory. The MSDN recommendation for user specific directories is the use of shell.ShGetSpecialFolder, so use it. For details see: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/functions/shgetspecialfolderpath.asp

deprecate 'update -m'. use 'merge' instead.

merge with crew.

prompt user for http authentication info in interactive mode, mercurial now asks the user for the username and password when the server requires it. the previous behavior was to fail with an http 401. based on patch from eric jaffe <jaffe.eric@gmail.com>.

On Windows look for mercurial.ini in $USERPROFILE, too, if available as os.path.expanduser('~') does not always yield a useful directory. Based on a patch from Edouard Gomez <ed.gomez@free.fr>

merge with crew.

Make hg status work for repositories in root directory on windows (issue 228)

Add more specific documentation about defaults for the [paths] section of the hgrc(5) document.

Update Windows release notes and install script for v0.9

Fix hgweb.filediff The third argument to hgweb.diff should be a list, not a string. This fixes a bug found by xorAxAx, where hgweb would also show the diff for "README" when you ask for the diff for "Demo/cgi/README".