Benoit Boissinot
e13b5a5439
hgweb: separate generation of entries and sorting (cleanup)
2010-03-06 12:45:14 +01:00
Matt Mackall
4ad7bbe193
Added signature for changeset 5de69f546cce
2010-03-05 18:26:13 -06:00
Matt Mackall
84afa4dd8f
mq: drop -Q in favor of --mq only
2010-03-05 17:24:52 -06:00
Sune Foldager
12da123bee
mq: correct test output
2010-03-05 12:27:23 +01:00
Sune Foldager
533ddd28b6
mq: disallow : in patch names (issue2065)
2010-03-05 10:49:56 +01:00
Sune Foldager
868689388b
mq: disallow # (and : on Windows) in patch names (issue2065)
2010-03-04 14:23:54 +01:00
Sune Foldager
2600e9adfd
Merge with stable
2010-03-04 13:11:29 +01:00
Sune Foldager
b18c5efa94
win32/hgwebdir_wsgi: clarify documentation and clean up script a bit
2010-03-04 13:10:48 +01:00
Martin Geisler
44f5ed50bc
Merge with hg-i18n
2010-03-04 10:05:12 +01:00
Jens Bäckman
1ec358519d
i18n-sv: translated bisect, dates, locate, manifest
2010-03-04 07:34:22 +01:00
FUJIWARA Katsunori
bfcf4becb4
i18n-ja: synchronized with 1116f5493f5b
2010-03-04 11:56:53 +09:00
Steve Borho
b62e9661c6
test-fetch: use relative URL to avoid echoing TMP path
2010-03-03 17:37:50 -06:00
Wagner Bruna
45f6e50210
i18n-pt_BR: synchronized with 338a8a6aee57
2010-03-03 18:46:22 -03:00
Sune Foldager
ff514439e6
fetch: fix newheads calculation (issue2047)
2010-03-03 22:32:51 +01:00
Thomas Arendsen Hein
20c8c9dcb9
Make annotate --follow an alias for -f/--file to behave like in older versions
...
Since 461b5218840e annotate follows copies/renames by default, but the output
of e.g. "annotate --follow --number" should not change without some
deprecation time.
2010-03-03 22:04:59 +01:00
Martin Geisler
ef18417e98
win32/hgwebdir_wsgi: clarify copyright license
2010-03-03 20:35:20 +01:00
Adrian Buehlmann
48a03e4f27
store: only add new entries to the fncache file
...
Newly added fncache entries were not added to the in-memory cache,
making it possible for 'hg convert' to cause duplicates in
.hg/store/fncache.
Duplicates in the fncache file are harmless, but excessive numbers
of duplicates from large converted repositories may slow down
execution speed considerably.
2010-03-03 14:50:35 +01:00
Thomas Arendsen Hein
1c68d90cec
Updated test output of test-convert-baz after bfc8a096e3db
2010-03-03 16:00:02 +01:00
Thomas Arendsen Hein
7c30fd48c7
trailing spaces (and one stray tab)
2010-03-03 15:37:41 +01:00
Sune Foldager
c997398f3f
Merge with stable
2010-03-03 14:43:27 +01:00
Sune Foldager
a27039877b
add wsgi script for Microsoft IIS with isapi-wsgi
2010-03-03 14:42:43 +01:00
Martin Geisler
01d542a46d
doc/ja: remove old Japanese man page translations
...
They were added way back in 2005 and haven't been updated since. They
are no longer referenced by the Makefiles at upper levels and have not
been shipped with a recent version of Mercurial.
2010-03-02 21:34:24 +01:00
Martin Geisler
e1bcd68962
Merge with hg-i18n
2010-03-02 20:58:58 +01:00
Jens Bäckman
447526b443
i18n-sv: synchronized with 170c6b9d107d
2010-03-02 18:36:37 +01:00
Yuya Nishihara
56bfdbef10
ui: ignore ui.logtemplate and ui.style when HGPLAIN is set
...
HGPLAIN should suppress them because they change Mercurial's default
output.
2010-03-03 00:12:05 +09:00
Wagner Bruna
5dc625355a
i18n-pt_BR: synchronized with 64ba5d075415
2010-03-02 11:12:14 -03:00
Martin Geisler
549b358caa
Merge with hg-i18n
2010-03-02 10:40:58 +01:00
FUJIWARA Katsunori
cc8621fa83
i18n-ja: synchronized with 96246e32ac3b
2010-03-02 12:41:27 +09:00
Martin Geisler
994df41a91
Merge with hg-i18n
2010-03-01 22:47:39 +01:00
Martin Geisler
2fb134d88e
tests: update output to match 64ba5d075415
2010-03-01 22:44:02 +01:00
Yuya Nishihara
c01490d7d8
alias: fixes exception when displaying translated help text
...
__doc__ of aliased command shouldn't cointain non-ASCII characters,
because it'll be gettext-ed later by commands.help_().
Here gettext can raise UnicodeDecodeError.
Once concatenated two translatable strings into one, it become untranslatable.
So this patch moves 'alias for:' from dispatch.cmdalias to commands.help_,
where help texts are translated.
'alias for:' was introduced by 027d5c280eda.
2010-03-01 23:27:44 +09:00
Pierre-Yves David
31bf517562
Add ElementPath to the list of package ignored by demand import
...
The bzrlib try to import the ElementPath module but had a fallback in
case the import fails. Lazy import of this module leads to later
failure.
The bzrlib is used by the convert extension.
2010-03-01 14:15:55 +01:00
Greg Ward
64f2447d13
resolve: rewrite help to be clearer and more complete (issue2030).
2010-03-01 15:41:21 -05:00
Benoit Boissinot
10dba63dce
mq: simplify --mq handling / keep compatibility with other extensions
...
reported by edgimar on IRC
2010-02-28 19:43:21 +01:00
Jens Bäckman
ba252dea2d
i18n-sv: synchronized with 20e5f8487cfd
2010-02-28 19:37:56 +01:00
Martin Geisler
5dbbbe736d
i18n-da: synchronized with e86c38fe4dba
2010-02-28 18:02:20 +01:00
Wagner Bruna
7733a703e9
doc/Makefile: fix doc generation when LANGUAGE is set
2010-02-24 13:47:59 -03:00
FUJIWARA Katsunori
fb7e7adf34
i18n-ja: synchronized with a054f7aff497
2010-02-27 19:58:59 +09:00
Wagner Bruna
6504414ca1
i18n-pt_BR: synchronized with 8f2084702b36
2010-02-26 19:28:23 -03:00
Adrian Buehlmann
5c235b09fe
contrib/wix: add COPYING.rtf
...
Moving the file from the misc directory of the thg-winbuild repo, which
uses mercurial's contrib/wix.
This file is displayed by the install UI sequence, so it belongs to the
WiX sources quite closely.
It happens to be installed by the msi installer, too.
2010-02-25 14:56:09 +01:00
Benoit Boissinot
e58438a035
fix test-mq-eol under --pure (mimic diffhelper.c behaviour)
...
bug discovered by apycot (apycot.hg-scm.org)
2010-02-26 16:52:43 +01:00
Manpreet Singh
92eb9e2c61
Updated contrib/vim/patchreview.* to version 0.2.2
...
- Security fixes by removing custom tempfile creation
- Removed need for DiffReviewCleanup/PatchReviewCleanup
- Better command execution error detection and display
- Improved diff view and folding by ignoring modelines
- Improved tab labels display
2010-02-24 19:43:13 -08:00
Martin Geisler
e9b7631608
Merge with hg-i18n
2010-02-25 17:06:32 +01:00
Jens Bäckman
c7ed838c27
i18n-sv: synchronized with b887f00cd6fc
2010-02-24 19:47:51 +01:00
Martin Geisler
b7c229f7fa
url: only mark format string for translation
2010-02-24 17:11:37 +01:00
Martin Geisler
502687dbad
Merge with hg-i18n
2010-02-24 09:26:31 +01:00
Martin Geisler
cc9b21b6ae
i18n-da: fixed typo
2010-02-24 09:25:55 +01:00
FUJIWARA Katsunori
0e42bb17be
i18n-ja: synchronized with cf514fa1ab9d
2010-02-24 15:02:06 +09:00
Patrick Mezard
297d72a71e
url: avoid traceback when parsing [auth] (issue2056)
2010-02-23 22:31:54 +01:00
Patrick Mezard
c5a46629ec
filemerge: use native path separators when merging (issue1399)
2010-02-23 23:19:09 +01:00
