Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 2962
- d6c9d1ca2da4
- parent 2844
- a61ee61b1c2c
- child 2974
- 4312c5a2bcd3
equal
deleted
inserted
replaced
| 2961:e4e2efb4846a | 2962:d6c9d1ca2da4 |
|---|---|
| 1252 """ | 1252 """ |
| 1253 Public method to get a dialog to enter repository info. | 1253 Public method to get a dialog to enter repository info. |
| 1254 | 1254 |
| 1255 @param project reference to the project object | 1255 @param project reference to the project object |
| 1256 @param archive name of the project in the repository (string) | 1256 @param archive name of the project in the repository (string) |
| 1257 @param editable flag indicating that the project name is editable (boolean) | 1257 @param editable flag indicating that the project name is editable |
| 1258 (boolean) | |
| 1258 @param parent parent widget (QWidget) | 1259 @param parent parent widget (QWidget) |
| 1260 @return reference to the instantiated options dialog (HgOptionsDialog) | |
| 1259 """ | 1261 """ |
| 1260 from .HgOptionsDialog import HgOptionsDialog | 1262 from .HgOptionsDialog import HgOptionsDialog |
| 1261 return HgOptionsDialog(self, project, parent) | 1263 return HgOptionsDialog(self, project, parent) |
| 1262 | 1264 |
| 1263 def vcsNewProjectOptionsDialog(self, parent=None): | 1265 def vcsNewProjectOptionsDialog(self, parent=None): |
| 1264 """ | 1266 """ |
| 1265 Public method to get a dialog to enter repository info for getting a new project. | 1267 Public method to get a dialog to enter repository info for getting a |
| 1268 new project. | |
| 1266 | 1269 |
| 1267 @param parent parent widget (QWidget) | 1270 @param parent parent widget (QWidget) |
| 1271 @return reference to the instantiated options dialog | |
| 1272 (HgNewProjectOptionsDialog) | |
| 1268 """ | 1273 """ |
| 1269 from .HgNewProjectOptionsDialog import HgNewProjectOptionsDialog | 1274 from .HgNewProjectOptionsDialog import HgNewProjectOptionsDialog |
| 1270 return HgNewProjectOptionsDialog(self, parent) | 1275 return HgNewProjectOptionsDialog(self, parent) |
| 1271 | 1276 |
| 1272 def vcsRepositoryInfos(self, ppath): | 1277 def vcsRepositoryInfos(self, ppath): |
| 1685 side-by-side. | 1690 side-by-side. |
| 1686 | 1691 |
| 1687 @param name file name to be diffed (string) | 1692 @param name file name to be diffed (string) |
| 1688 @keyparam extended flag indicating the extended variant (boolean) | 1693 @keyparam extended flag indicating the extended variant (boolean) |
| 1689 @keyparam revisions tuple of two revisions (tuple of strings) | 1694 @keyparam revisions tuple of two revisions (tuple of strings) |
| 1695 @exception ValueError raised to indicate an invalid name parameter | |
| 1690 """ | 1696 """ |
| 1691 if isinstance(name, list): | 1697 if isinstance(name, list): |
| 1692 raise ValueError("Wrong parameter type") | 1698 raise ValueError("Wrong parameter type") |
| 1693 | 1699 |
| 1694 if extended: | 1700 if extended: |
| 1983 # find the root of the repo | 1989 # find the root of the repo |
| 1984 repodir = dname | 1990 repodir = dname |
| 1985 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1991 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1986 repodir = os.path.dirname(repodir) | 1992 repodir = os.path.dirname(repodir) |
| 1987 if os.path.splitdrive(repodir)[1] == os.sep: | 1993 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1988 return False | 1994 return |
| 1989 | 1995 |
| 1990 dia = HgDialog(self.trUtf8('Resolving files/directories'), self) | 1996 dia = HgDialog(self.trUtf8('Resolving files/directories'), self) |
| 1991 res = dia.startProcess(args, repodir) | 1997 res = dia.startProcess(args, repodir) |
| 1992 if res: | 1998 if res: |
| 1993 dia.exec_() | 1999 dia.exec_() |
| 2458 Public method to perform bisect commands. | 2464 Public method to perform bisect commands. |
| 2459 | 2465 |
| 2460 @param name file/directory name (string) | 2466 @param name file/directory name (string) |
| 2461 @param subcommand name of the subcommand (string, one of 'good', 'bad', | 2467 @param subcommand name of the subcommand (string, one of 'good', 'bad', |
| 2462 'skip' or 'reset') | 2468 'skip' or 'reset') |
| 2469 @exception ValueError raised to indicate an invalid bisect subcommand | |
| 2463 """ | 2470 """ |
| 2464 if subcommand not in ("good", "bad", "skip", "reset"): | 2471 if subcommand not in ("good", "bad", "skip", "reset"): |
| 2465 raise ValueError( | 2472 raise ValueError( |
| 2466 self.trUtf8("Bisect subcommand ({0}) invalid.").format(subcommand)) | 2473 self.trUtf8("Bisect subcommand ({0}) invalid.").format(subcommand)) |
| 2467 | 2474 |
| 2739 | 2746 |
| 2740 @param name directory name of the project to export from (string) | 2747 @param name directory name of the project to export from (string) |
| 2741 @param data tuple giving phase data (list of revisions, phase, flag | 2748 @param data tuple giving phase data (list of revisions, phase, flag |
| 2742 indicating a forced operation) (list of strings, string, boolean) | 2749 indicating a forced operation) (list of strings, string, boolean) |
| 2743 @return flag indicating success (boolean) | 2750 @return flag indicating success (boolean) |
| 2751 @exception ValueError raised to indicate an invalid phase | |
| 2744 """ | 2752 """ |
| 2745 dname, fname = self.splitPath(name) | 2753 dname, fname = self.splitPath(name) |
| 2746 | 2754 |
| 2747 # find the root of the repo | 2755 # find the root of the repo |
| 2748 repodir = dname | 2756 repodir = dname |
| 3187 | 3195 |
| 3188 def _createStatusMonitorThread(self, interval, project): | 3196 def _createStatusMonitorThread(self, interval, project): |
| 3189 """ | 3197 """ |
| 3190 Protected method to create an instance of the VCS status monitor thread. | 3198 Protected method to create an instance of the VCS status monitor thread. |
| 3191 | 3199 |
| 3200 @param interval check interval for the monitor thread in seconds (integer) | |
| 3192 @param project reference to the project object (Project) | 3201 @param project reference to the project object (Project) |
| 3193 @param interval check interval for the monitor thread in seconds (integer) | |
| 3194 @return reference to the monitor thread (QThread) | 3202 @return reference to the monitor thread (QThread) |
| 3195 """ | 3203 """ |
| 3196 from .HgStatusMonitorThread import HgStatusMonitorThread | 3204 from .HgStatusMonitorThread import HgStatusMonitorThread |
| 3197 return HgStatusMonitorThread(interval, project, self) | 3205 return HgStatusMonitorThread(interval, project, self) |
