Steve Borho  committed e80b36b Merge

Merge with stable

  • Participants
  • Parent commits 29eefd1, edfd89a

Comments (0)

Files changed (3)

File tortoisehg/hgqt/

 from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest
     from PyQt4.Qsci import QSCINTILLA_VERSION_STR
-except (ImportError, AttributeError):
+except (ImportError, AttributeError, RuntimeError):
     # show BugReport dialog even if QScintilla is missing
+    # or incompatible (RuntimeError: the sip module implements API v...)
     QSCINTILLA_VERSION_STR = '(unknown)'
 def _safegetcwd():

File tortoisehg/hgqt/

     def getSummary(self):
         comboText = self.qui.review_id_combo.currentText().split(":")
-        return str(comboText[1])
+        return hglib.fromunicode(comboText[1])
     def postReviewOpts(self, **opts):
         """Generate opts for reviewboard by form values"""

File tortoisehg/hgqt/

 def openhelpcontents(url):
     'Open online help, use local CHM file if available'
     if not url.startswith('http'):
-        fullurl = '' + url
+        fullurl = '' + url
         # Use local CHM file if it can be found
         if == 'nt' and paths.bin_path:
             chm = os.path.join(paths.bin_path, 'doc', 'TortoiseHg.chm')