Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgClient.py
Plugins/VcsPlugins/vcsMercurial/HgClient.py
- branch
- Py2 comp.
- changeset 2847
- 1843ef6e2656
- parent 2791
- a9577f248f04
- parent 2816
- 05aab5164d64
- child 3057
- 10516539f238
equal
deleted
inserted
replaced
| 2846:b852fe4d153a | 2847:1843ef6e2656 |
|---|---|
| 13 pass | 13 pass |
| 14 | 14 |
| 15 import struct | 15 import struct |
| 16 import io | 16 import io |
| 17 | 17 |
| 18 from PyQt4.QtCore import QProcess, QProcessEnvironment, QObject, QByteArray, \ | 18 from PyQt4.QtCore import QProcess, QObject, QByteArray, QCoreApplication, QThread |
| 19 QCoreApplication, QThread | |
| 20 from PyQt4.QtGui import QDialog | 19 from PyQt4.QtGui import QDialog |
| 20 | |
| 21 from .HgUtilities import prepareProcess | |
| 21 | 22 |
| 22 import Preferences | 23 import Preferences |
| 23 | 24 |
| 24 | 25 |
| 25 class HgClient(QObject): | 26 class HgClient(QObject): |
| 76 self.__server.setWorkingDirectory(self.__repoPath) | 77 self.__server.setWorkingDirectory(self.__repoPath) |
| 77 | 78 |
| 78 # connect signals | 79 # connect signals |
| 79 self.__server.finished.connect(self.__serverFinished) | 80 self.__server.finished.connect(self.__serverFinished) |
| 80 | 81 |
| 81 # set the encoding for the server | 82 prepareProcess(self.__server, self.__encoding) |
| 82 if self.__encoding: | |
| 83 env = QProcessEnvironment.systemEnvironment() | |
| 84 env.insert("HGENCODING", self.__encoding) | |
| 85 self.__server.setProcessEnvironment(env) | |
| 86 | 83 |
| 87 self.__server.start('hg', self.__serverArgs) | 84 self.__server.start('hg', self.__serverArgs) |
| 88 serverStarted = self.__server.waitForStarted(5000) | 85 serverStarted = self.__server.waitForStarted(5000) |
| 89 if not serverStarted: | 86 if not serverStarted: |
| 90 return False, self.trUtf8( | 87 return False, self.trUtf8( |
