Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 30 Apr 2010 18:11:56 +0200] rev 11053
dispatch: don't mangle ImportError abort messages
Previously, Mercurial assumed that the last word of the string
representation was the name of the moduled that was imported. This
assmption is incorrect, despite being true for the common case of an
exception raised by the Python VM.
For example, hgsubversion raises an ImportError with a helpful message
if the Subversion bindings were not found. The final word of this
message is not meaningful on its own, and is never the name of a
module.
This patch changes the output printed to be a simple stringification
of the exception instance. In most cases, this will be `abort: No
module named X!' rather than `abort: could not import module X!'.
No functionality change; all tests pass.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 01 May 2010 14:36:48 +0200] rev 11052
relink/progress: correctly handle the no file to relink case
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 22:14:14 -0500] rev 11051
Merge with stable
Yuya Nishihara <yuya@tcha.org> [Wed, 07 Apr 2010 00:45:20 +0900] rev 11050
commands: refactor diff --stat and qdiff --stat
`opts['unified'] = '0'` can be replaced by `diffopts.context = 0`.
Yuya Nishihara <yuya@tcha.org> [Wed, 07 Apr 2010 00:10:54 +0900] rev 11049
mq: fix opts['unified'] = '0' to take effect when qdiff --stat
`opts['unified'] = '0'` tries to reduce the number of lines to be
processed by patch.diffstat, but here it does not affect diffopts,
thus it does not make sense.
Instead, we can change `diffopts.context` directly.
Added test case for qdiff --stat.
Mads Kiilerich <mads@kiilerich.com> [Mon, 26 Apr 2010 15:32:23 +0200] rev 11048
showconfig: show rc paths with --debug
Eric Eisner <ede@mit.edu> [Mon, 26 Apr 2010 15:58:36 -0400] rev 11047
tags: return tags in sorted order
This makes log and summary have less arbitrary tag ordering and also
groups similar tags together, such as the mq tags.
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 04:01:13 +0200] rev 11046
keyword: test recording
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 04:01:07 +0200] rev 11045
keyword: support (q)record
Monkeypatch hgext.dorecord to trigger keyword expansion.
Read data from working directory, not from filelog.
Prevent keyword expansion from within record's commitfunc,
thereby fixing a bug/inconsistency where files which are clean
after recording were overwritten twice.
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 03:54:18 +0200] rev 11044
keyword: remove mq commands from restricted list
Monkeypatching patch.diff takes care of this since
911f5be5d159.
Test mq more thoroughly by loosening [keywordmaps] and comparing
the output of hg cat with keyword expansion enabled and disabled.
Elifarley Callado Coelho Cruz <elifarley@gmail.com> [Wed, 28 Apr 2010 11:10:58 -0300] rev 11043
acl: add tests for asterisk and for OS-level groups
Elifarley Callado Coelho Cruz <elifarley@gmail.com> [Tue, 27 Apr 2010 19:02:11 -0300] rev 11042
acl: updated doc string to reflect recent changes
Elifarley Callado Coelho Cruz <elifarley@gmail.com> [Mon, 26 Apr 2010 10:55:57 -0300] rev 11041
acl: add support for OS-level groups using @group syntax
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 22:04:05 -0500] rev 11040
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 18:25:45 -0500] rev 11039
run-tests: sort options
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 18:25:45 -0500] rev 11038
run-tests: add -l short option for --local
Martin Geisler <mg@lazybytes.net> [Thu, 29 Apr 2010 23:47:07 +0200] rev 11037
Merge with main
Henrik Stuart <hg@hstuart.dk> [Wed, 28 Apr 2010 21:00:07 +0200] rev 11036
ui: fix check-code error
Michael Glassford <glassfordmjg@gmail.com> [Thu, 08 Apr 2010 11:00:46 -0400] rev 11035
schemes: fix // breakage with Python 2.6.5 (
issue2111)
Recent Pythons (e.g. 2.6.5 and 3.1) introduce a change that causes
urlparse.urlunparse(urlparse.urlparse('x://')) to return 'x:' instead of 'x://'i and
urlparse.urlunparse(urlparse.urlparse('x:///y')) to return 'x:/y' instead of 'x:///y'.
Fix url.hidepassword() and url.removeauth() to handle these cases.
Dan Connolly <http://www.w3.org/People/Connolly/> [Wed, 28 Apr 2010 13:36:06 -0500] rev 11034
log: document the new xml style
Matt Mackall <mpm@selenic.com> [Wed, 28 Apr 2010 13:46:38 -0500] rev 11033
Merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 28 Apr 2010 13:45:57 -0500] rev 11032
Merge with i18n
Matt Mackall <mpm@selenic.com> [Wed, 28 Apr 2010 13:45:21 -0500] rev 11031
Merge with i18n
Wagner Bruna <wbruna@yahoo.com> [Sat, 24 Apr 2010 01:41:32 -0300] rev 11030
merge with i18n stable
Wagner Bruna <wbruna@yahoo.com> [Sat, 24 Apr 2010 01:37:49 -0300] rev 11029
merge with i18n
Wagner Bruna <wbruna@yahoo.com> [Sat, 24 Apr 2010 01:30:24 -0300] rev 11028
i18n-pt_BR: synchronized with
ede19417c3c4
Wagner Bruna <wbruna@yahoo.com> [Sat, 24 Apr 2010 01:34:55 -0300] rev 11027
merge with i18n stable
Jens Bäckman <jens.backman@gmail.com> [Mon, 19 Apr 2010 19:50:04 +0200] rev 11026
i18n-sv: synchronized with latest development code
Jens Bäckman <jens.backman@gmail.com> [Mon, 19 Apr 2010 18:59:02 +0200] rev 11025
Merge with stable
Jens Bäckman <jens.backman@gmail.com> [Mon, 19 Apr 2010 18:57:16 +0200] rev 11024
i18n-sv: translated a few messages