Ah, thanks both for the clarification. It just so happened that the title of
the column whose contents I was changing is also 'Summary', so I got
confused. =)

Anyway, here's the commit again, hopefully formatted more acceptably.

- Paul


On Fri, Dec 4, 2009 at 12:01 PM, Martin Geisler <m...@lazybytes.net> wrote:

> Paul Molodowitch <pa...@luma-pictures.com> writes:
>
> > Well, I updated the patch to not use try/except/else.
> >
> > I'm not sure what you mean by about the logview header, though.
>
> Yeah, that sounded a bit cryptic to me too... The first line of the
> commit message is the summary line. It should start with 'logview:' when
> you edit that component of TortoiseHg.
>
> --
> Martin Geisler
>
> VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
> SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
>
>
> ------------------------------------------------------------------------------
> Join us December 9, 2009 for the Red Hat Virtual Experience,
> a free event focused on virtualization and cloud computing.
> Attend in-depth sessions from your desk. Your couch. Anywhere.
> http://p.sf.net/sfu/redhat-sfdev2dev
> _______________________________________________
> Tortoisehg-develop mailing list
> Tortoisehg-develop@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
>
>
# HG changeset patch
# User paulm
# Date 1259965470 28800
# Node ID d871e96ac58d036dd08f5463f7cb51e07316aff7
# Parent  04402d95b4ed183288af3969d107d82141995fe0
logview: 'current' bookmarks highlighted in log view

diff -r 04402d95b4ed -r d871e96ac58d tortoisehg/hgtk/logview/treemodel.py
--- a/tortoisehg/hgtk/logview/treemodel.py	Thu Dec 03 21:41:30 2009 -0600
+++ b/tortoisehg/hgtk/logview/treemodel.py	Fri Dec 04 14:24:30 2009 -0800
@@ -159,13 +159,29 @@
             escape = gtklib.markup_escape_text
             summary = escape(hglib.toutf(summary))
             node = ctx.node()
+
+            # Check if we're using bookmarks, and have the
+            # 'track.current' option set; if so,
+            # find what the 'current' bookmark is
+            currentBookmark = None
+            bookmarks = None
+            try:
+                bookmarks = hglib.extensions.find('bookmarks')
+            except KeyError:
+                pass
+            if bookmarks:
+                if self.repo.ui.configbool('bookmarks', 'track.current'):
+                    currentBookmark = bookmarks.current(self.repo)
+                
             tags = self.repo.nodetags(node)
             taglist = hglib.toutf(', '.join(tags))
             tstr = ''
             for tag in tags:
                 if tag not in self.hidetags:
-                    tstr += gtklib.markup(' %s ' % tag, color='black',
-                                          background='#ffffaa') + ' '
+                    style = {'color':'black', 'background':'#ffffaa'}
+                    if tag == currentBookmark:
+                        style['background'] = '#ffcc99'
+                    tstr += gtklib.markup(' %s ' % tag, **style) + ' '
 
             branch = ctx.branch()
             bstr = ''
------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing. 
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop

Reply via email to