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
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
Sune Foldager
272ea1e4f1
hgweb: use string join instead of slower cStringIO
2010-02-23 11:37:40 -05:00
Sune Foldager
b4bd699e4d
hgweb: fix handling of arguments in the between command
...
The 'pairs' argument was coded to be optional, but the code would
crash if it was not provided.
2010-02-23 11:34:08 -05:00
Wagner Bruna
499f351140
i18n-pt_BR: synchronized with 2d2302665cf5, minor fixes
2010-02-23 12:51:07 -03:00
Brendan Cully
da58a67a13
hgcia: report RPC errors
2010-02-22 23:30:01 -08:00
timeless
f739d87132
commands: correct diff -c explanation
2010-02-23 06:42:10 +01:00
Sune Foldager
320624e3e5
httprepo: send Content-Type instead of content-type
2010-02-22 23:12:12 -05:00
Sune Foldager
7964a5e927
httprepo: use content-type application/mercurial-0.1 for POST
...
Previously, application/octet-stream was used. The content-type is
currently ignored by the server.
2010-02-22 16:28:57 +01:00
Patrick Mezard
dede247fea
patch: fix patching with fuzz and eol normalization
2010-02-22 22:55:58 +01:00
Benoit Boissinot
c967347014
strip: invalidate all caches after stripping (fixes issue1951)
...
test thanks to Stefano Tortarolo
2010-02-21 20:59:27 +01:00
Benoit Boissinot
1c71747d8e
fix test output changed by 9bf9be28a923
2010-02-25 14:35:21 +01:00
Manpreet Singh
712fecc765
Updated contrib/vim/patchreview.* to version 0.2.1
...
1) adds a :DiffReview command to review code changes
in the current workspace.
2) removes the need to have patchutils (specifically filterdiff)
installed on the system by implementing patch extraction in
pure vim script.
2010-02-24 13:12:17 -08:00
Sune Foldager
155fe1239e
httprepo: normalize output from unbundle with ssh
...
Lines from the remote are prefixed with 'remote: ' and written
locally using ui.status, similar to what sshrepo does.
2010-02-24 12:35:26 -05:00
Benoit Boissinot
6ee31acb8c
merge with default
2010-02-24 18:35:05 +01:00
Benoit Boissinot
2615e405ae
shrink: handle all combinations of inline/non-inline revlogs
2010-02-24 18:22:45 +01:00
Wagner Bruna
65dc62eef8
commands: clarify --config syntax
2010-02-24 11:04:56 -03:00
Steve Borho
9309ff3d0c
progress: provide an explicit disable method for developers
...
The other three checks for disabling the progress bar have serious
side effects for any class that derives from ui.ui()
2010-02-23 23:10:01 -06:00
Benoit Boissinot
11902c9b65
gpg: make 215997cc74c9 work when not on repo root
2010-02-23 22:56:37 +01:00
Ronny Pfannschmidt
4e6e8c7c75
make the progress extension honor ui.quiet
2010-02-21 15:26:55 +01:00
Saint Germain
a779bc7bd1
subrepo: Update .hgsubstate in case of deleted subrepo
...
When a subrepo is deleted from .hgsub, it also needs to be removed from
.hgsubstate. Previous code was updating .hgsubstate only in case of newly or
modified subrepo.
2010-02-22 01:19:59 +01:00
Benoit Boissinot
92607edfec
Do not use osutil.c with python 2.4 and Windows (issue1364)
...
Windows python 2.4 os.stat() reports times including DST offset, while osutil.c
reports the correct value, which makes status() systematically compare files
content. This bug is fixed in python 2.5. Using osutil.py instead of osutil.c
is 4x times slower on large repositories but current code is completely
unusable. Given few people are likely to use python 2.4 on Windows this
solution was considered a good trade-off compared to more invasive solutions
trying to address the offset issue.
2010-02-21 22:16:35 +01:00
timeless
bb1742e284
commands: mention diff -c
2010-02-21 01:21:17 +02:00
Martin Geisler
355bb1daf3
progress: mark units for translation
2010-02-20 20:08:42 +01:00
Wagner Bruna
9b81c3ec4d
patch, i18n: avoid parameterized messages
...
Singular message removed for simplicity.
2010-02-19 13:04:11 -02:00
Benoit Boissinot
04051efacc
gpg: do not call status on the whole repository, only on '.hgsigs'
2010-02-20 15:18:59 +01:00
Brodie Rao
0f2039e2cc
pager: set ui.interactive=False when enabled
...
This stops interactive-only things like progress bars from showing up
inside the pager.
2010-02-19 22:16:42 -05:00
Dirkjan Ochtman
c2bc65394a
identify: don't include unknown in status
2010-02-19 20:34:23 -05:00
Brendan Cully
9f7576938c
zeroconf: suppress traceback during shutdown
...
If the read thred is in select when the main thread is in close, the main
thread may close the socket between select and read, generating a noisy
traceback. This can be ignored if the shutdown flag is set.
2010-02-19 16:50:47 -08:00
Adrian Buehlmann
ba12ccbcb7
contrib/wix: switch *.wxs files to LF eol
2010-02-19 21:48:09 +01:00
