run-tests: always set $COLUMNS, fix running tests under emacs shell fix tests failure reported by Neal Becker.

Merge with crew-stable

Add help files to win32 installer (issue 1919)

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.

Merge with i18n

i18n-da: synchronized with b5170b8b32a5

i18n-sv: translated seven commands These commands has been translated: addremove, archive, backout, config, unbundle, verify, version

i18n-sv: synchronized with b5170b8b32a5

run-tests: work around a distutils bug triggered by 0a8a43b4ca75

merge with crew-stable

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.

Merge with stable

commands: minor refactoring Renamed local variable i to entry in helpcmd.

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

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.

merge with stable

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

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.

Merge with stable

commands: improve help for "hg clone -r"

commands, dates: use real lists instead of literal blocks

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.

commands: do not indent list in clone help string

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.

test-non-interactive-wsgi: make output deterministic

hgweb: fix error in 38170eeed18c and introduce test for change

ui: add environ property to access os.environ or wsgirequest.environ The property returns os.environ by default, and is propagated by ui.copy. During hgweb processing, ui.environ is set to the proper WSGI-request environment, as contained in wsgirequest.environ. For CGI, this is the same as os.environ. The property is meant to be read-only, as with os.environ (generally).

relink: wrap long lines in docstring

test-convert-filemap: test improved filtering algorithm

convert: make filemap favor most specific filtering rule A filemap like: exclude "doc" include "doc/foo.txt" will now preserve doc/foo.txt and exclude everything else in doc/.

run-tests: set --home when building with distutils If home was set in ~/.pydistutils.cfg, the tests could not run. This overrides any home setting by supplying --home="" on the command line.

gitweb: add a latest link to the gitweb style

httprepo: suppress the `real URL is...' message in safe, common cases. When the actual and requested URL only differ by trailing slashes, there is no need to warn. As an example, this easily happens when accessing repositories on Bitbucket over HTTP(S). As far as I could tell, there were no existing tests for this behaviour.

merge with crew-stable

Extend test-branchmap to test c51494c53841 (encoding fallback in branchmap to maintain compatibility with 1.3.x)

branchmap: fix defective fallback fix 0262bb59016f The fix applied as 0262bb59016f doesn't work and is essentially a no-op. This fix also adds a comment about the nature of the problem, and a test.

Merge with stable

alias: improve help text for command aliases Displays the line "alias for: hg ..." with the original command including options, followed by the command's original help text.

dispatch: minor refactoring Renamed local variable i to entry in _dispatch.

qseries: don't truncate the patch name (issue1912) Instead of truncating the entire output line of `qseries', only the summary is truncated.

summary: note non-default branches with -q

Add stable branch

Added signature for changeset 31ec469f9b55

Added tag 1.4 for changeset 31ec469f9b55

i18n-ja: fixed bad indentation

Merge with crew

Allow import --no-commit over an applied MQ patch. Since it only changes the working directory, it does not matter whether a patch is applied. This change makes it easier to use hg import --no-commit instead of patch.

Merge with i18n

i18n-pt_BR: synchronized with crew 9c43089b372a

i18n-de: messages for 9e7b2c49d25d and translation of patchbomb

i18n-pt_BR: messages for 9e7b2c49d25d and cleanup

i18n-ja: synchronized with 004bf1d6e6af

support encoding fallback in branchmap to maintain compatibility with 1.3.x

convert/svn: fix warning when repo detection failed

inotify: workaround test-inotify-dirty-dirstate failures - disable inotify during clone - record inotify daemon PID, in order to have them properly killed

lock: the correct way to do a trylock() is to use a timeout of 0

diff: change --inverse to --reverse This fixes an incompatibility with patch(1), which also uses --reverse for reversed diffs. The --inverse flag was added in 3f522d2fa633. That name was chosen over --reverse since it was thought that --reverse would make --rev ambiguous. It turns out that both flags can co-exist, with the cost that --rev can no longer be shortened to --r and --re. Since one can always use the short -r option, this is not a real problem.

setup: pass LD_LIBRARY_PATH to subprocess when determining version.

inotify: Do not access inotify when dirstate is dirty (issue1811) Original patch was provided by Simon Heimberg It delegates dirstate computation to dirstate.status when dirstate is dirty: better be slow from time to time instead of using wrong data. This solves issue1719. As the last component, issue1810, is still not solved, test-inotify-dirty-dirstate will fail for now. It emphasizes a regression due to 7c01599dd340: changeset: 9515:7c01599dd340 user: Nicolas Dumazet <nicdumz.commits@gmail.com> date: Sun Aug 16 11:11:37 2009 +0900 summary: inotify: use cmdutil.service instead of local daemonizing code Ancestors of 7c01599dd30 are passing the test, when applied this patch. Regression has to be investigated, but this patch is important since it affects often mq operations.

inotify: mark directories visited during lookup (issue1844) Emulate the match.dir calls that are made in dirstate.walk: * first mark the visited directories on the server side * then extend the transmitted response to include this directory list * and lastly call match.dir on each directory