Commits

Yuya Nishihara committed c33f702

update comment

Comments (0)

Files changed (3)

cmdui-running-fix.diff

 # HG changeset patch
-# Parent 115117eb3bd4c190b9448f7fb3e70b4607a152e2
+# Parent d119460eee185881e82c6c241b80aa122553edc7
+cmdui: keep running state just before emitting commandFinished (fixes #2611)
+
+MergeDialog checks cmd.running() on repositoryChanged. But thread.isRunning()
+is cleared slightly earlier than finished slot.
+
 diff --git a/tortoisehg/hgqt/cmdui.py b/tortoisehg/hgqt/cmdui.py
 --- a/tortoisehg/hgqt/cmdui.py
 +++ b/tortoisehg/hgqt/cmdui.py

merge-close-delay.diff

 # HG changeset patch
-# Parent 4b8667cfaa463ed47fceac4ce512354233740b12
+# Date 1369147550 -32400
+# Parent 115117eb3bd4c190b9448f7fb3e70b4607a152e2
+merge: avoid destroying itself while processing
+
+validatePage() is called by self.wizard.next(). If onCommandFinished calls
+it and if self.wizard().close() is processed immediately, the widget will be
+destroyed before completeChanged.emit(). Thus, the following exception occurs:
+
+    File "tortoisehg/hgqt/merge.py", line 663, in onCommandFinished
+      self.completeChanged.emit()
+    TypeError: pyqtSignal must be bound to a QObject, not 'CommitPage'
+
 diff --git a/tortoisehg/hgqt/merge.py b/tortoisehg/hgqt/merge.py
 --- a/tortoisehg/hgqt/merge.py
 +++ b/tortoisehg/hgqt/merge.py
+merge-close-delay.diff
 cmdui-running-fix.diff
-merge-close-delay.diff
 wctxa-noannot.diff
 prio-syncw.diff
 serve-dropsingle.diff