Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/subversion.py
Plugins/VcsPlugins/vcsSubversion/subversion.py
- changeset 3287
- c3d784c057b3
- parent 3190
- a9a94491c4fd
- child 3349
- 2a034a7f1f54
equal
deleted
inserted
replaced
| 3284:8f7d97997243 | 3287:c3d784c057b3 |
|---|---|
| 93 self.status = None | 93 self.status = None |
| 94 self.propList = None | 94 self.propList = None |
| 95 self.tagbranchList = None | 95 self.tagbranchList = None |
| 96 self.blame = None | 96 self.blame = None |
| 97 self.repoBrowser = None | 97 self.repoBrowser = None |
| 98 self.logBrowser = None | |
| 98 | 99 |
| 99 # regular expression object for evaluation of the status output | 100 # regular expression object for evaluation of the status output |
| 100 self.rx_status1 = QRegExp( | 101 self.rx_status1 = QRegExp( |
| 101 '(.{8})\\s+([0-9-]+)\\s+([0-9?]+)\\s+(\\S+)\\s+(.+)') | 102 '(.{8})\\s+([0-9-]+)\\s+([0-9?]+)\\s+(\\S+)\\s+(.+)') |
| 102 self.rx_status2 = QRegExp('(.{8})\\s+(.+)\\s*') | 103 self.rx_status2 = QRegExp('(.{8})\\s+(.+)\\s*') |
| 134 self.tagbranchList.close() | 135 self.tagbranchList.close() |
| 135 if self.blame is not None: | 136 if self.blame is not None: |
| 136 self.blame.close() | 137 self.blame.close() |
| 137 if self.repoBrowser is not None: | 138 if self.repoBrowser is not None: |
| 138 self.repoBrowser.close() | 139 self.repoBrowser.close() |
| 140 if self.logBrowser is not None: | |
| 141 self.logBrowser.close() | |
| 139 | 142 |
| 140 def vcsExists(self): | 143 def vcsExists(self): |
| 141 """ | 144 """ |
| 142 Public method used to test for the presence of the svn executable. | 145 Public method used to test for the presence of the svn executable. |
| 143 | 146 |
| 2035 Subversion repository. | 2038 Subversion repository. |
| 2036 | 2039 |
| 2037 @param path file/directory name to show the log of (string) | 2040 @param path file/directory name to show the log of (string) |
| 2038 @param isFile flag indicating log for a file is to be shown (boolean) | 2041 @param isFile flag indicating log for a file is to be shown (boolean) |
| 2039 """ | 2042 """ |
| 2040 from .SvnLogBrowserDialog import SvnLogBrowserDialog | 2043 if self.logBrowser is None: |
| 2041 self.logBrowser = SvnLogBrowserDialog(self, isFile=isFile) | 2044 from .SvnLogBrowserDialog import SvnLogBrowserDialog |
| 2045 self.logBrowser = SvnLogBrowserDialog(self) | |
| 2042 self.logBrowser.show() | 2046 self.logBrowser.show() |
| 2043 self.logBrowser.start(path) | 2047 self.logBrowser.start(path, isFile=isFile) |
| 2044 | 2048 |
| 2045 def svnLock(self, name, stealIt=False, parent=None): | 2049 def svnLock(self, name, stealIt=False, parent=None): |
| 2046 """ | 2050 """ |
| 2047 Public method used to lock a file in the Subversion repository. | 2051 Public method used to lock a file in the Subversion repository. |
| 2048 | 2052 |
