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
Martin Geisler <mg@lazybytes.net> [Mon, 05 Apr 2010 00:14:24 +0200] rev 10857
i18n-da: synchronized with 37a5a397f150
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10856
templates: escape javascript braces
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10855
templater: drop \ when handling escaped {
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10854
templater: strip whitespace inside template methods
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10853
templater: drop raw method
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10852
templater: raise nested functions
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10851
templater: cache full tree
store the parsed version of subtemplates in higher level parse lists, avoid
run-time cache lookups
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10850
templater: use recursive flattening
This avoids slow list operations compared to the iterative version
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10849
templater: cache self.defaults.get
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10848
templater: privatize class variables
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10847
templater: map -> mapping
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10846
templater: extend preparsing
preparse filters and formats and supply functions to apply
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10845
templater: preparse templates and cache
This breaks templates down into a list of literal and {} groups, with
group types preidentified.
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 10844
keywords: build a new templater to work around caching interaction
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 14:33:41 -0500] rev 10843
templater: directly parse templates, no regexes
Jeff Schiller <codedread@gmail.com> [Mon, 05 Apr 2010 14:33:41 -0500] rev 10842
logo: clean up source file with scour
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 14:33:41 -0500] rev 10841
contrib: drop rewrite-revlog
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 14:33:41 -0500] rev 10840
contrib: drop git-viz
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 05 Apr 2010 20:35:47 +0200] rev 10839
merge with stable
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Mon, 05 Apr 2010 20:10:46 +0200] rev 10838
add a test for the inprocess status dirstate race
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 05 Apr 2010 19:49:19 +0200] rev 10837
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 05 Apr 2010 18:13:20 +0200] rev 10836
dirstate: fix in memory dirstate entries for 1-second race
Only the on-disk file was modified, we need to modify the in-memory dirstate
as well.
Martin Geisler <mg@lazybytes.net> [Mon, 05 Apr 2010 13:44:30 +0200] rev 10835
commands: leftover from d7b601f1e02c
Martin Geisler <mg@lazybytes.net> [Mon, 05 Apr 2010 11:58:54 +0200] rev 10834
commands: small refactoring in summary
Martin Geisler <mg@lazybytes.net> [Mon, 05 Apr 2010 11:52:40 +0200] rev 10833
commands: retrieve tags from context object
Eric Eisner <ede@mit.edu> [Sun, 04 Apr 2010 21:35:00 -0400] rev 10832
summary: make use of output labeling
The individual pieces of information use the same labels as the commands
they summarize for better cohesion of commands.
Brodie Rao <brodie@bitheap.org> [Sun, 04 Apr 2010 22:53:50 -0500] rev 10831
color: concatenate effects correctly and avoid printing empty effects
Martin Geisler <mg@lazybytes.net> [Mon, 05 Apr 2010 01:31:16 +0200] rev 10830
commands: fix typo
Martin Geisler <mg@lazybytes.net> [Mon, 05 Apr 2010 01:00:14 +0200] rev 10829
cmdutil: do not translate trivial string
Adrian Buehlmann <adrian@cadifra.com> [Sun, 04 Apr 2010 02:39:45 +0200] rev 10828
wix: refactor and new guids.wxi
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:19 -0500] rev 10827
color: don't split colors across lines (which confuses less -R)
Currently, less -R doesn't support colors spanning multiple lines; only
the first line will be colorized.
Instead of allowing colors to span multiple lines, the color extension
now applies colors to each line it receives, even when ui.write() is
given multiple lines in one call.
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:17 -0500] rev 10826
color: colorize based on output labels instead of parsing output
By overriding ui.write(), ui.write_err(), ui.popbuffer(), and ui.label(),
the color extension can avoid parsing command output and simply colorize
output based on labels.
As before, the color extension provides a list of default colors for
core commands/labels. Other extensions can provide their own defaults by
specifying a colortable dict (similar to cmdtable).
In this process, --color is promoted to a global option and the deprecated
--no-color option is removed.
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:15 -0500] rev 10825
record: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:14 -0500] rev 10824
qseries: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:11 -0500] rev 10823
qdiff: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:12 -0500] rev 10822
qguard: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:10 -0500] rev 10821
churn: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:09 -0500] rev 10820
bookmark: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:07 -0500] rev 10819
cmdutil: make use of output labeling in changeset_printer
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:06 -0500] rev 10818
diff: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:05 -0500] rev 10817
status: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:03 -0500] rev 10816
grep: make use of output labeling
Brodie Rao <brodie@bitheap.org> [Fri, 02 Apr 2010 15:22:00 -0500] rev 10815
ui: add ui.write() output labeling API
This adds output labeling support with the following methods:
- ui.write(..., label='topic.name topic2.name2 ...')
- ui.write_err(.., label=...)
- ui.popbuffer(labeled=False)
- ui.label(msg, label)
By adding an API to label output directly, the color extension can forgo
parsing command output and instead override the above methods to insert
ANSI color codes. GUI tools can also override the above methods and use
the labels to do GUI-specific styling.
popbuffer gains a labeled argument that, when set to True, returns its
buffered output with labels handled. In the case of the color extension,
this would return output with color codes embedded. For existing users
that use this method to capture and parse output, labels are discarded
and output returned as normal when labeled is False (the default).
Existing wrappers of ui.write() and ui.write_err() should make sure to
accept its new **opts argument.
Matt Mackall <mpm@selenic.com> [Thu, 01 Apr 2010 17:51:59 -0500] rev 10814
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Apr 2010 17:51:32 -0500] rev 10813
Merge with i18n
Matt Mackall <mpm@selenic.com> [Thu, 01 Apr 2010 17:49:38 -0500] rev 10812
Added signature for changeset 2b01dab59416
Matt Mackall <mpm@selenic.com> [Thu, 01 Apr 2010 17:49:38 -0500] rev 10811
Added tag 1.5.1 for changeset 2b01dab59416