Christian Ebert <blacktrash@gmx.net> [Thu, 20 Mar 2014 01:02:04 +0000] rev 1360
Merge with stable
Augie Fackler <raf@durin42.com> [Mon, 10 Mar 2014 17:52:42 -0400] rev 1359
killdaemons: drop superfluous L suffix from constant
As far as I'm aware PEP 237[0] means this suffix is superfluous even
on Python 2.4, and we can just drop it, which makes this code happy on
Python 3.
0: http://legacy.python.org/dev/peps/pep-0237/
[ original upstream message ]
Mads Kiilerich <madski@unity3d.com> [Wed, 19 Mar 2014 00:19:54 +0100] rev 1358
tests: small refactoring of run-tests' handling of tests list
[ original upstream message ]
Mads Kiilerich <madski@unity3d.com> [Wed, 19 Mar 2014 02:45:14 +0100] rev 1357
config: set a 'source' in most cases where config don't come from file but code
Some extensions set configuration settings that showed up in 'hg showconfig
--debug' with 'none' as source. That was confusing.
Instead, they will now tell which extension they come from.
This change tries to be consistent and specify a source everywhere - also where
it perhaps is less relevant.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Thu, 13 Mar 2014 11:19:32 +0000] rev 1356
Merge with stable
Augie Fackler <raf@durin42.com> [Wed, 12 Mar 2014 13:19:43 -0400] rev 1355
run-tests: move from dict() construction to {} literals
The latter are both faster and more consistent across Python 2 and 3.
[ original upstream message ]
Matt Mackall <mpm@selenic.com> [Sat, 08 Mar 2014 17:38:50 -0600] rev 1354
templating: make -T much more flexible
It can now accept styles and paths and references to settings in
[templates].
[ original upstream message ]
Matt Mackall <mpm@selenic.com> [Sat, 08 Mar 2014 16:14:08 -0600] rev 1353
changeset_templater: remove use_template method
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 04 Mar 2014 17:24:44 +0000] rev 1352
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 04 Mar 2014 09:56:59 -0600] rev 1351
tests: fix unused imports from inotify removal caught by pyflakes
[ original upstream message ]
Matt Mackall <mpm@selenic.com> [Sat, 01 Mar 2014 16:20:15 -0600] rev 1350
extensions: remove the inotify extension (BC)
This extension has always had correctness issues and has been
unmaintained for years. It is now removed in favor of the third-party
hgwatchman which is maintained and appears to be correct.
Users with inotify enabled in their config files will fall back to
standard status performance.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sun, 02 Mar 2014 13:53:07 +0000] rev 1349
Merge with stable