# HG changeset patch # User Yuki KODAMA <endflow....@gmail.com> # Date 1254815712 -32400 # Node ID 59ee4c36d676b75ffcc5e8abc47c5cbe0eaade77 # Parent 2e8913a04309b0642f507556ac30a6884c4ca920 thgconfig: change to 'comma separated list' for branchcolors option
diff --git a/tortoisehg/hgtk/logview/revgraph.py
b/tortoisehg/hgtk/logview/revgraph.py
--- a/tortoisehg/hgtk/logview/revgraph.py
+++ b/tortoisehg/hgtk/logview/revgraph.py
@@ -78,7 +78,8 @@
return {}
branchcolors = hglib.tounicode(branchcolors)
- branchcolors = [x for x in re.split(r'(?:(?<=\\\\)|(?<!\\)) ',
branchcolors) if x]
+ branchcolors = [x.strip() for x in re.split(r'(?:(?<=\\\\)|(?<!\\)),',
+ branchcolors) if x]
values = {}
for branchcolor in branchcolors:
parts = re.split(r'(?:(?<=\\\\)|(?<!\\)):', branchcolor)
@@ -88,7 +89,7 @@
# Mercurial branch names are encoded in utf-8 so we must
# make sure to encode back to that after having unescaped
# the string.
- branch_name = hglib.toutf(parts[0].replace('\\:',
':').replace('\\ ', ' ').decode('unicode_escape'))
+ branch_name = hglib.toutf(parts[0].replace('\\:',
':').replace('\\,', ',').decode('unicode_escape'))
values[branch_name] = hglib.toutf(parts[1])
known_branch_colors = values, repo_setting
diff --git a/tortoisehg/hgtk/thgconfig.py b/tortoisehg/hgtk/thgconfig.py
--- a/tortoisehg/hgtk/thgconfig.py
+++ b/tortoisehg/hgtk/thgconfig.py
@@ -117,8 +117,8 @@
' when building a list of branch names for a repository.'
' Default: None')),
(_('Branch Colors'), 'tortoisehg.branchcolors', [],
- _('Space separated list of branch names and colors of the form'
- ' branch:#XXXXXX. Spaces and colons in the branch name must be'
+ _('Comma separated list of branch names and colors of the form'
+ ' branch:#XXXXXX. Commas and colons in the branch name must be'
' escaped using a backslash (\\). Likewise some other characters'
' can be escaped in this way, e.g. \\u0040 will be decoded to the'
' @ character, and \\n to a linefeed.'
thg-kuy_rev4431.patch
Description: Binary data
------------------------------------------------------------------------------ Come build with us! The BlackBerry® Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9-12, 2009. Register now! http://p.sf.net/sfu/devconf
_______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
