Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/subversion.py
Plugins/VcsPlugins/vcsSubversion/subversion.py
- branch
- Py2 comp.
- changeset 2791
- a9577f248f04
- parent 2525
- 8b507a9a2d40
- parent 2771
- 281c9b30dd91
- child 2847
- 1843ef6e2656
equal
deleted
inserted
replaced
| 2790:6686a3326df8 | 2791:a9577f248f04 |
|---|---|
| 150 errMsg = "" | 150 errMsg = "" |
| 151 ioEncoding = Preferences.getSystem("IOEncoding") | 151 ioEncoding = Preferences.getSystem("IOEncoding") |
| 152 | 152 |
| 153 process = QProcess() | 153 process = QProcess() |
| 154 process.start('svn', ['--version']) | 154 process.start('svn', ['--version']) |
| 155 procStarted = process.waitForStarted() | 155 procStarted = process.waitForStarted(5000) |
| 156 if procStarted: | 156 if procStarted: |
| 157 finished = process.waitForFinished(30000) | 157 finished = process.waitForFinished(30000) |
| 158 if finished and process.exitCode() == 0: | 158 if finished and process.exitCode() == 0: |
| 159 output = \ | 159 output = \ |
| 160 str(process.readAllStandardOutput(), ioEncoding, 'replace') | 160 str(process.readAllStandardOutput(), ioEncoding, 'replace') |
| 1267 args.append('status') | 1267 args.append('status') |
| 1268 args.append('--verbose') | 1268 args.append('--verbose') |
| 1269 args.append('--non-interactive') | 1269 args.append('--non-interactive') |
| 1270 args.append(dname) | 1270 args.append(dname) |
| 1271 process.start('svn', args) | 1271 process.start('svn', args) |
| 1272 procStarted = process.waitForStarted() | 1272 procStarted = process.waitForStarted(5000) |
| 1273 if procStarted: | 1273 if procStarted: |
| 1274 finished = process.waitForFinished(30000) | 1274 finished = process.waitForFinished(30000) |
| 1275 if finished and process.exitCode() == 0: | 1275 if finished and process.exitCode() == 0: |
| 1276 output = \ | 1276 output = \ |
| 1277 str(process.readAllStandardOutput(), ioEncoding, 'replace') | 1277 str(process.readAllStandardOutput(), ioEncoding, 'replace') |
| 1332 args.append('status') | 1332 args.append('status') |
| 1333 args.append('--verbose') | 1333 args.append('--verbose') |
| 1334 args.append('--non-interactive') | 1334 args.append('--non-interactive') |
| 1335 args.append(dname) | 1335 args.append(dname) |
| 1336 process.start('svn', args) | 1336 process.start('svn', args) |
| 1337 procStarted = process.waitForStarted() | 1337 procStarted = process.waitForStarted(5000) |
| 1338 if procStarted: | 1338 if procStarted: |
| 1339 finished = process.waitForFinished(30000) | 1339 finished = process.waitForFinished(30000) |
| 1340 if finished and process.exitCode() == 0: | 1340 if finished and process.exitCode() == 0: |
| 1341 output = \ | 1341 output = \ |
| 1342 str(process.readAllStandardOutput(), ioEncoding, 'replace') | 1342 str(process.readAllStandardOutput(), ioEncoding, 'replace') |
| 1477 args.append('info') | 1477 args.append('info') |
| 1478 args.append('--non-interactive') | 1478 args.append('--non-interactive') |
| 1479 args.append('--xml') | 1479 args.append('--xml') |
| 1480 args.append(ppath) | 1480 args.append(ppath) |
| 1481 process.start('svn', args) | 1481 process.start('svn', args) |
| 1482 procStarted = process.waitForStarted() | 1482 procStarted = process.waitForStarted(5000) |
| 1483 if procStarted: | 1483 if procStarted: |
| 1484 finished = process.waitForFinished(30000) | 1484 finished = process.waitForFinished(30000) |
| 1485 if finished and process.exitCode() == 0: | 1485 if finished and process.exitCode() == 0: |
| 1486 output = str(process.readAllStandardOutput(), ioEncoding, 'replace') | 1486 output = str(process.readAllStandardOutput(), ioEncoding, 'replace') |
| 1487 entryFound = False | 1487 entryFound = False |
| 1552 args.append('info') | 1552 args.append('info') |
| 1553 args.append('--xml') | 1553 args.append('--xml') |
| 1554 args.append('--non-interactive') | 1554 args.append('--non-interactive') |
| 1555 args.append(path) | 1555 args.append(path) |
| 1556 process.start('svn', args) | 1556 process.start('svn', args) |
| 1557 procStarted = process.waitForStarted() | 1557 procStarted = process.waitForStarted(5000) |
| 1558 if procStarted: | 1558 if procStarted: |
| 1559 finished = process.waitForFinished(30000) | 1559 finished = process.waitForFinished(30000) |
| 1560 if finished and process.exitCode() == 0: | 1560 if finished and process.exitCode() == 0: |
| 1561 output = str(process.readAllStandardOutput(), ioEncoding, 'replace') | 1561 output = str(process.readAllStandardOutput(), ioEncoding, 'replace') |
| 1562 for line in output.splitlines(): | 1562 for line in output.splitlines(): |
| 1950 self.repoBrowser.show() | 1950 self.repoBrowser.show() |
| 1951 self.repoBrowser.start(url) | 1951 self.repoBrowser.start(url) |
| 1952 | 1952 |
| 1953 def svnRemoveFromChangelist(self, names): | 1953 def svnRemoveFromChangelist(self, names): |
| 1954 """ | 1954 """ |
| 1955 Public method to remove a file or directory from it's changelist. | 1955 Public method to remove a file or directory from its changelist. |
| 1956 | 1956 |
| 1957 Note: Directories will be removed recursively. | 1957 Note: Directories will be removed recursively. |
| 1958 | 1958 |
| 1959 @param names name or list of names of file or directory to remove | 1959 @param names name or list of names of file or directory to remove |
| 1960 (string) | 1960 (string) |
| 2042 | 2042 |
| 2043 ppath = e5App().getObject("Project").getProjectPath() | 2043 ppath = e5App().getObject("Project").getProjectPath() |
| 2044 process = QProcess() | 2044 process = QProcess() |
| 2045 process.setWorkingDirectory(ppath) | 2045 process.setWorkingDirectory(ppath) |
| 2046 process.start('svn', args) | 2046 process.start('svn', args) |
| 2047 procStarted = process.waitForStarted() | 2047 procStarted = process.waitForStarted(5000) |
| 2048 if procStarted: | 2048 if procStarted: |
| 2049 finished = process.waitForFinished(30000) | 2049 finished = process.waitForFinished(30000) |
| 2050 if finished and process.exitCode() == 0: | 2050 if finished and process.exitCode() == 0: |
| 2051 output = \ | 2051 output = \ |
| 2052 str(process.readAllStandardOutput(), | 2052 str(process.readAllStandardOutput(), |
