eric: comparison Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py

-:f2e75708f0c8
+:5e9f6df3d1fc
 if mode in ("log", "incoming", "outgoing"):
 self.mode = mode
 else:
 self.mode = "log"
 self.bundle = bundle
+self.__hgClient = self.vcs.getClient()
 self.contents.setHtml(
 self.trUtf8('<b>Processing your request, please wait...</b>'))
 self.process.finished.connect(self.__procFinished)
 """
 Private slot implementing a close event handler.
 @param e close event (QCloseEvent)
 """
-if self.process is not None and \
+if self.__hgClient:
-self.process.state() != QProcess.NotRunning:
+self.__hgClient.cancel()
-self.process.terminate()
+else:
-QTimer.singleShot(2000, self.process.kill)
+if self.process is not None and \
-self.process.waitForFinished(3000)
+self.process.state() != QProcess.NotRunning:
+self.process.terminate()
+QTimer.singleShot(2000, self.process.kill)
+self.process.waitForFinished(3000)
 e.accept()
 def start(self, fn, noEntries=0):
 """
 self.repodir = os.path.dirname(self.repodir)
 if self.repodir == os.sep:
 return
 self.projectMode = (self.fname == "." and self.dname == self.repodir)
-self.process.kill()
 self.activateWindow()
 self.raise_()
 args = []
 args.append('--bundle')
 args.append(self.vcs.bundleFile)
 if not self.projectMode:
 args.append(self.filename)
-self.process.setWorkingDirectory(self.repodir)
+if self.__hgClient:
-self.process.start('hg', args)
-procStarted = self.process.waitForStarted()
-if not procStarted:
 self.inputGroup.setEnabled(False)
-E5MessageBox.critical(self,
+self.inputGroup.hide()
-self.trUtf8('Process Generation Error'),
-self.trUtf8(
+out, err = self.__hgClient.runcommand(args)
-'The process {0} could not be started. '
-'Ensure, that it is in the search path.'
+if out:
-).format('hg'))
+for line in out.splitlines(True):
+self.__processOutputLine(line)
+if err:
+self.__showError(err)
+self.__finish()
+else:
+self.process.kill()
+self.process.setWorkingDirectory(self.repodir)
+self.process.start('hg', args)
+procStarted = self.process.waitForStarted()
+if not procStarted:
+self.inputGroup.setEnabled(False)
+E5MessageBox.critical(self,
+self.trUtf8('Process Generation Error'),
+self.trUtf8(
+'The process {0} could not be started. '
+'Ensure, that it is in the search path.'
+).format('hg'))
 def __getParents(self, rev):
 """
 Private method to get the parents of the currently viewed file/directory.
 @return list of parent revisions (list of strings)
 """
 errMsg = ""
 parents = []
-process = QProcess()
 args = []
 args.append("parents")
 if self.mode == "incoming":
 if self.bundle:
 args.append("--repository")
 args.append("-r")
 args.append(rev)
 if not self.projectMode:
 args.append(self.filename)
-process.setWorkingDirectory(self.repodir)
+output = ""
-process.start('hg', args)
+if self.__hgClient:
-procStarted = process.waitForStarted()
+output, errMsg = self.__hgClient.runcommand(args)
-if procStarted:
+else:
-finished = process.waitForFinished(30000)
+process = QProcess()
-if finished and process.exitCode() == 0:
+process.setWorkingDirectory(self.repodir)
-output = \
+process.start('hg', args)
-str(process.readAllStandardOutput(),
+procStarted = process.waitForStarted()
-Preferences.getSystem("IOEncoding"),
+if procStarted:
-'replace')
+finished = process.waitForFinished(30000)
-parents = [p for p in output.strip().splitlines()]
+if finished and process.exitCode() == 0:
+output = \
+str(process.readAllStandardOutput(),
+Preferences.getSystem("IOEncoding"),
+'replace')
+else:
+if not finished:
+errMsg = self.trUtf8("The hg process did not finish within 30s.")
 else:
-if not finished:
+errMsg = self.trUtf8("Could not start the hg executable.")
-errMsg = self.trUtf8("The hg process did not finish within 30s.")
-else:
-errMsg = self.trUtf8("Could not start the hg executable.")
 if errMsg:
 E5MessageBox.critical(self,
 self.trUtf8("Mercurial Error"),
 errMsg)
+if output:
+parents = [p for p in output.strip().splitlines()]
 return parents
 def __procFinished(self, exitCode, exitStatus):
 """
 Private slot connected to the finished signal.
 @param exitCode exit code of the process (integer)
 @param exitStatus exit status of the process (QProcess.ExitStatus)
+"""
+self.__finish()
+def __finish(self):
+"""
+Private slot called when the process finished or the user pressed the button.
 """
 self.inputGroup.setEnabled(False)
 self.inputGroup.hide()
 self.contents.clear()
 while self.process.canReadLine():
 s = str(self.process.readLine(),
 Preferences.getSystem("IOEncoding"),
 'replace')
+self.__processOutputLine(s)
-if s == "@@@\n":
-self.logEntries.append(self.lastLogEntry)
+def __processOutputLine(self, line):
-self.lastLogEntry = {}
+"""
-self.fileCopies = {}
+Private method to process the lines of output.
+@param line output line to be processed (string)
+"""
+if line == "@@@\n":
+self.logEntries.append(self.lastLogEntry)
+self.lastLogEntry = {}
+self.fileCopies = {}
+else:
+try:
+key, value = line.split("|", 1)
+except ValueError:
+key = ""
+value = line
+if key == "change":
+self.endInitialText = True
+if key in ("change", "branches", "tags", "parents", "user",
+"date", "file_copies", "file_adds", "files_mods",
+"file_dels", "bookmarks"):
+self.lastLogEntry[key] = value.strip()
+elif key == "description":
+self.lastLogEntry[key] = [value.strip()]
 else:
-try:
+if self.endInitialText:
-key, value = s.split("|", 1)
+self.lastLogEntry["description"].append(value.strip())
-except ValueError:
-key = ""
-value = s
-if key == "change":
-self.endInitialText = True
-if key in ("change", "branches", "tags", "parents", "user",
-"date", "file_copies", "file_adds", "files_mods",
-"file_dels", "bookmarks"):
-self.lastLogEntry[key] = value.strip()
-elif key == "description":
-self.lastLogEntry[key] = [value.strip()]
 else:
-if self.endInitialText:
+self.initialText.append(value)
-self.lastLogEntry["description"].append(value.strip())
-else:
-self.initialText.append(value)
 def __readStderr(self):
 """
 Private slot to handle the readyReadStandardError signal.
 It reads the error output of the process and inserts it into the
 error pane.
 """
 if self.process is not None:
-self.errorGroup.show()
 s = str(self.process.readAllStandardError(),
 Preferences.getSystem("IOEncoding"),
 'replace')
-self.errors.insertPlainText(s)
+self.__showError(s)
-self.errors.ensureCursorVisible()
+def __showError(self, out):
+"""
+Private slot to show some error.
+@param out error to be shown (string)
+"""
+self.errorGroup.show()
+self.errors.insertPlainText(out)
+self.errors.ensureCursorVisible()
 def __sourceChanged(self, url):
 """
 Private slot to handle the sourceChanged signal of the contents pane.

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py

Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py