Martin Geisler <mg@lazybytes.net> [Sun, 28 Feb 2010 18:02:20 +0100] rev 10556
i18n-da: synchronized with
091dddf05764
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 24 Feb 2010 13:47:59 -0300] rev 10555
doc/Makefile: fix doc generation when LANGUAGE is set
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 27 Feb 2010 19:58:59 +0900] rev 10554
i18n-ja: synchronized with
4462760d6cfc
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 26 Feb 2010 19:28:23 -0300] rev 10553
i18n-pt_BR: synchronized with
dd3526162436
Adrian Buehlmann <adrian@cadifra.com> [Thu, 25 Feb 2010 14:56:09 +0100] rev 10552
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.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 26 Feb 2010 16:52:43 +0100] rev 10551
fix test-mq-eol under --pure (mimic diffhelper.c behaviour)
bug discovered by apycot (apycot.hg-scm.org)
Manpreet Singh <junkblocker@yahoo.com> [Wed, 24 Feb 2010 19:43:13 -0800] rev 10550
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
Martin Geisler <mg@lazybytes.net> [Thu, 25 Feb 2010 17:06:32 +0100] rev 10549
Merge with hg-i18n
Jens Bäckman <jens.backman@gmail.com> [Wed, 24 Feb 2010 19:47:51 +0100] rev 10548
i18n-sv: synchronized with
fc5908d01ed7
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 21 Feb 2010 20:59:27 +0100] rev 10547
strip: invalidate all caches after stripping (fixes
issue1951)
test thanks to Stefano Tortarolo
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 25 Feb 2010 14:35:21 +0100] rev 10546
fix test output changed by
2e1a9b811d13
Manpreet Singh <junkblocker@yahoo.com> [Wed, 24 Feb 2010 13:12:17 -0800] rev 10545
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.
Sune Foldager <cryo@cyanite.org> [Wed, 24 Feb 2010 12:35:26 -0500] rev 10544
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.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 24 Feb 2010 18:35:05 +0100] rev 10543
merge with default
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 24 Feb 2010 18:22:45 +0100] rev 10542
shrink: handle all combinations of inline/non-inline revlogs
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 24 Feb 2010 11:04:56 -0300] rev 10541
commands: clarify --config syntax
Steve Borho <steve@borho.org> [Tue, 23 Feb 2010 23:10:01 -0600] rev 10540
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()
Martin Geisler <mg@lazybytes.net> [Wed, 24 Feb 2010 17:11:37 +0100] rev 10539
url: only mark format string for translation
Martin Geisler <mg@lazybytes.net> [Wed, 24 Feb 2010 09:26:31 +0100] rev 10538
Merge with hg-i18n
Martin Geisler <mg@lazybytes.net> [Wed, 24 Feb 2010 09:25:55 +0100] rev 10537
i18n-da: fixed typo
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 24 Feb 2010 15:02:06 +0900] rev 10536
i18n-ja: synchronized with
eddf859343de
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 23 Feb 2010 12:51:07 -0300] rev 10535
i18n-pt_BR: synchronized with
076e8a8000a3, minor fixes
Patrick Mezard <pmezard@gmail.com> [Tue, 23 Feb 2010 22:31:54 +0100] rev 10534
url: avoid traceback when parsing [auth] (
issue2056)
Patrick Mezard <pmezard@gmail.com> [Tue, 23 Feb 2010 23:19:09 +0100] rev 10533
filemerge: use native path separators when merging (
issue1399)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 23 Feb 2010 22:56:37 +0100] rev 10532
gpg: make
13448eab08ca work when not on repo root
Sune Foldager <cryo@cyanite.org> [Tue, 23 Feb 2010 11:37:40 -0500] rev 10531
hgweb: use string join instead of slower cStringIO
Sune Foldager <cryo@cyanite.org> [Tue, 23 Feb 2010 11:34:08 -0500] rev 10530
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.
Brendan Cully <brendan@kublai.com> [Mon, 22 Feb 2010 23:30:01 -0800] rev 10529
hgcia: report RPC errors
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 23 Feb 2010 06:44:37 +0100] rev 10528
merge with stable
timeless <timeless@mozdev.org> [Tue, 23 Feb 2010 06:42:10 +0100] rev 10527
commands: correct diff -c explanation
Sune Foldager <cryo@cyanite.org> [Mon, 22 Feb 2010 23:12:12 -0500] rev 10526
httprepo: send Content-Type instead of content-type
Sune Foldager <cryo@cyanite.org> [Mon, 22 Feb 2010 16:28:57 +0100] rev 10525
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.
Patrick Mezard <pmezard@gmail.com> [Mon, 22 Feb 2010 22:55:58 +0100] rev 10524
patch: fix patching with fuzz and eol normalization
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Sun, 21 Feb 2010 15:26:55 +0100] rev 10523
make the progress extension honor ui.quiet
Saint Germain <saintger@gmail.com> [Mon, 22 Feb 2010 01:19:59 +0100] rev 10522
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.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 21 Feb 2010 22:16:35 +0100] rev 10521
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.
timeless <timeless@mozdev.org> [Sun, 21 Feb 2010 01:21:17 +0200] rev 10520
commands: mention diff -c
Martin Geisler <mg@lazybytes.net> [Sat, 20 Feb 2010 20:08:42 +0100] rev 10519
progress: mark units for translation
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 19 Feb 2010 13:04:11 -0200] rev 10518
patch, i18n: avoid parameterized messages
Singular message removed for simplicity.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 20 Feb 2010 15:18:59 +0100] rev 10517
gpg: do not call status on the whole repository, only on '.hgsigs'
Brodie Rao <me+hg@dackz.net> [Fri, 19 Feb 2010 22:16:42 -0500] rev 10516
pager: set ui.interactive=False when enabled
This stops interactive-only things like progress bars from showing up
inside the pager.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 19 Feb 2010 20:34:23 -0500] rev 10515
identify: don't include unknown in status
Brendan Cully <brendan@kublai.com> [Fri, 19 Feb 2010 16:50:47 -0800] rev 10514
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.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 19 Feb 2010 21:48:09 +0100] rev 10513
contrib/wix: switch *.wxs files to LF eol
Steve Borho <steve@borho.org> [Thu, 18 Feb 2010 23:23:17 -0600] rev 10512
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 19 Feb 2010 02:51:35 +0100] rev 10511
url: *args argument is a tuple, not a list (found by pylint)
E1101:514:httpshandler._makeconnection: Instance of 'tuple' has no 'pop' member
E1101:516:httpshandler._makeconnection: Instance of 'tuple' has no 'pop' member
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 19 Feb 2010 02:23:38 +0100] rev 10510
i18n: mark more strings for translation
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 19 Feb 2010 02:11:37 +0100] rev 10509
shrink-revlog: remove unneeded imports and useless code