Steve Borho <steve@borho.org> [Tue, 08 Jun 2010 11:58:09 -0500] rev 11308
mergetools: add configuration for Ultra Compare (issue2226)
Initial config provided by Tim Pietzcker
Martin Geisler <mg@aragost.com> [Tue, 08 Jun 2010 14:12:46 +0200] rev 11307
mq: use hg reST role some more
Sune Foldager <cryo@cyanite.org> [Tue, 08 Jun 2010 13:19:22 +0200] rev 11306
fix encoding bug in 05ac42e56452
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 08 Jun 2010 09:30:45 +0200] rev 11305
cleanups: undefined variables
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 08 Jun 2010 09:30:33 +0200] rev 11304
cleanups: unused variables
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 07 Jun 2010 20:03:32 +0200] rev 11303
move working dir/dirstate methods from localrepo to workingctx
Steve Borho <steve@borho.org> [Thu, 03 Jun 2010 23:18:18 -0500] rev 11302
color: labeled text should be passed to ui.write() as ui.labeled
Some implementations of ui.label() (HTML versions in particular) must escape
the provided text and then markup the text with their tags. When this marked
up text is then passed to ui.write(), we must label the text as 'ui.labeled'
so the implementation knows not to escape it a second time (exposing the initial
markup).
This required the addition of a 'ui.plain' label for text that is purposefully
not marked up.
I was a little pedantic here, passing even ' ' strings to ui.label() when it
would be included with other labeled text in a ui.write() call. But it seemed
appropriate to lean to the side of caution.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 07 Jun 2010 18:35:54 +0200] rev 11301
move discovery methods from localrepo into new discovery module
Sune Foldager <cryo@cyanite.org> [Mon, 07 Jun 2010 16:29:06 +0200] rev 11300
merge with stable
Sune Foldager <cryo@cyanite.org> [Mon, 07 Jun 2010 16:28:23 +0200] rev 11299
push/pull: fix bug in "--branch ." handling
The branch wasn't expanded, so only the tip was operated on.