--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py Tue Aug 30 19:13:13 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py Tue Aug 30 19:39:52 2011 +0200
@@ -9,7 +9,7 @@
import os
-from PyQt4.QtCore import QProcess, QTimer
+from PyQt4.QtCore import QProcess
from PyQt4.QtGui import QDialog, QTreeWidgetItem
from .Ui_HgQueuesListAllGuardsDialog import Ui_HgQueuesListAllGuardsDialog
@@ -31,22 +31,8 @@
super().__init__(parent)
self.setupUi(self)
- self.process = QProcess()
self.vcs = vcs
-
- def closeEvent(self, e):
- """
- Private slot implementing a close event handler.
-
- @param e close event (QCloseEvent)
- """
- if self.process is not None and \
- self.process.state() != QProcess.NotRunning:
- self.process.terminate()
- QTimer.singleShot(2000, self.process.kill)
- self.process.waitForFinished(3000)
-
- e.accept()
+ self.__hgClient = vcs.getClient()
def start(self, path):
"""
@@ -63,41 +49,46 @@
if repodir == os.sep:
return
- ioEncoding = Preferences.getSystem("IOEncoding")
- process = QProcess()
args = []
args.append("qguard")
args.append("--list")
- process.setWorkingDirectory(repodir)
- process.start('hg', args)
- procStarted = process.waitForStarted()
- if procStarted:
- finished = process.waitForFinished(30000)
- if finished and process.exitCode() == 0:
- output = \
- str(process.readAllStandardOutput(), ioEncoding, 'replace')
- if output:
- guardsDict = {}
- for line in output.splitlines():
- if line:
- patchName, guards = line.strip().split(":", 1)
- guardsDict[patchName] = guards.strip().split()
- for patchName in sorted(guardsDict.keys()):
- patchItm = QTreeWidgetItem(self.guardsTree, [patchName])
- patchItm.setExpanded(True)
- for guard in guardsDict[patchName]:
- if guard.startswith("+"):
- icon = UI.PixmapCache.getIcon("plus.png")
- guard = guard[1:]
- elif guard.startswith("-"):
- icon = UI.PixmapCache.getIcon("minus.png")
- guard = guard[1:]
- else:
- icon = None
- guard = self.trUtf8("Unguarded")
- itm = QTreeWidgetItem(patchItm, [guard])
- if icon:
- itm.setIcon(0, icon)
- else:
- QTreeWidgetItem(self.guardsTree, [self.trUtf8("no patches found")])
+ output = ""
+ if self.__hgClient:
+ output = self.__hgClient.runcommand(args)[0]
+ else:
+ ioEncoding = Preferences.getSystem("IOEncoding")
+ process = QProcess()
+ process.setWorkingDirectory(repodir)
+ process.start('hg', args)
+ procStarted = process.waitForStarted()
+ if procStarted:
+ finished = process.waitForFinished(30000)
+ if finished and process.exitCode() == 0:
+ output = \
+ str(process.readAllStandardOutput(), ioEncoding, 'replace')
+
+ if output:
+ guardsDict = {}
+ for line in output.splitlines():
+ if line:
+ patchName, guards = line.strip().split(":", 1)
+ guardsDict[patchName] = guards.strip().split()
+ for patchName in sorted(guardsDict.keys()):
+ patchItm = QTreeWidgetItem(self.guardsTree, [patchName])
+ patchItm.setExpanded(True)
+ for guard in guardsDict[patchName]:
+ if guard.startswith("+"):
+ icon = UI.PixmapCache.getIcon("plus.png")
+ guard = guard[1:]
+ elif guard.startswith("-"):
+ icon = UI.PixmapCache.getIcon("minus.png")
+ guard = guard[1:]
+ else:
+ icon = None
+ guard = self.trUtf8("Unguarded")
+ itm = QTreeWidgetItem(patchItm, [guard])
+ if icon:
+ itm.setIcon(0, icon)
+ else:
+ QTreeWidgetItem(self.guardsTree, [self.trUtf8("no patches found")])
