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).