Matt Mackall <mpm@selenic.com> [Sun, 11 Apr 2010 14:24:19 -0500] rev 10889
commands: improve some command summaries
Matt Mackall <mpm@selenic.com> [Sat, 10 Apr 2010 17:20:43 -0500] rev 10888
progress: show approximate progress info for pull
Patrick Mezard <pmezard@gmail.com> [Mon, 12 Apr 2010 21:55:34 +0200] rev 10887
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Mon, 12 Apr 2010 21:37:21 +0200] rev 10886
localrepo: do not store URL password in undo.desc
Patrick Mezard <pmezard@gmail.com> [Mon, 12 Apr 2010 21:19:53 +0200] rev 10885
convert/subversion: fix default URL checker prototype
Brendan Cully <brendan@kublai.com> [Sun, 11 Apr 2010 20:59:55 -0700] rev 10884
Merge with stable
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 09 Apr 2010 20:34:05 +0200] rev 10883
patch: don't look for headers in diff lines
If you have a diff line that matches a header line, the patch splitter
currently breaks your patch at this line. For example a line like:
+key: value
This can lead to "malformed patch" exceptions. Now fixed.
Steve Borho <steve@borho.org> [Fri, 09 Apr 2010 17:23:37 -0500] rev 10882
rollback: add dry-run argument, emit transaction description
Steve Borho <steve@borho.org> [Fri, 09 Apr 2010 17:23:35 -0500] rev 10881
localrepo: add desc parameter to transaction
All callers to localrepo.transaction() must supply a transaction description.
The description and the existing repository tip are then stored
(transactionally) into .hg/undo.desc; where rollback can later find it.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Apr 2010 15:16:52 +0200] rev 10880
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Apr 2010 15:16:31 +0200] rev 10879
merge default
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Apr 2010 15:14:43 +0200] rev 10878
test-hgwebdir: correctly include '-' in sed expression.
'\' can't be used to escape '-' from being interpreted as a range,
so put it at the end.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 08 Apr 2010 17:21:42 +0200] rev 10877
localrepo: refactor prepush logic
Simplifies the prepush check logic and makes it a lot more direct and
comprehensible. Instead of comparing the total local vs. remote head count, it
compares the number of new vs. removed heads.
Sune Foldager <cryo@cyanite.org> [Fri, 09 Apr 2010 10:35:53 +0200] rev 10876
merge with stable
Sune Foldager <cryo@cyanite.org> [Thu, 08 Apr 2010 19:46:47 +0200] rev 10875
partial backout of
1e819576e926 and add tests (
issue2131)
The tests are due to Peter Arrenbrecht
Henrik Stuart <henrik.stuart@edlund.dk> [Wed, 07 Apr 2010 21:31:47 +0200] rev 10874
copies: properly visit file context ancestors on working file contexts
Matt Mackall <mpm@selenic.com> [Wed, 07 Apr 2010 14:44:51 -0500] rev 10873
Merge with stable
Henrik Stuart <henrik.stuart@edlund.dk> [Wed, 07 Apr 2010 16:55:01 +0200] rev 10872
mq: use util.unlink instead of os.unlink and os.removedirs
If, on Windows, your repository and working copy are in a reparse point and you
use os.removedirs, you will remove non-empty reparse points, disabling the
reparse point. See @
fa901423ac23.
Steve Borho <steve@borho.org> [Tue, 06 Apr 2010 08:54:18 -0500] rev 10871
color: respect HGPLAIN
Steve Borho <steve@borho.org> [Tue, 06 Apr 2010 08:49:19 -0500] rev 10870
color: add support for Windows consoles
Introduces color.mode configurable with values 'auto', 'ansi', or 'win32'. Any
other value disables coloring. When 'auto' is selected, the win32 console
method will be used if the win32console Python module is detected (requires
pywin32 to be installed).
Steve Borho <steve@borho.org> [Tue, 06 Apr 2010 08:44:13 -0500] rev 10869
color: remove unused import
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 06 Apr 2010 15:40:46 +0200] rev 10868
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 06 Apr 2010 15:40:00 +0200] rev 10867
merge default with default
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 06 Apr 2010 15:39:44 +0200] rev 10866
merge stable with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 06 Apr 2010 11:49:42 +0200] rev 10865
dirstate: no need to iterate twice, a dict can be updated in place
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 06 Apr 2010 00:46:09 +0200] rev 10864
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 06 Apr 2010 00:45:53 +0200] rev 10863
clone: no race possible, we can use changegroup() and have smaller urls
Related to
issue2126
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 17:48:48 -0500] rev 10862
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 17:48:31 -0500] rev 10861
Merge with i18n
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 17:48:00 -0500] rev 10860
Merge with i18n
Martin Geisler <mg@lazybytes.net> [Mon, 05 Apr 2010 01:38:31 +0200] rev 10859
Merge with hg-i18n
Martin Geisler <mg@lazybytes.net> [Mon, 05 Apr 2010 01:10:09 +0200] rev 10858
i18n-da: small updates