Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 10 Mar 2010 09:52:16 +0100] rev 10627
shrink-revlog: factor out postorder algorithm
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 10 Mar 2010 09:51:07 +0100] rev 10626
shrink-revlog: factor out suboptimal computation
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 10 Mar 2010 09:48:15 +0100] rev 10625
shrink-revlog: remove branchsort algorithm (it behaves poorly)
Greg Ward <greg-hg@gerg.ca> [Tue, 09 Mar 2010 21:25:37 -0500] rev 10624
shrink-revlog: add accounting of suboptimal nodes to the new algorithms.
Greg Ward <greg-hg@gerg.ca> [Tue, 09 Mar 2010 21:22:01 -0500] rev 10623
shrink-revlog: add "reverse postorder" and "postorder reverse" toposorts.
Based on a patch by Benoit Boissinot, adapted to the pluggable sort
algorithm design. toposort_reversepostorder() is a very good
performer; it's designed to recreate what the revlog would have looked
like if Mercurial had parent deltas now. toposort_postorderreverse()
is unstable and very inconsistent, but perhaps with some work it could
be made better.
Greg Ward <greg-hg@gerg.ca> [Thu, 25 Feb 2010 09:16:39 -0500] rev 10622
shrink-revlog: add --sort option for user-selectable toposort algorithm.
Greg Ward <greg-hg@gerg.ca> [Tue, 09 Mar 2010 21:30:19 -0500] rev 10621
shrink-revlog: rename some local variables for consistency.
Greg Ward <greg-hg@gerg.ca> [Tue, 09 Mar 2010 21:13:39 -0500] rev 10620
shrink-revlog: instrument sort code to record statistics.
Notably, count "suboptimal" nodes (predecessor is not first parent)
and (with -v) report them at the end of the run.
Patrick Mezard <pmezard@gmail.com> [Tue, 09 Mar 2010 22:18:37 +0100] rev 10619
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 09 Mar 2010 22:11:43 +0100] rev 10618
convert: handle svn tree with empty roots (issue2079)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 09 Mar 2010 20:47:35 +0100] rev 10617
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 09 Mar 2010 20:38:23 +0100] rev 10616
bundle: fix bundle generation for empty changegroup
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 09 Mar 2010 19:04:18 +0100] rev 10615
patch/diff: move diff related code next to each other
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 09 Mar 2010 18:31:57 +0100] rev 10614
remove header handling out of mdiff.bunidiff, rename it
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 09 Mar 2010 18:27:02 +0100] rev 10613
remove contrib/hgdiff, it makes refactoring diff/patch harder
it can always be revived if needed
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 09 Mar 2010 16:03:57 +0100] rev 10612
demandimport: blacklist _ssl (issue1964)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Mar 2010 19:43:24 +0100] rev 10611
patch/diff: move patch.export() to cmdutil.export()
This API change will allow us to break a cycle between patch and cmdutil.
Steve Borho <steve@borho.org> [Mon, 08 Mar 2010 11:12:48 -0600] rev 10610
wix: pre-check the 'I approve this license' checkbox
This is simply a convenience to the user, they can click next until the
installer goes away. Optimally, the checkbox would be hidden or removed,
but that requires rewriting the UI.
Matt Mackall <mpm@selenic.com> [Sun, 07 Mar 2010 22:04:35 -0600] rev 10609
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Mar 2010 00:01:12 +0100] rev 10608
addremove: avoid fetching data again and again
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Mar 2010 00:00:03 +0100] rev 10607
addremove: add progress support for similarity search
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 07 Mar 2010 23:59:28 +0100] rev 10606
addremove: atomically update the dirstate
In case someone hits ^C during the similarity search, properly rollback
Greg Ward <greg-hg@gerg.ca> [Sun, 07 Mar 2010 13:10:23 -0500] rev 10605
inotify: expose the same dirstate.status() interface as dirstate.
The real dirstate.status() does not have any keyword args. For
consistency, wrappers or subclasses should not have them either.
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 13:03:03 +0100] rev 10604
keyword: remove spurious locks, improve handling of wlock
- kwcommitctx is inside the wlock of repo.commit: no lock
- _kwfwrite only needs wlock
wlock outside try block, so we don't need to import lock.release
_kwfwrite should even be safer that way, as we moved the status
call inside the try-except block.
Thanks to Benoit Boissinot for help.
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 13:03:03 +0100] rev 10603
keyword: use status' names instead of index
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 07 Mar 2010 17:44:43 +0100] rev 10602
hgweb/graph: edge should be same color as the destination
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 06 Mar 2010 13:29:54 +0100] rev 10601
templatefilters: store the agescales in reverseorder directly
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 06 Mar 2010 12:45:14 +0100] rev 10600
hgweb: separate generation of entries and sorting (cleanup)
Brendan Cully <brendan@kublai.com> [Fri, 05 Mar 2010 18:08:23 -0800] rev 10599
Merge stable
Greg Ward <greg-hg@gerg.ca> [Wed, 20 Jan 2010 20:23:36 -0500] rev 10598
demandimport: add __main__ to the blacklist (because of setuptools)
Paul Molodowitch <pm@stanfordalumni.org> [Thu, 17 Dec 2009 15:53:28 -0800] rev 10597
bookmarks: add invalidate() to bookmark_repo
Cached bookmark information would not be reset when repo.invalidate()
was called, meaning (for instanced) guis would be left with out-of-date
bookmark info. This patch fixes that by overriding bookmark_repo.invalidate()
Yuya Nishihara <yuya@tcha.org> [Tue, 12 Jan 2010 22:49:10 +0900] rev 10596
branch: help misuse of hg branch to switch branches
Maybe beginners tend to use 'hg branch EXISTING_BRANCH' instead of
'hg update EXISTING_BRANCH' as me.
If so, let's help them to use 'update'.
Also removed '(use --force to override)' because it can mislead them.
Lee Cantey <lcantey@gmail.com> [Sat, 06 Mar 2010 21:29:02 -0800] rev 10595
Make Readme.html reference current OS X release
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 06 Mar 2010 13:32:14 +0100] rev 10594
progress: clear progress before writing to stderr
Matt Mackall <mpm@selenic.com> [Fri, 05 Mar 2010 18:26:13 -0600] rev 10593
Added signature for changeset ff2704a8ded3
Matt Mackall <mpm@selenic.com> [Fri, 05 Mar 2010 18:26:12 -0600] rev 10592
Added tag 1.5 for changeset ff2704a8ded3
Matt Mackall <mpm@selenic.com> [Fri, 05 Mar 2010 17:24:52 -0600] rev 10591
mq: drop -Q in favor of --mq only
Sune Foldager <cryo@cyanite.org> [Fri, 05 Mar 2010 12:27:23 +0100] rev 10590
mq: correct test output
Sune Foldager <cryo@cyanite.org> [Fri, 05 Mar 2010 10:49:56 +0100] rev 10589
mq: disallow : in patch names (issue2065)
Sune Foldager <cryo@cyanite.org> [Thu, 04 Mar 2010 14:23:54 +0100] rev 10588
mq: disallow # (and : on Windows) in patch names (issue2065)
Sune Foldager <cryo@cyanite.org> [Thu, 04 Mar 2010 13:11:29 +0100] rev 10587
Merge with stable
Sune Foldager <cryo@cyanite.org> [Thu, 04 Mar 2010 13:10:48 +0100] rev 10586
win32/hgwebdir_wsgi: clarify documentation and clean up script a bit
Martin Geisler <mg@lazybytes.net> [Thu, 04 Mar 2010 10:05:12 +0100] rev 10585
Merge with hg-i18n
Jens Bäckman <jens.backman@gmail.com> [Thu, 04 Mar 2010 07:34:22 +0100] rev 10584
i18n-sv: translated bisect, dates, locate, manifest
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 04 Mar 2010 11:56:53 +0900] rev 10583
i18n-ja: synchronized with c50a3d7154d2
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 03 Mar 2010 18:46:22 -0300] rev 10582
i18n-pt_BR: synchronized with f142fa3c0a8c
Steve Borho <steve@borho.org> [Wed, 03 Mar 2010 17:37:50 -0600] rev 10581
test-fetch: use relative URL to avoid echoing TMP path
Sune Foldager <cryo@cyanite.org> [Wed, 03 Mar 2010 22:32:51 +0100] rev 10580
fetch: fix newheads calculation (issue2047)
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 03 Mar 2010 22:04:59 +0100] rev 10579
Make annotate --follow an alias for -f/--file to behave like in older versions
Since 98a0421b9e52 annotate follows copies/renames by default, but the output
of e.g. "annotate --follow --number" should not change without some
deprecation time.
Martin Geisler <mg@lazybytes.net> [Wed, 03 Mar 2010 20:35:20 +0100] rev 10578
win32/hgwebdir_wsgi: clarify copyright license
Adrian Buehlmann <adrian@cadifra.com> [Wed, 03 Mar 2010 14:50:35 +0100] rev 10577
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.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 03 Mar 2010 16:00:02 +0100] rev 10576
Updated test output of test-convert-baz after f2618cacb485
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 03 Mar 2010 15:37:41 +0100] rev 10575
trailing spaces (and one stray tab)
Sune Foldager <cryo@cyanite.org> [Wed, 03 Mar 2010 14:59:39 +0100] rev 10574
Merge with default
Sune Foldager <cryo@cyanite.org> [Wed, 03 Mar 2010 14:43:27 +0100] rev 10573
Merge with stable
Sune Foldager <cryo@cyanite.org> [Wed, 03 Mar 2010 14:42:43 +0100] rev 10572
add wsgi script for Microsoft IIS with isapi-wsgi
Martin Geisler <mg@lazybytes.net> [Tue, 02 Mar 2010 21:34:24 +0100] rev 10571
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.
Martin Geisler <mg@lazybytes.net> [Tue, 02 Mar 2010 20:58:58 +0100] rev 10570
Merge with hg-i18n
Jens Bäckman <jens.backman@gmail.com> [Tue, 02 Mar 2010 18:36:37 +0100] rev 10569
i18n-sv: synchronized with f4f3a74ce832
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 02 Mar 2010 11:12:14 -0300] rev 10568
i18n-pt_BR: synchronized with b1339234080e
Yuya Nishihara <yuya@tcha.org> [Wed, 03 Mar 2010 00:12:05 +0900] rev 10567
ui: ignore ui.logtemplate and ui.style when HGPLAIN is set
HGPLAIN should suppress them because they change Mercurial's default
output.
Martin Geisler <mg@lazybytes.net> [Tue, 02 Mar 2010 10:40:58 +0100] rev 10566
Merge with hg-i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 02 Mar 2010 12:41:27 +0900] rev 10565
i18n-ja: synchronized with bb4561401c84
Yuya Nishihara <yuya@tcha.org> [Mon, 01 Mar 2010 23:27:44 +0900] rev 10564
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 6e8a16dd3e30.
Martin Geisler <mg@lazybytes.net> [Mon, 01 Mar 2010 22:47:39 +0100] rev 10563
Merge with hg-i18n
Jens Bäckman <jens.backman@gmail.com> [Sun, 28 Feb 2010 19:37:56 +0100] rev 10562
i18n-sv: synchronized with d1bbf01c4a8e
Martin Geisler <mg@lazybytes.net> [Mon, 01 Mar 2010 22:44:02 +0100] rev 10561
tests: update output to match b1339234080e
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 01 Mar 2010 14:15:55 +0100] rev 10560
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.
Greg Ward <greg-hg@gerg.ca> [Mon, 01 Mar 2010 15:41:21 -0500] rev 10559
resolve: rewrite help to be clearer and more complete (issue2030).
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 28 Feb 2010 19:43:21 +0100] rev 10558
mq: simplify --mq handling / keep compatibility with other extensions
reported by edgimar on IRC
Martin Geisler <mg@lazybytes.net> [Sun, 28 Feb 2010 18:06:47 +0100] rev 10557
Merge with stable
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