Martin Geisler <mg@lazybytes.net> [Wed, 17 Feb 2010 23:10:22 +0100] rev 10497
Merge with stable
Martin Geisler <mg@lazybytes.net> [Wed, 17 Feb 2010 23:07:50 +0100] rev 10496
progress: mark strings for translation
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 17:11:20 +0100] rev 10495
keyword: do not postpone commit hooks
With 0e64d814d7d0 in place, this hack is not needed any more.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 17 Feb 2010 20:44:49 +0100] rev 10494
inotify/inserve: implement --timeout-idle option (issue885)
hg inserve was ignoring and miscomputing the --timeout-idle option (seconds
vs. minutes).
Thanks to Jesse Glick for the bugreport and the initial patch.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 17 Feb 2010 20:30:57 +0100] rev 10493
regression: missing arg from 24ce8f0c0a39 dirstate.{walk,status} changes
Sune Foldager <cryo@cyanite.org> [Wed, 17 Feb 2010 15:43:21 +0100] rev 10492
run commit and update hooks after command completion (issue1827)
Previously, the working dir state hadn't been written when these
hooks were invoked, so external commands couldn't see all changes.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 17 Feb 2010 11:00:48 +0100] rev 10491
http: len(x) fails if it doesn't fit into an int, use __len__() instead
len(x) raises OverflowError if it's bigger than 2**31-1, we need to call
__len__() ourself instead.
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 16 Feb 2010 21:04:04 +0100] rev 10490
filelog: sort meta entries, ensure deterministic order
Martin Geisler <mg@lazybytes.net> [Tue, 16 Feb 2010 23:28:46 +0100] rev 10489
Merge with i18n
Jens Bäckman <jens.backman@gmail.com> [Tue, 16 Feb 2010 22:01:27 +0100] rev 10488
i18n-sv: synchronized with 44b4a2a31623
Steve Losh <steve@stevelosh.com> [Tue, 16 Feb 2010 09:31:35 -0500] rev 10487
util: use the built-in any() and all() methods if they are available
Steve Borho <steve@borho.org> [Mon, 15 Feb 2010 21:18:16 -0600] rev 10486
mergetools: improve configuration for several merge tools
* meld - provide labels for the three panes
* diffmerge - add registry key for detection, improve arguments
* beyond compare - add linux version
* winmerge - improve arguments
* araxis - add configuration, including registry key for detection
* misc - provide default priorities for more tools
Steve Borho <steve@borho.org> [Mon, 15 Feb 2010 20:28:42 -0600] rev 10485
hgrc.5: document use of environment variables on Windows
This feature was introduced in c31ac3f7fd8f
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 15 Feb 2010 22:39:36 +0100] rev 10484
url: correctly quote '/' in user and password embedded in urls
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 15 Feb 2010 16:34:59 -0200] rev 10483
i18n-pt_BR: synchronized with 44b4a2a31623
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 15 Feb 2010 18:12:50 +0100] rev 10482
url: fix python < 2.6 with ssl installed
_GLOBAL_DEFAULT_TIMEOUT isn't related to ssl, but to python < 2.6, move it to
the right hunk.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 15 Feb 2010 09:57:11 +0100] rev 10481
bugzilla: revert unhelpful check-code changes, module is actually called MySQLdb
Brendan Cully <brendan@kublai.com> [Mon, 15 Feb 2010 00:16:59 -0800] rev 10480
mq: unify implementation of qinit and init -Q
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Nov 2009 16:10:05 -0500] rev 10479
bundle: exclude csets given in --base, unless they are in --rev (issue1910)
Thanks Jesse Glick for the first version of this patch.
Martin Geisler <mg@lazybytes.net> [Mon, 15 Feb 2010 00:17:18 +0100] rev 10478
Merge with stable
Martin Geisler <mg@lazybytes.net> [Mon, 15 Feb 2010 00:14:16 +0100] rev 10477
Merge with default
Martin Geisler <mg@lazybytes.net> [Mon, 15 Feb 2010 00:12:10 +0100] rev 10476
mq: more instructive use of "--" in qguard help (issue2040)
Brodie Rao <me+hg@dackz.net> [Sun, 14 Feb 2010 17:08:52 -0500] rev 10475
color: don't crash on invalid status codes (issue2036)
If an unknown file with a newline appears in the status output, color
shouldn't raise a KeyError trying to parse second line in the filename.
Pascal Quantin <pascal.quantin@gmail.com> [Sun, 14 Feb 2010 23:17:28 +0100] rev 10474
Add progress extension to win32 default config file
Martin Geisler <mg@lazybytes.net> [Sun, 14 Feb 2010 20:28:49 +0100] rev 10473
test-interhg: test the extension
Wagner Bruna <wbruna@yahoo.com> [Sat, 06 Feb 2010 21:25:02 -0200] rev 10472
interhg: fixes regression introduced by 38170eeed18c
Martin Geisler <mg@lazybytes.net> [Sun, 14 Feb 2010 17:09:52 +0100] rev 10471
progress: use inline literals in help string
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 19:15:56 +0100] rev 10470
Fix test-pull under Windows
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 18:39:16 +0100] rev 10469
Fix test-push-validation under Windows
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 18:19:18 +0100] rev 10468
Fix test-share and test-subrepo under Windows
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 17:53:23 +0100] rev 10467
patch: remove useless copy, cleanup
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 11 Feb 2010 11:22:57 -0200] rev 10466
patch: separate reverse copy data (issue1959)