Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/subversion.py
Plugins/VcsPlugins/vcsPySvn/subversion.py
- changeset 2963
- 745d38097b7f
- parent 2845
- 7e55c6268c35
- child 3009
- bf5ae5d7477d
equal
deleted
inserted
replaced
| 2962:d6c9d1ca2da4 | 2963:745d38097b7f |
|---|---|
| 1604 """ | 1604 """ |
| 1605 Public method to get a dialog to enter repository info. | 1605 Public method to get a dialog to enter repository info. |
| 1606 | 1606 |
| 1607 @param project reference to the project object | 1607 @param project reference to the project object |
| 1608 @param archive name of the project in the repository (string) | 1608 @param archive name of the project in the repository (string) |
| 1609 @param editable flag indicating that the project name is editable (boolean) | 1609 @param editable flag indicating that the project name is editable |
| 1610 (boolean) | |
| 1610 @param parent parent widget (QWidget) | 1611 @param parent parent widget (QWidget) |
| 1612 @return reference to the instantiated options dialog (SvnOptionsDialog) | |
| 1611 """ | 1613 """ |
| 1612 from .SvnOptionsDialog import SvnOptionsDialog | 1614 from .SvnOptionsDialog import SvnOptionsDialog |
| 1613 return SvnOptionsDialog(self, project, parent) | 1615 return SvnOptionsDialog(self, project, parent) |
| 1614 | 1616 |
| 1615 def vcsNewProjectOptionsDialog(self, parent=None): | 1617 def vcsNewProjectOptionsDialog(self, parent=None): |
| 1616 """ | 1618 """ |
| 1617 Public method to get a dialog to enter repository info for getting a new project. | 1619 Public method to get a dialog to enter repository info for getting a |
| 1620 new project. | |
| 1618 | 1621 |
| 1619 @param parent parent widget (QWidget) | 1622 @param parent parent widget (QWidget) |
| 1623 @return reference to the instantiated options dialog | |
| 1624 (SvnNewProjectOptionsDialog) | |
| 1620 """ | 1625 """ |
| 1621 from .SvnNewProjectOptionsDialog import SvnNewProjectOptionsDialog | 1626 from .SvnNewProjectOptionsDialog import SvnNewProjectOptionsDialog |
| 1622 return SvnNewProjectOptionsDialog(self, parent) | 1627 return SvnNewProjectOptionsDialog(self, parent) |
| 1623 | 1628 |
| 1624 def vcsRepositoryInfos(self, ppath): | 1629 def vcsRepositoryInfos(self, ppath): |
| 2038 | 2043 |
| 2039 return output, error | 2044 return output, error |
| 2040 | 2045 |
| 2041 def svnSbsDiff(self, name, extended=False, revisions=None): | 2046 def svnSbsDiff(self, name, extended=False, revisions=None): |
| 2042 """ | 2047 """ |
| 2043 Public method used to view the difference of a file to the Mercurial repository | 2048 Public method used to view the difference of a file to the Mercurial |
| 2044 side-by-side. | 2049 repository side-by-side. |
| 2045 | 2050 |
| 2046 @param name file name to be diffed (string) | 2051 @param name file name to be diffed (string) |
| 2047 @keyparam extended flag indicating the extended variant (boolean) | 2052 @keyparam extended flag indicating the extended variant (boolean) |
| 2048 @keyparam revisions tuple of two revisions (tuple of strings) | 2053 @keyparam revisions tuple of two revisions (tuple of strings) |
| 2054 @exception ValueError raised to indicate an invalid name parameter type | |
| 2049 """ | 2055 """ |
| 2050 if isinstance(name, list): | 2056 if isinstance(name, list): |
| 2051 raise ValueError("Wrong parameter type") | 2057 raise ValueError("Wrong parameter type") |
| 2052 | 2058 |
| 2053 if extended: | 2059 if extended: |
| 2449 ## Status Monitor Thread methods | 2455 ## Status Monitor Thread methods |
| 2450 ############################################################################ | 2456 ############################################################################ |
| 2451 | 2457 |
| 2452 def _createStatusMonitorThread(self, interval, project): | 2458 def _createStatusMonitorThread(self, interval, project): |
| 2453 """ | 2459 """ |
| 2454 Protected method to create an instance of the VCS status monitor thread. | 2460 Protected method to create an instance of the VCS status monitor |
| 2455 | 2461 thread. |
| 2462 | |
| 2463 @param interval check interval for the monitor thread in seconds | |
| 2464 (integer) | |
| 2456 @param project reference to the project object | 2465 @param project reference to the project object |
| 2457 @param interval check interval for the monitor thread in seconds (integer) | |
| 2458 @return reference to the monitor thread (QThread) | 2466 @return reference to the monitor thread (QThread) |
| 2459 """ | 2467 """ |
| 2460 from .SvnStatusMonitorThread import SvnStatusMonitorThread | 2468 from .SvnStatusMonitorThread import SvnStatusMonitorThread |
| 2461 return SvnStatusMonitorThread(interval, project, self) | 2469 return SvnStatusMonitorThread(interval, project, self) |
