Stefan Simek <simek@triaxis.sk> [Tue, 10 Nov 2009 13:04:03 +0100] rev 9884
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/.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 17 Nov 2009 13:24:58 +0100] rev 9883
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.
Zhigang Wang <w1z2g3@gmail.com> [Wed, 18 Nov 2009 20:14:17 +0100] rev 9882
gitweb: add a latest link to the gitweb style
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 18 Nov 2009 12:47:58 +0100] rev 9881
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.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Nov 2009 17:09:00 +0100] rev 9880
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Nov 2009 16:47:20 +0100] rev 9879
Extend test-branchmap to test
c51494c53841
(encoding fallback in branchmap to maintain compatibility with 1.3.x)
Sune Foldager <cryo@cyanite.org> [Wed, 18 Nov 2009 15:20:08 +0100] rev 9878
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.
Martin Geisler <mg@lazybytes.net> [Wed, 18 Nov 2009 00:19:42 +0100] rev 9877
Merge with stable
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 11 Nov 2009 17:48:00 +0100] rev 9876
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.
Henri Wiechers <hwiechers@gmail.com> [Fri, 13 Nov 2009 16:38:27 +0200] rev 9875
dispatch: minor refactoring
Renamed local variable i to entry in _dispatch.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 17 Nov 2009 22:16:41 +0100] rev 9874
qseries: don't truncate the patch name (
issue1912)
Instead of truncating the entire output line of `qseries', only the
summary is truncated.
Matt Mackall <mpm@selenic.com> [Tue, 17 Nov 2009 16:23:05 -0600] rev 9873
summary: note non-default branches with -q
Matt Mackall <mpm@selenic.com> [Tue, 17 Nov 2009 16:22:17 -0600] rev 9872
Add stable branch
Matt Mackall <mpm@selenic.com> [Mon, 16 Nov 2009 14:50:30 -0600] rev 9871
Added signature for changeset
31ec469f9b55
Matt Mackall <mpm@selenic.com> [Mon, 16 Nov 2009 14:50:24 -0600] rev 9870
Added tag 1.4 for changeset
31ec469f9b55
Martin Geisler <mg@lazybytes.net> [Mon, 16 Nov 2009 21:25:36 +0100] rev 9869
i18n-ja: fixed bad indentation
Matt Mackall <mpm@selenic.com> [Mon, 16 Nov 2009 13:52:53 -0600] rev 9868
Merge with crew
Brendan Cully <brendan@kublai.com> [Mon, 16 Nov 2009 11:31:08 -0800] rev 9867
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.
Matt Mackall <mpm@selenic.com> [Mon, 16 Nov 2009 12:51:00 -0600] rev 9866
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 16 Nov 2009 14:37:31 -0200] rev 9865
i18n-pt_BR: synchronized with crew
9c43089b372a
Fabian Kreutz <fabian.kreutz@starnet.fi> [Mon, 16 Nov 2009 09:58:45 +0200] rev 9864
i18n-de: messages for
9e7b2c49d25d and translation of patchbomb
Wagner Bruna <wbruna@yahoo.com> [Sun, 15 Nov 2009 21:57:02 -0200] rev 9863
i18n-pt_BR: messages for
9e7b2c49d25d and cleanup
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 13 Nov 2009 14:30:57 +0900] rev 9862
i18n-ja: synchronized with
004bf1d6e6af
Henrik Stuart <henrik.stuart@edlund.dk> [Mon, 16 Nov 2009 13:35:36 +0100] rev 9861
support encoding fallback in branchmap to maintain compatibility with 1.3.x
Patrick Mezard <pmezard@gmail.com> [Mon, 16 Nov 2009 14:09:31 +0100] rev 9860
convert/svn: fix warning when repo detection failed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Nov 2009 11:58:03 +0100] rev 9859
inotify: workaround test-inotify-dirty-dirstate failures
- disable inotify during clone
- record inotify daemon PID, in order to have them properly killed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Nov 2009 11:55:29 +0100] rev 9858
lock: the correct way to do a trylock() is to use a timeout of 0
Martin Geisler <mg@lazybytes.net> [Sat, 14 Nov 2009 14:21:53 +0100] rev 9857
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.
Christian Boos <cboos@bct-technology.com> [Mon, 09 Nov 2009 17:41:21 +0100] rev 9856
setup: pass LD_LIBRARY_PATH to subprocess when determining version.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 11 Nov 2009 14:38:59 +0900] rev 9855
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.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 13 Nov 2009 08:31:10 +0900] rev 9854
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
Henrik Stuart <hg@hstuart.dk> [Fri, 13 Nov 2009 06:36:26 +0100] rev 9853
Merge with crew-stable