Brendan Cully <brendan@kublai.com> [Wed, 05 Aug 2009 22:52:35 -0700] rev 9324
Merge backout of 26fa0e31011d
Brendan Cully <brendan@kublai.com> [Wed, 05 Aug 2009 22:51:30 -0700] rev 9323
Backed out changeset 26fa0e31011d.
On OS X, it broke test-issue322, test-issue660, test-permissions,
test-symlink-addremove, and test-walk.
Steve Borho <steve@borho.org> [Mon, 03 Aug 2009 23:27:25 -0500] rev 9322
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
Brendan Cully <brendan@kublai.com> [Wed, 05 Aug 2009 17:17:06 -0700] rev 9321
churn: correct output when run in subdirectories
Martin Geisler <mg@lazybytes.net> [Thu, 06 Aug 2009 00:34:28 +0200] rev 9320
i18n: move unrelated line out of try-except block
Martin Geisler <mg@lazybytes.net> [Thu, 06 Aug 2009 00:26:34 +0200] rev 9319
i18n: updated outdated comment
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 05 Aug 2009 16:32:57 +0200] rev 9318
merge backout of 5724cd7b3688
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 05 Aug 2009 16:32:38 +0200] rev 9317
Backed out changeset 5724cd7b3688 (depends on other changes, no tests)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 05 Aug 2009 17:21:29 +0200] rev 9316
merge with crew-stable
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 05 Aug 2009 17:19:37 +0200] rev 9315
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...)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 05 Aug 2009 14:58:30 +0200] rev 9314
lsprof: make profile not die when imported modules changes (issue1774)
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:19:08 +0200] rev 9313
notify: do not mime encode multipart templates
Mulitpart templates should take care of this themselves.
See http://www.selenic.com/pipermail/mercurial/2009-July/027017.html
Also catch potential parsing errors gracefully.