Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 23 Nov 2009 23:04:44 +0100] rev 9914
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 23 Nov 2009 22:45:36 +0100] rev 9913
run-tests: always set $COLUMNS, fix running tests under emacs shell
fix tests failure reported by Neal Becker.
Patrick Mezard <pmezard@gmail.com> [Mon, 23 Nov 2009 22:46:48 +0100] rev 9912
Merge with crew-stable
Pascal Quantin <pascal.quantin@gmail.com> [Mon, 23 Nov 2009 22:08:59 +0100] rev 9911
Add help files to win32 installer (issue 1919)
Sune Foldager <cryo@cyanite.org> [Mon, 23 Nov 2009 11:03:55 +0100] rev 9910
hgweb: add support for extension-provided permission hooks
This allows extensions to hook into permission checking, providing both
authentication and authorization as needed. The existing authorization
function has been changed to a hook, which is added by default.
Matt Mackall <mpm@selenic.com> [Sun, 22 Nov 2009 15:36:22 -0600] rev 9909
Merge with i18n
Martin Geisler <mg@lazybytes.net> [Sun, 22 Nov 2009 21:34:12 +0100] rev 9908
i18n-da: synchronized with
b5170b8b32a5
Jens Bäckman <jens.backman@gmail.com> [Sun, 22 Nov 2009 19:37:19 +0100] rev 9907
i18n-sv: translated seven commands
These commands has been translated:
addremove, archive, backout, config, unbundle, verify, version
Jens Bäckman <jens.backman@gmail.com> [Sun, 22 Nov 2009 19:12:39 +0100] rev 9906
i18n-sv: synchronized with
b5170b8b32a5
Patrick Mezard <pmezard@gmail.com> [Sun, 22 Nov 2009 19:11:12 +0100] rev 9905
run-tests: work around a distutils bug triggered by
0a8a43b4ca75
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 22 Nov 2009 11:27:29 +0100] rev 9904
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 22 Nov 2009 11:25:01 +0100] rev 9903
Do not overwrite motd attribute of hgwebdir instances on refresh.
This allows using
application = hgwebdir(...)
application.motd = (string or object with __str__ method)
in WSGI (like it is possible in CGI).
Changed web.motd in the config file is still read with this, because
hgwebdir.templater.motd() does not store the config value.
Martin Geisler <mg@lazybytes.net> [Sun, 22 Nov 2009 11:19:07 +0100] rev 9902
Merge with stable
Henri Wiechers <hwiechers@gmail.com> [Fri, 20 Nov 2009 14:11:05 +0200] rev 9901
commands: minor refactoring
Renamed local variable i to entry in helpcmd.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 19 Nov 2009 11:06:01 +0900] rev 9900
inotify: improve error messages
* prefix messages by inotify-(client|server)
* make sure that all warning and abort messages use the same format.
* in the case where inotify.sock is an old broken symlink, say so and abort
instead of trying to overwrite the already existing link
Greg Ward <greg@gerg.ca> [Wed, 18 Nov 2009 22:23:11 -0500] rev 9899
run-tests: give each child its own tmp dir (
issue1911)
Fixes bug introduced by
f8b4df4b033d (
issue1911: --tmpdir plus parallel
mode = fail), and also fixes the long-standing quirk that parallel mode
created multiple /tmp/hgtests.XXXXXX directories. Now there is only one
/tmp/hgtests.XXXXXX, with child0, child1, etc. under it.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 20 Nov 2009 02:34:56 +0100] rev 9898
merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 17 Nov 2009 15:36:09 +0900] rev 9897
inotify: add a inotify.pidfile configuration possibility
This will mainly help us in our tests to log pids of inotify servers
started implicitely, to make sure that unkilled inotify daemons do not clutter
the output of unrelated tests.
Also desactivate the workaround introduced in
951ec6c7d703
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 17 Nov 2009 15:00:00 +0900] rev 9896
cmdutil.service: do not _exit(0) in the parent process
The fact that a parent process spawns a daemon does not necessarily means that
it is the only think it has to do. This was forcing since
7c01599dd340 inotify
processes launched implicitely to exit prematurely:
when no inotify server was running, "hg st" for example would only launch a
inotify server, _exit(0) and thus would not return file statuses.
This changeset adds a test for implicitely launched inotify processes.
Change to output of test-inotify-1208 is correct: it reflects the normal
error message of "hg st" when not dying during "hg inserve" daemon creation.
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 23:39:30 +0100] rev 9895
Merge with stable
Faheem Mitha <faheem@email.unc.edu> [Thu, 19 Nov 2009 17:33:41 -0500] rev 9894
commands: improve help for "hg clone -r"
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 23:29:02 +0100] rev 9893
commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 23:27:11 +0100] rev 9892
commands: use field lists instead of literal blocks in docstrings
The literal blocks were mis-used for alignment, but this of course
changes the font of the entire block to a fixed width font in the HTML
version. Using a proper list solves this.
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 22:25:38 +0100] rev 9891
commands: do not indent list in clone help string