Commits

Angel Ezquerra committed 37c575f

repofilter: do not ignore the selected branch when filtering via a revset (closes #473)

The filtering is performed when creating a graph, not when calculating the
revset.

Comments (0)

Files changed (2)

tortoisehg/hgqt/graph.py

     """
 
     revset = opts.get('revset', None)
+    branch = opts.get('branch', None)
     if revset:
         start_rev = max(revset)
         stop_rev = min(revset)
-        branch = None
         follow = False
         hidden = lambda rev: rev not in revset
     else:
         start_rev = opts.get('start_rev', None)
         stop_rev = opts.get('stop_rev', 0)
-        branch = opts.get('branch', None)
         follow = opts.get('follow', False)
         hidden = lambda rev: False
 

tortoisehg/hgqt/repomodel.py

         self.filterbranch = branch
         self.invalidateCache()
         if self.revset and self.filterbyrevset:
-            grapher = revision_grapher(self.repo, revset=self.revset)
+            grapher = revision_grapher(self.repo, branch=branch, revset=self.revset)
             self.graph = Graph(self.repo, grapher, include_mq=False)
         else:
             grapher = revision_grapher(self.repo, branch=branch,