Commits

Yuya Nishihara  committed bbc1d11

error code patches, etc.

  • Participants
  • Parent commits b054dcf

Comments (0)

Files changed (4)

File longbra.diff

-# HG changeset patch
-# Date 1361683905 -32400
-# Parent 015b94a0da71bda193dea61a5f607816ce31a7f9
-repofilter: have revset combo take more space if possible
-
-804a09d0d7b5 intended to do this, but it has no effect due to fixes for #670,
-b2669fcd6319 and 38cb0dc489f0.
-
-Unlike the name of setMinimumContentsLength(), it can avoid the combo box
-taking too much space. If specified, minimumSizeHint() follows that value and
-sizeHint() follows the specified SizeAdjustPolicy. Thus, the branch combo will
-have preferred width only if it can fit to the layout.
-
-http://qt.gitorious.org/qt/qt/blobs/4.7/src/gui/widgets/qcombobox.cpp#line293
-
-diff --git a/tortoisehg/hgqt/repofilter.py b/tortoisehg/hgqt/repofilter.py
---- a/tortoisehg/hgqt/repofilter.py
-+++ b/tortoisehg/hgqt/repofilter.py
-@@ -62,7 +62,7 @@ class RepoFilterBar(QToolBar):
-         self.revsetcombo = combo = QComboBox()
-         combo.setEditable(True)
-         combo.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
--        combo.setSizeAdjustPolicy(QComboBox.AdjustToMinimumContentsLength)
-+        combo.setMinimumContentsLength(10)
-         qtlib.allowCaseChangingInput(combo)
-         le = combo.lineEdit()
-         le.returnPressed.connect(self.returnPressed)
-@@ -240,8 +240,7 @@ class RepoFilterBar(QToolBar):
-         self._branchLabel.setMenu(self._branchMenu)
- 
-         self._branchCombo = QComboBox()
--        self._branchCombo.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
--        self._branchCombo.setSizeAdjustPolicy(QComboBox.AdjustToMinimumContentsLength)
-+        self._branchCombo.setMinimumContentsLength(10)
-         self._branchCombo.currentIndexChanged.connect(self._emitBranchChanged)
-         self._branchReloading = False
- 

File maskout.diff

+# HG changeset patch
+# Parent f7ac2f203e8fc1bbf0482b33be5fb0abba048acf
+
+diff --git a/thg b/thg
+--- a/thg
++++ b/thg
+@@ -111,6 +111,7 @@ else:
+                 opts['nofork'] = True
+                 qtrun(run, ui.ui(), **opts)
+                 break
++        ret = (ret or 0) & 255
+         sys.exit(ret)
+     except:
+         if sys.exc_info()[0] not in [SystemExit, KeyboardInterrupt]:

File safegccreate.dif

+# HG changeset patch
+# Parent f7ac2f203e8fc1bbf0482b33be5fb0abba048acf
+
+diff --git a/tortoisehg/hgqt/run.py b/tortoisehg/hgqt/run.py
+--- a/tortoisehg/hgqt/run.py
++++ b/tortoisehg/hgqt/run.py
+@@ -527,8 +527,8 @@ class _QtRunner(QObject):
+         QSettings.setDefaultFormat(QSettings.IniFormat)
+ 
+         self._mainapp = QApplication(sys.argv)
+-        self._gc = GarbageCollector(self, self.debug)
+         try:
++            self._gc = GarbageCollector(self, self.debug)
+             # default org is used by QSettings
+             self._mainapp.setApplicationName('TortoiseHgQt')
+             self._mainapp.setOrganizationName('TortoiseHg')
-longbra.diff
+maskout.diff
+safegccreate.dif
 branch-editable.diff
 revsetnotfound.diff
 branch-selectall.diff