Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/git.py
src/eric7/Plugins/VcsPlugins/vcsGit/git.py
- branch
- eric7
- changeset 9620
- 9563c83ce83d
- parent 9617
- 6a32a62e55e7
- child 9624
- b47dfa7a137d
equal
deleted
inserted
replaced
| 9619:7033f25b1462 | 9620:9563c83ce83d |
|---|---|
| 91 self.userEditor = None | 91 self.userEditor = None |
| 92 self.bisectlogBrowser = None | 92 self.bisectlogBrowser = None |
| 93 self.bisectReplayEditor = None | 93 self.bisectReplayEditor = None |
| 94 self.patchStatisticsDialog = None | 94 self.patchStatisticsDialog = None |
| 95 self.submoduleStatusDialog = None | 95 self.submoduleStatusDialog = None |
| 96 self.worktreeDialog = None | |
| 96 | 97 |
| 97 self.__lastBundlePath = None | 98 self.__lastBundlePath = None |
| 98 self.__lastReplayPath = None | 99 self.__lastReplayPath = None |
| 99 | 100 |
| 100 self.statusCache = {} | 101 self.statusCache = {} |
| 150 self.userEditor.close() | 151 self.userEditor.close() |
| 151 if self.patchStatisticsDialog is not None: | 152 if self.patchStatisticsDialog is not None: |
| 152 self.patchStatisticsDialog.close() | 153 self.patchStatisticsDialog.close() |
| 153 if self.submoduleStatusDialog is not None: | 154 if self.submoduleStatusDialog is not None: |
| 154 self.submoduleStatusDialog.close() | 155 self.submoduleStatusDialog.close() |
| 156 if self.worktreeDialog is not None: | |
| 157 self.worktreeDialog.close() | |
| 155 | 158 |
| 156 # shut down the project helpers | 159 # shut down the project helpers |
| 157 if self.__projectHelper is not None: | 160 if self.__projectHelper is not None: |
| 158 self.__projectHelper.shutdown() | 161 self.__projectHelper.shutdown() |
| 159 | 162 |
| 4249 res = dia.startProcess(args, repodir) | 4252 res = dia.startProcess(args, repodir) |
| 4250 if res: | 4253 if res: |
| 4251 dia.exec() | 4254 dia.exec() |
| 4252 | 4255 |
| 4253 ########################################################################### | 4256 ########################################################################### |
| 4257 ## Methods for worktree management are below.. | |
| 4258 ########################################################################### | |
| 4259 | |
| 4260 def gitWorktreeManagement(self, projectDir): | |
| 4261 """ | |
| 4262 Public method to show the worktree list/management dialog. | |
| 4263 | |
| 4264 @param projectDir name of the project directory | |
| 4265 @type str | |
| 4266 """ | |
| 4267 from .GitWorktreeDialog import GitWorktreeDialog | |
| 4268 | |
| 4269 if self.worktreeDialog is None: | |
| 4270 self.worktreeDialog = GitWorktreeDialog(self) | |
| 4271 self.worktreeDialog.show() | |
| 4272 self.worktreeDialog.raise_() | |
| 4273 self.worktreeDialog.start(projectDir) | |
| 4274 | |
| 4275 ########################################################################### | |
| 4254 ## Methods to get the helper objects are below. | 4276 ## Methods to get the helper objects are below. |
| 4255 ########################################################################### | 4277 ########################################################################### |
| 4256 | 4278 |
| 4257 def vcsGetProjectBrowserHelper(self, browser, project, isTranslationsBrowser=False): | 4279 def vcsGetProjectBrowserHelper(self, browser, project, isTranslationsBrowser=False): |
| 4258 """ | 4280 """ |
