Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py
Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py
- changeset 945
- 8cd4d08fa9f6
- parent 791
- 9ec2ac20e54e
- child 1509
- c0b5e693b0eb
equal
deleted
inserted
replaced
| 944:1b59c4ba121e | 945:8cd4d08fa9f6 |
|---|---|
| 11 | 11 |
| 12 from VCS.StatusMonitorThread import VcsStatusMonitorThread | 12 from VCS.StatusMonitorThread import VcsStatusMonitorThread |
| 13 | 13 |
| 14 import Preferences | 14 import Preferences |
| 15 | 15 |
| 16 | |
| 16 class SvnStatusMonitorThread(VcsStatusMonitorThread): | 17 class SvnStatusMonitorThread(VcsStatusMonitorThread): |
| 17 """ | 18 """ |
| 18 Class implementing the VCS status monitor thread class for Subversion. | 19 Class implementing the VCS status monitor thread class for Subversion. |
| 19 """ | 20 """ |
| 20 def __init__(self, interval, project, vcs, parent = None): | 21 def __init__(self, interval, project, vcs, parent=None): |
| 21 """ | 22 """ |
| 22 Constructor | 23 Constructor |
| 23 | 24 |
| 24 @param interval new interval in seconds (integer) | 25 @param interval new interval in seconds (integer) |
| 25 @param project reference to the project object (Project) | 26 @param project reference to the project object (Project) |
| 50 <li>"U" path needs an update</li> | 51 <li>"U" path needs an update</li> |
| 51 <li>"Z" path contains a conflict</li> | 52 <li>"Z" path contains a conflict</li> |
| 52 <li>" " path is back at normal</li> | 53 <li>" " path is back at normal</li> |
| 53 </ul> | 54 </ul> |
| 54 | 55 |
| 55 @return tuple of flag indicating successful operation (boolean) and | 56 @return tuple of flag indicating successful operation (boolean) and |
| 56 a status message in case of non successful operation (string) | 57 a status message in case of non successful operation (string) |
| 57 """ | 58 """ |
| 58 self.shouldUpdate = False | 59 self.shouldUpdate = False |
| 59 | 60 |
| 60 process = QProcess() | 61 process = QProcess() |
| 107 self.trUtf8("Subversion status checked successfully (using svn)") | 108 self.trUtf8("Subversion status checked successfully (using svn)") |
| 108 else: | 109 else: |
| 109 process.kill() | 110 process.kill() |
| 110 process.waitForFinished() | 111 process.waitForFinished() |
| 111 return False, \ | 112 return False, \ |
| 112 str(process.readAllStandardError(), | 113 str(process.readAllStandardError(), |
| 113 Preferences.getSystem("IOEncoding"), | 114 Preferences.getSystem("IOEncoding"), |
| 114 'replace') | 115 'replace') |
| 115 else: | 116 else: |
| 116 process.kill() | 117 process.kill() |
| 117 process.waitForFinished() | 118 process.waitForFinished() |
| 118 return False, self.trUtf8("Could not start the Subversion process.") | 119 return False, self.trUtf8("Could not start the Subversion process.") |
