Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 2771
- 281c9b30dd91
- parent 2718
- af0ba4c4bea6
- child 2791
- a9577f248f04
- child 2811
- 7b2ec3af3505
equal
deleted
inserted
replaced
| 2770:fd5ee85f0450 | 2771:281c9b30dd91 |
|---|---|
| 197 errMsg = "" | 197 errMsg = "" |
| 198 ioEncoding = Preferences.getSystem("IOEncoding") | 198 ioEncoding = Preferences.getSystem("IOEncoding") |
| 199 | 199 |
| 200 process = QProcess() | 200 process = QProcess() |
| 201 process.start('hg', ['version']) | 201 process.start('hg', ['version']) |
| 202 procStarted = process.waitForStarted() | 202 procStarted = process.waitForStarted(5000) |
| 203 if procStarted: | 203 if procStarted: |
| 204 finished = process.waitForFinished(30000) | 204 finished = process.waitForFinished(30000) |
| 205 if finished and process.exitCode() == 0: | 205 if finished and process.exitCode() == 0: |
| 206 output = \ | 206 output = \ |
| 207 str(process.readAllStandardOutput(), ioEncoding, 'replace') | 207 str(process.readAllStandardOutput(), ioEncoding, 'replace') |
| 1033 output = "" | 1033 output = "" |
| 1034 if self.__client is None: | 1034 if self.__client is None: |
| 1035 process = QProcess() | 1035 process = QProcess() |
| 1036 process.setWorkingDirectory(repodir) | 1036 process.setWorkingDirectory(repodir) |
| 1037 process.start('hg', args) | 1037 process.start('hg', args) |
| 1038 procStarted = process.waitForStarted() | 1038 procStarted = process.waitForStarted(5000) |
| 1039 if procStarted: | 1039 if procStarted: |
| 1040 finished = process.waitForFinished(30000) | 1040 finished = process.waitForFinished(30000) |
| 1041 if finished and process.exitCode() == 0: | 1041 if finished and process.exitCode() == 0: |
| 1042 output = \ | 1042 output = \ |
| 1043 str(process.readAllStandardOutput(), | 1043 str(process.readAllStandardOutput(), |
| 1102 output = "" | 1102 output = "" |
| 1103 if self.__client is None: | 1103 if self.__client is None: |
| 1104 process = QProcess() | 1104 process = QProcess() |
| 1105 process.setWorkingDirectory(dname) | 1105 process.setWorkingDirectory(dname) |
| 1106 process.start('hg', args) | 1106 process.start('hg', args) |
| 1107 procStarted = process.waitForStarted() | 1107 procStarted = process.waitForStarted(5000) |
| 1108 if procStarted: | 1108 if procStarted: |
| 1109 finished = process.waitForFinished(30000) | 1109 finished = process.waitForFinished(30000) |
| 1110 if finished and process.exitCode() == 0: | 1110 if finished and process.exitCode() == 0: |
| 1111 output = \ | 1111 output = \ |
| 1112 str(process.readAllStandardOutput(), | 1112 str(process.readAllStandardOutput(), |
| 1261 output = "" | 1261 output = "" |
| 1262 if self.__client is None: | 1262 if self.__client is None: |
| 1263 process = QProcess() | 1263 process = QProcess() |
| 1264 process.setWorkingDirectory(ppath) | 1264 process.setWorkingDirectory(ppath) |
| 1265 process.start('hg', args) | 1265 process.start('hg', args) |
| 1266 procStarted = process.waitForStarted() | 1266 procStarted = process.waitForStarted(5000) |
| 1267 if procStarted: | 1267 if procStarted: |
| 1268 finished = process.waitForFinished(30000) | 1268 finished = process.waitForFinished(30000) |
| 1269 if finished and process.exitCode() == 0: | 1269 if finished and process.exitCode() == 0: |
| 1270 output = str(process.readAllStandardOutput(), | 1270 output = str(process.readAllStandardOutput(), |
| 1271 Preferences.getSystem("IOEncoding"), 'replace') | 1271 Preferences.getSystem("IOEncoding"), 'replace') |
| 1309 | 1309 |
| 1310 output = "" | 1310 output = "" |
| 1311 if self.__client is None: | 1311 if self.__client is None: |
| 1312 process.setWorkingDirectory(ppath) | 1312 process.setWorkingDirectory(ppath) |
| 1313 process.start('hg', args) | 1313 process.start('hg', args) |
| 1314 procStarted = process.waitForStarted() | 1314 procStarted = process.waitForStarted(5000) |
| 1315 if procStarted: | 1315 if procStarted: |
| 1316 finished = process.waitForFinished(30000) | 1316 finished = process.waitForFinished(30000) |
| 1317 if finished and process.exitCode() == 0: | 1317 if finished and process.exitCode() == 0: |
| 1318 output = str(process.readAllStandardOutput(), | 1318 output = str(process.readAllStandardOutput(), |
| 1319 Preferences.getSystem("IOEncoding"), 'replace') | 1319 Preferences.getSystem("IOEncoding"), 'replace') |
| 1438 output = "" | 1438 output = "" |
| 1439 if self.__client is None: | 1439 if self.__client is None: |
| 1440 process = QProcess() | 1440 process = QProcess() |
| 1441 process.setWorkingDirectory(repodir) | 1441 process.setWorkingDirectory(repodir) |
| 1442 process.start('hg', args) | 1442 process.start('hg', args) |
| 1443 procStarted = process.waitForStarted() | 1443 procStarted = process.waitForStarted(5000) |
| 1444 if procStarted: | 1444 if procStarted: |
| 1445 finished = process.waitForFinished(30000) | 1445 finished = process.waitForFinished(30000) |
| 1446 if finished and process.exitCode() == 0: | 1446 if finished and process.exitCode() == 0: |
| 1447 output = \ | 1447 output = \ |
| 1448 str(process.readAllStandardOutput(), | 1448 str(process.readAllStandardOutput(), |
| 1480 output = "" | 1480 output = "" |
| 1481 if self.__client is None: | 1481 if self.__client is None: |
| 1482 process = QProcess() | 1482 process = QProcess() |
| 1483 process.setWorkingDirectory(repodir) | 1483 process.setWorkingDirectory(repodir) |
| 1484 process.start('hg', args) | 1484 process.start('hg', args) |
| 1485 procStarted = process.waitForStarted() | 1485 procStarted = process.waitForStarted(5000) |
| 1486 if procStarted: | 1486 if procStarted: |
| 1487 finished = process.waitForFinished(30000) | 1487 finished = process.waitForFinished(30000) |
| 1488 if finished and process.exitCode() == 0: | 1488 if finished and process.exitCode() == 0: |
| 1489 output = \ | 1489 output = \ |
| 1490 str(process.readAllStandardOutput(), | 1490 str(process.readAllStandardOutput(), |
| 1752 return | 1752 return |
| 1753 | 1753 |
| 1754 process = QProcess() | 1754 process = QProcess() |
| 1755 process.setWorkingDirectory(repodir) | 1755 process.setWorkingDirectory(repodir) |
| 1756 process.start('hg', args) | 1756 process.start('hg', args) |
| 1757 procStarted = process.waitForStarted() | 1757 procStarted = process.waitForStarted(5000) |
| 1758 if procStarted: | 1758 if procStarted: |
| 1759 finished = process.waitForFinished(30000) | 1759 finished = process.waitForFinished(30000) |
| 1760 if finished and process.exitCode() == 0: | 1760 if finished and process.exitCode() == 0: |
| 1761 output = str(process.readAllStandardOutput(), | 1761 output = str(process.readAllStandardOutput(), |
| 1762 Preferences.getSystem("IOEncoding"), 'replace') | 1762 Preferences.getSystem("IOEncoding"), 'replace') |
| 2900 | 2900 |
| 2901 output = "" | 2901 output = "" |
| 2902 if self.__client is None: | 2902 if self.__client is None: |
| 2903 process = QProcess() | 2903 process = QProcess() |
| 2904 process.start('hg', args) | 2904 process.start('hg', args) |
| 2905 procStarted = process.waitForStarted() | 2905 procStarted = process.waitForStarted(5000) |
| 2906 if procStarted: | 2906 if procStarted: |
| 2907 finished = process.waitForFinished(30000) | 2907 finished = process.waitForFinished(30000) |
| 2908 if finished and process.exitCode() == 0: | 2908 if finished and process.exitCode() == 0: |
| 2909 output = str(process.readAllStandardOutput(), | 2909 output = str(process.readAllStandardOutput(), |
| 2910 Preferences.getSystem("IOEncoding"), 'replace') | 2910 Preferences.getSystem("IOEncoding"), 'replace') |
