Steve Borho avatar Steve Borho committed 71aa97c Merge

Merge with stable

Comments (0)

Files changed (3)

contrib/mergetools.rc

 p4merge.diffargs=$parent $child
 p4merge.diff3args=$child $parent1 $parent2
 p4merge.dirdiff=False
+p4merge.checkchanged = True
 
 tortoisemerge.priority=-9
 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output

tortoisehg/hgqt/graph.py

 
 from mercurial import util, error
 
+try:
+    from mercurial import repoview
+    _filterrevs = repoview.filterrevs
+except ImportError: # hg < 2.5
+    def _filterrevs(repo, filtername):
+        return []
+
 def revision_grapher(repo, **opts):
     """incremental revision grapher
 
 
     revset = opts.get('revset', None)
     branch = opts.get('branch', None)
+    revhidden = _filterrevs(repo, 'visible')
     if revset:
         start_rev = max(revset)
         stop_rev = min(revset)
         follow = False
-        hidden = lambda rev: rev not in revset
+        hidden = lambda rev: (rev not in revset) or (rev in revhidden)
     else:
         start_rev = opts.get('start_rev', None)
         stop_rev = opts.get('stop_rev', 0)
         follow = opts.get('follow', False)
-        hidden = lambda rev: False
+        hidden = lambda rev: rev in revhidden
 
     assert start_rev is None or start_rev >= stop_rev
 

tortoisehg/hgqt/reporegistry.py

     def removeSelected(self):
         'remove selected repository'
         s = self.selitem
+        if not s:
+            return
         item = s.internalPointer()
         if 'remove' not in item.menulist():  # check capability
             return
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.