[thg-dev] [PATCH 1 of 2] logview: stop abusing pats parameter of TreeView.refresh for branch filtering

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adr...@cadifra.com>
# Date 1253903948 -7200
# Node ID 43024b98319f106f1618851b034be262ee662c87
# Parent  b4765a0f7bae862a5e160bc665ab8a6a1d987284
logview: stop abusing pats parameter of TreeView.refresh for branch filtering

take 'branch' from opts

diff --git a/tortoisehg/hgtk/history.py b/tortoisehg/hgtk/history.py
--- a/tortoisehg/hgtk/history.py
+++ b/tortoisehg/hgtk/history.py
@@ -451,7 +451,7 @@ class GLog(gdialog.GDialog):
 
         if self.filter == 'branch':
             branch = opts.get('branch', None)
-            self.graphview.refresh(self.graphcol, branch, opts)
+            self.graphview.refresh(self.graphcol, None, opts)
             ftitle(_('%s branch') % branch)
         elif self.filter == 'custom':
             npats = hglib.normpats(pats)
diff --git a/tortoisehg/hgtk/logview/treeview.py 
b/tortoisehg/hgtk/logview/treeview.py
--- a/tortoisehg/hgtk/logview/treeview.py
+++ b/tortoisehg/hgtk/logview/treeview.py
@@ -142,15 +142,17 @@ class TreeView(gtk.ScrolledWindow):
         if self.repo is None:
             self.grapher = None
             return
+            
+        only_branch = opts.get('branch', None)
 
         if opts.get('filehist') is not None:
             self.grapher = filelog_grapher(self.repo, opts['filehist'])
         elif graphcol:
             end = 0
-            if pats is not None:  # branch name
+            if only_branch is not None:
                 b = self.repo.branchtags()
-                if pats in b:
-                    node = b[pats]
+                if only_branch in b:
+                    node = b[only_branch]
                     start = self.repo.changelog.rev(node)
                 else:
                     start = len(self.repo.changelog) - 1
@@ -165,9 +167,9 @@ class TreeView(gtk.ScrolledWindow):
             noheads = opts.get('noheads', False)
             if opts.get('branch-view', False):
                 self.grapher = branch_grapher(self.repo, start, end, 
-                    pats, self.branch_color)
+                    only_branch, self.branch_color)
             else:
-                self.grapher = revision_grapher(self.repo, start, end, pats,
+                self.grapher = revision_grapher(self.repo, start, end, 
only_branch,
                         noheads, self.branch_color)
         elif opts.get('revlist', None):
             self.grapher = dumb_log_generator(self.repo, opts['revlist'])

------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; 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&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop