mq: add the date with qrefresh, even if missing (issue1768) When setting the date with qrefresh (-d|-D), and the patch does have neither a 'Date:' nor a '# Date' header, add the date field as such: - if the patch has a 'From:' header, add a 'Date:' header - otherwise, upgrade to Mercurial extended patch format and add '# Date'

mq: upgrade the patch to HG format when adding the author name with qrefresh When setting the author field with qrefresh (-u|-U), and the patch does have neither a 'From:' nor a '# User' header, add the author name as such: - if the patch has a 'Date:' header, add a 'From:' header - otherwise, upgrade to Mercurial extended patch format and add # From

mq: add function to check if a header exists in a patch

mq: fix coding style in qrefresh

Merge with crew-stable.

hook: fix full path imports on Windows (issue1779) Bottom portion fixes full path imports on source installs on Windows. The top portion further fixes full path imports on binary installs. Initial patch by Roman V. Kiseliov

patch: marked string for translation

diffstat: scale adds/removes proportionally to graph width The previous method of scaling had a tendency to include graph lines that went past the output width when the file with the most changes had a very large number of changes.

test-clone-failure: reenable perm to allow deletion

patch: create file even if source is not /dev/null as long as the first hunk is -0,0 and the source and destination have the same name. Matt found a patch like this, and /usr/bin/patch accepts it.

Merge with crew

Fix failing darcs test

Merge with mpm

Merge backout of 26fa0e31011d

Backed out changeset 26fa0e31011d. On OS X, it broke test-issue322, test-issue660, test-permissions, test-symlink-addremove, and test-walk.

mercurial.ini: provide more useful info * Add warning about not editing the site-wide file on Vista * More detail about where to create user Mercurial.ini * Provide examples for ssh tools * List extensions, all disabled * add [patch] section, for fixing patch behavior when using win32text * example [extdiff] section, all disabled * example [diff] section, all disabled

churn: correct output when run in subdirectories

i18n: move unrelated line out of try-except block

i18n: updated outdated comment

merge backout of 5724cd7b3688

Backed out changeset 5724cd7b3688 (depends on other changes, no tests)

merge with crew-stable

dispatch: also pass level argument to __import__ for ignored modules I wanted to check if mercurial.demandimport could speed up the loading of PyObjC, and ran into this: the level argument for __import__, available in Python 2.5 and later, is silently dropped when doing an 'import *'. I have no idea what these arguments mean, but this minor change made it work. (Oh, and because of that 'from ... import *', PyObjC still took about 2s...)

lsprof: make profile not die when imported modules changes (issue1774)