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
Simon Heimberg <simohe@besonet.ch> [Sun, 16 Feb 2014 23:41:24 +0100] rev 1348
run-tests: fixed warn detection on failures with too many output
The state "warned" was reported too often. The problem fixed here is that
warnonly was only reset when a line did not match. When there was a line too
much, warnonly remained set.
Fix this by setting more states to warnonly.
More negative testing (testing on result "Failed") has been done this time.
[ original upstream message ]
Simon Heimberg <simohe@besonet.ch> [Sun, 16 Feb 2014 23:36:02 +0100] rev 1347
run-tests: fixed warn detection on detecting warn only for lines
The state "warned" was reported too often. The main problem was that
"False == 0" is true in python. Therefore use an empty string instead of 0
for reporting warn only for a line.
The other problem is fixed in the next patch.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sun, 02 Mar 2014 13:51:01 +0000] rev 1346
Merge with default
Christian Ebert <blacktrash@gmx.net> [Tue, 25 Feb 2014 11:11:46 +0000] rev 1345
test can be run without option now
As per c559280de767
Christian Ebert <blacktrash@gmx.net> [Mon, 24 Feb 2014 22:56:19 +0000] rev 1344
Merge with stable
Siddharth Agarwal <sid0@fb.com> [Wed, 19 Feb 2014 21:32:14 -0800] rev 1343
run-tests.py: work when --with-hg is set to system hg
Previously we'd always assume that --with-hg is a script in a user directory,
and would write out a 'python' symlink to the same location. That didn't work
if --with-hg was set to a system installation of hg, e.g. /usr/bin/hg.
Introduce a TMPBINDIR directory which is used to write out the python symlink.
[ original upstream message ]