Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
- branch
- eric7
- changeset 8356
- 68ec9c3d4de5
- parent 8324
- 83084f088655
- child 8358
- 144a6b854f70
equal
deleted
inserted
replaced
| 8355:8a7677a63c8d | 8356:68ec9c3d4de5 |
|---|---|
| 9 | 9 |
| 10 import os | 10 import os |
| 11 | 11 |
| 12 from PyQt6.QtWidgets import QMenu, QToolBar | 12 from PyQt6.QtWidgets import QMenu, QToolBar |
| 13 | 13 |
| 14 from E5Gui import E5MessageBox | 14 from E5Gui import EricMessageBox |
| 15 from E5Gui.E5Application import e5App | 15 from E5Gui.EricApplication import ericApp |
| 16 | 16 |
| 17 from VCS.ProjectHelper import VcsProjectHelper | 17 from VCS.ProjectHelper import VcsProjectHelper |
| 18 | 18 |
| 19 from E5Gui.E5Action import E5Action | 19 from E5Gui.EricAction import EricAction |
| 20 | 20 |
| 21 import UI.PixmapCache | 21 import UI.PixmapCache |
| 22 import Preferences | 22 import Preferences |
| 23 | 23 |
| 24 | 24 |
| 101 | 101 |
| 102 def getActions(self): | 102 def getActions(self): |
| 103 """ | 103 """ |
| 104 Public method to get a list of all actions. | 104 Public method to get a list of all actions. |
| 105 | 105 |
| 106 @return list of all actions (list of E5Action) | 106 @return list of all actions (list of EricAction) |
| 107 """ | 107 """ |
| 108 actions = self.actions[:] | 108 actions = self.actions[:] |
| 109 for extension in self.__extensions.values(): | 109 for extension in self.__extensions.values(): |
| 110 actions.extend(extension.getActions()) | 110 actions.extend(extension.getActions()) |
| 111 return actions | 111 return actions |
| 112 | 112 |
| 113 def initActions(self): | 113 def initActions(self): |
| 114 """ | 114 """ |
| 115 Public method to generate the action objects. | 115 Public method to generate the action objects. |
| 116 """ | 116 """ |
| 117 self.vcsNewAct = E5Action( | 117 self.vcsNewAct = EricAction( |
| 118 self.tr('New from repository'), | 118 self.tr('New from repository'), |
| 119 UI.PixmapCache.getIcon("vcsCheckout"), | 119 UI.PixmapCache.getIcon("vcsCheckout"), |
| 120 self.tr('&New from repository...'), 0, 0, | 120 self.tr('&New from repository...'), 0, 0, |
| 121 self, 'mercurial_new') | 121 self, 'mercurial_new') |
| 122 self.vcsNewAct.setStatusTip(self.tr( | 122 self.vcsNewAct.setStatusTip(self.tr( |
| 128 """a Mercurial repository.</p>""" | 128 """a Mercurial repository.</p>""" |
| 129 )) | 129 )) |
| 130 self.vcsNewAct.triggered.connect(self._vcsCheckout) | 130 self.vcsNewAct.triggered.connect(self._vcsCheckout) |
| 131 self.actions.append(self.vcsNewAct) | 131 self.actions.append(self.vcsNewAct) |
| 132 | 132 |
| 133 self.hgIncomingAct = E5Action( | 133 self.hgIncomingAct = EricAction( |
| 134 self.tr('Show incoming log'), | 134 self.tr('Show incoming log'), |
| 135 UI.PixmapCache.getIcon("vcsUpdate"), | 135 UI.PixmapCache.getIcon("vcsUpdate"), |
| 136 self.tr('Show incoming log'), | 136 self.tr('Show incoming log'), |
| 137 0, 0, self, 'mercurial_incoming') | 137 0, 0, self, 'mercurial_incoming') |
| 138 self.hgIncomingAct.setStatusTip(self.tr( | 138 self.hgIncomingAct.setStatusTip(self.tr( |
| 144 """ repository.</p>""" | 144 """ repository.</p>""" |
| 145 )) | 145 )) |
| 146 self.hgIncomingAct.triggered.connect(self.__hgIncoming) | 146 self.hgIncomingAct.triggered.connect(self.__hgIncoming) |
| 147 self.actions.append(self.hgIncomingAct) | 147 self.actions.append(self.hgIncomingAct) |
| 148 | 148 |
| 149 self.hgPullAct = E5Action( | 149 self.hgPullAct = EricAction( |
| 150 self.tr('Pull changes'), | 150 self.tr('Pull changes'), |
| 151 UI.PixmapCache.getIcon("vcsUpdate"), | 151 UI.PixmapCache.getIcon("vcsUpdate"), |
| 152 self.tr('Pull changes'), | 152 self.tr('Pull changes'), |
| 153 0, 0, self, 'mercurial_pull') | 153 0, 0, self, 'mercurial_pull') |
| 154 self.hgPullAct.setStatusTip(self.tr( | 154 self.hgPullAct.setStatusTip(self.tr( |
| 160 """local repository.</p>""" | 160 """local repository.</p>""" |
| 161 )) | 161 )) |
| 162 self.hgPullAct.triggered.connect(self.__hgPull) | 162 self.hgPullAct.triggered.connect(self.__hgPull) |
| 163 self.actions.append(self.hgPullAct) | 163 self.actions.append(self.hgPullAct) |
| 164 | 164 |
| 165 self.vcsUpdateAct = E5Action( | 165 self.vcsUpdateAct = EricAction( |
| 166 self.tr('Update from repository'), | 166 self.tr('Update from repository'), |
| 167 UI.PixmapCache.getIcon("vcsUpdate"), | 167 UI.PixmapCache.getIcon("vcsUpdate"), |
| 168 self.tr('&Update from repository'), 0, 0, self, | 168 self.tr('&Update from repository'), 0, 0, self, |
| 169 'mercurial_update') | 169 'mercurial_update') |
| 170 self.vcsUpdateAct.setStatusTip(self.tr( | 170 self.vcsUpdateAct.setStatusTip(self.tr( |
| 176 """ repository.</p>""" | 176 """ repository.</p>""" |
| 177 )) | 177 )) |
| 178 self.vcsUpdateAct.triggered.connect(self._vcsUpdate) | 178 self.vcsUpdateAct.triggered.connect(self._vcsUpdate) |
| 179 self.actions.append(self.vcsUpdateAct) | 179 self.actions.append(self.vcsUpdateAct) |
| 180 | 180 |
| 181 self.vcsCommitAct = E5Action( | 181 self.vcsCommitAct = EricAction( |
| 182 self.tr('Commit changes to repository'), | 182 self.tr('Commit changes to repository'), |
| 183 UI.PixmapCache.getIcon("vcsCommit"), | 183 UI.PixmapCache.getIcon("vcsCommit"), |
| 184 self.tr('&Commit changes to repository...'), 0, 0, self, | 184 self.tr('&Commit changes to repository...'), 0, 0, self, |
| 185 'mercurial_commit') | 185 'mercurial_commit') |
| 186 self.vcsCommitAct.setStatusTip(self.tr( | 186 self.vcsCommitAct.setStatusTip(self.tr( |
| 192 """Mercurial repository.</p>""" | 192 """Mercurial repository.</p>""" |
| 193 )) | 193 )) |
| 194 self.vcsCommitAct.triggered.connect(self._vcsCommit) | 194 self.vcsCommitAct.triggered.connect(self._vcsCommit) |
| 195 self.actions.append(self.vcsCommitAct) | 195 self.actions.append(self.vcsCommitAct) |
| 196 | 196 |
| 197 self.hgOutgoingAct = E5Action( | 197 self.hgOutgoingAct = EricAction( |
| 198 self.tr('Show outgoing log'), | 198 self.tr('Show outgoing log'), |
| 199 UI.PixmapCache.getIcon("vcsCommit"), | 199 UI.PixmapCache.getIcon("vcsCommit"), |
| 200 self.tr('Show outgoing log'), | 200 self.tr('Show outgoing log'), |
| 201 0, 0, self, 'mercurial_outgoing') | 201 0, 0, self, 'mercurial_outgoing') |
| 202 self.hgOutgoingAct.setStatusTip(self.tr( | 202 self.hgOutgoingAct.setStatusTip(self.tr( |
| 208 """ repository.</p>""" | 208 """ repository.</p>""" |
| 209 )) | 209 )) |
| 210 self.hgOutgoingAct.triggered.connect(self.__hgOutgoing) | 210 self.hgOutgoingAct.triggered.connect(self.__hgOutgoing) |
| 211 self.actions.append(self.hgOutgoingAct) | 211 self.actions.append(self.hgOutgoingAct) |
| 212 | 212 |
| 213 self.hgPushAct = E5Action( | 213 self.hgPushAct = EricAction( |
| 214 self.tr('Push changes'), | 214 self.tr('Push changes'), |
| 215 UI.PixmapCache.getIcon("vcsCommit"), | 215 UI.PixmapCache.getIcon("vcsCommit"), |
| 216 self.tr('Push changes'), | 216 self.tr('Push changes'), |
| 217 0, 0, self, 'mercurial_push') | 217 0, 0, self, 'mercurial_push') |
| 218 self.hgPushAct.setStatusTip(self.tr( | 218 self.hgPushAct.setStatusTip(self.tr( |
| 224 """remote repository.</p>""" | 224 """remote repository.</p>""" |
| 225 )) | 225 )) |
| 226 self.hgPushAct.triggered.connect(self.__hgPush) | 226 self.hgPushAct.triggered.connect(self.__hgPush) |
| 227 self.actions.append(self.hgPushAct) | 227 self.actions.append(self.hgPushAct) |
| 228 | 228 |
| 229 self.hgPushForcedAct = E5Action( | 229 self.hgPushForcedAct = EricAction( |
| 230 self.tr('Push changes (force)'), | 230 self.tr('Push changes (force)'), |
| 231 UI.PixmapCache.getIcon("vcsCommit"), | 231 UI.PixmapCache.getIcon("vcsCommit"), |
| 232 self.tr('Push changes (force)'), | 232 self.tr('Push changes (force)'), |
| 233 0, 0, self, 'mercurial_push_forced') | 233 0, 0, self, 'mercurial_push_forced') |
| 234 self.hgPushForcedAct.setStatusTip(self.tr( | 234 self.hgPushForcedAct.setStatusTip(self.tr( |
| 240 """remote repository using the 'force' option.</p>""" | 240 """remote repository using the 'force' option.</p>""" |
| 241 )) | 241 )) |
| 242 self.hgPushForcedAct.triggered.connect(self.__hgPushForced) | 242 self.hgPushForcedAct.triggered.connect(self.__hgPushForced) |
| 243 self.actions.append(self.hgPushForcedAct) | 243 self.actions.append(self.hgPushForcedAct) |
| 244 | 244 |
| 245 self.vcsExportAct = E5Action( | 245 self.vcsExportAct = EricAction( |
| 246 self.tr('Export from repository'), | 246 self.tr('Export from repository'), |
| 247 UI.PixmapCache.getIcon("vcsExport"), | 247 UI.PixmapCache.getIcon("vcsExport"), |
| 248 self.tr('&Export from repository...'), | 248 self.tr('&Export from repository...'), |
| 249 0, 0, self, 'mercurial_export_repo') | 249 0, 0, self, 'mercurial_export_repo') |
| 250 self.vcsExportAct.setStatusTip(self.tr( | 250 self.vcsExportAct.setStatusTip(self.tr( |
| 255 """<p>This exports a project from the repository.</p>""" | 255 """<p>This exports a project from the repository.</p>""" |
| 256 )) | 256 )) |
| 257 self.vcsExportAct.triggered.connect(self._vcsExport) | 257 self.vcsExportAct.triggered.connect(self._vcsExport) |
| 258 self.actions.append(self.vcsExportAct) | 258 self.actions.append(self.vcsExportAct) |
| 259 | 259 |
| 260 self.hgLogBrowserAct = E5Action( | 260 self.hgLogBrowserAct = EricAction( |
| 261 self.tr('Show log browser'), | 261 self.tr('Show log browser'), |
| 262 UI.PixmapCache.getIcon("vcsLog"), | 262 UI.PixmapCache.getIcon("vcsLog"), |
| 263 self.tr('Show log browser'), | 263 self.tr('Show log browser'), |
| 264 0, 0, self, 'mercurial_log_browser') | 264 0, 0, self, 'mercurial_log_browser') |
| 265 self.hgLogBrowserAct.setStatusTip(self.tr( | 265 self.hgLogBrowserAct.setStatusTip(self.tr( |
| 272 """ More can be retrieved later on.</p>""" | 272 """ More can be retrieved later on.</p>""" |
| 273 )) | 273 )) |
| 274 self.hgLogBrowserAct.triggered.connect(self._vcsLogBrowser) | 274 self.hgLogBrowserAct.triggered.connect(self._vcsLogBrowser) |
| 275 self.actions.append(self.hgLogBrowserAct) | 275 self.actions.append(self.hgLogBrowserAct) |
| 276 | 276 |
| 277 self.vcsDiffAct = E5Action( | 277 self.vcsDiffAct = EricAction( |
| 278 self.tr('Show differences'), | 278 self.tr('Show differences'), |
| 279 UI.PixmapCache.getIcon("vcsDiff"), | 279 UI.PixmapCache.getIcon("vcsDiff"), |
| 280 self.tr('Show &difference'), | 280 self.tr('Show &difference'), |
| 281 0, 0, self, 'mercurial_diff') | 281 0, 0, self, 'mercurial_diff') |
| 282 self.vcsDiffAct.setStatusTip(self.tr( | 282 self.vcsDiffAct.setStatusTip(self.tr( |
| 288 """ repository.</p>""" | 288 """ repository.</p>""" |
| 289 )) | 289 )) |
| 290 self.vcsDiffAct.triggered.connect(self._vcsDiff) | 290 self.vcsDiffAct.triggered.connect(self._vcsDiff) |
| 291 self.actions.append(self.vcsDiffAct) | 291 self.actions.append(self.vcsDiffAct) |
| 292 | 292 |
| 293 self.hgExtDiffAct = E5Action( | 293 self.hgExtDiffAct = EricAction( |
| 294 self.tr('Show differences (extended)'), | 294 self.tr('Show differences (extended)'), |
| 295 UI.PixmapCache.getIcon("vcsDiff"), | 295 UI.PixmapCache.getIcon("vcsDiff"), |
| 296 self.tr('Show differences (extended)'), | 296 self.tr('Show differences (extended)'), |
| 297 0, 0, self, 'mercurial_extendeddiff') | 297 0, 0, self, 'mercurial_extendeddiff') |
| 298 self.hgExtDiffAct.setStatusTip(self.tr( | 298 self.hgExtDiffAct.setStatusTip(self.tr( |
| 304 """ project.</p>""" | 304 """ project.</p>""" |
| 305 )) | 305 )) |
| 306 self.hgExtDiffAct.triggered.connect(self.__hgExtendedDiff) | 306 self.hgExtDiffAct.triggered.connect(self.__hgExtendedDiff) |
| 307 self.actions.append(self.hgExtDiffAct) | 307 self.actions.append(self.hgExtDiffAct) |
| 308 | 308 |
| 309 self.vcsStatusAct = E5Action( | 309 self.vcsStatusAct = EricAction( |
| 310 self.tr('Show status'), | 310 self.tr('Show status'), |
| 311 UI.PixmapCache.getIcon("vcsStatus"), | 311 UI.PixmapCache.getIcon("vcsStatus"), |
| 312 self.tr('Show &status...'), | 312 self.tr('Show &status...'), |
| 313 0, 0, self, 'mercurial_status') | 313 0, 0, self, 'mercurial_status') |
| 314 self.vcsStatusAct.setStatusTip(self.tr( | 314 self.vcsStatusAct.setStatusTip(self.tr( |
| 319 """<p>This shows the status of the local project.</p>""" | 319 """<p>This shows the status of the local project.</p>""" |
| 320 )) | 320 )) |
| 321 self.vcsStatusAct.triggered.connect(self._vcsStatus) | 321 self.vcsStatusAct.triggered.connect(self._vcsStatus) |
| 322 self.actions.append(self.vcsStatusAct) | 322 self.actions.append(self.vcsStatusAct) |
| 323 | 323 |
| 324 self.hgSummaryAct = E5Action( | 324 self.hgSummaryAct = EricAction( |
| 325 self.tr('Show Summary'), | 325 self.tr('Show Summary'), |
| 326 UI.PixmapCache.getIcon("vcsSummary"), | 326 UI.PixmapCache.getIcon("vcsSummary"), |
| 327 self.tr('Show summary...'), | 327 self.tr('Show summary...'), |
| 328 0, 0, self, 'mercurial_summary') | 328 0, 0, self, 'mercurial_summary') |
| 329 self.hgSummaryAct.setStatusTip(self.tr( | 329 self.hgSummaryAct.setStatusTip(self.tr( |
| 335 """ directory status.</p>""" | 335 """ directory status.</p>""" |
| 336 )) | 336 )) |
| 337 self.hgSummaryAct.triggered.connect(self.__hgSummary) | 337 self.hgSummaryAct.triggered.connect(self.__hgSummary) |
| 338 self.actions.append(self.hgSummaryAct) | 338 self.actions.append(self.hgSummaryAct) |
| 339 | 339 |
| 340 self.hgHeadsAct = E5Action( | 340 self.hgHeadsAct = EricAction( |
| 341 self.tr('Show heads'), | 341 self.tr('Show heads'), |
| 342 self.tr('Show heads'), | 342 self.tr('Show heads'), |
| 343 0, 0, self, 'mercurial_heads') | 343 0, 0, self, 'mercurial_heads') |
| 344 self.hgHeadsAct.setStatusTip(self.tr( | 344 self.hgHeadsAct.setStatusTip(self.tr( |
| 345 'Show the heads of the repository' | 345 'Show the heads of the repository' |
| 349 """<p>This shows the heads of the repository.</p>""" | 349 """<p>This shows the heads of the repository.</p>""" |
| 350 )) | 350 )) |
| 351 self.hgHeadsAct.triggered.connect(self.__hgHeads) | 351 self.hgHeadsAct.triggered.connect(self.__hgHeads) |
| 352 self.actions.append(self.hgHeadsAct) | 352 self.actions.append(self.hgHeadsAct) |
| 353 | 353 |
| 354 self.hgParentsAct = E5Action( | 354 self.hgParentsAct = EricAction( |
| 355 self.tr('Show parents'), | 355 self.tr('Show parents'), |
| 356 self.tr('Show parents'), | 356 self.tr('Show parents'), |
| 357 0, 0, self, 'mercurial_parents') | 357 0, 0, self, 'mercurial_parents') |
| 358 self.hgParentsAct.setStatusTip(self.tr( | 358 self.hgParentsAct.setStatusTip(self.tr( |
| 359 'Show the parents of the repository' | 359 'Show the parents of the repository' |
| 363 """<p>This shows the parents of the repository.</p>""" | 363 """<p>This shows the parents of the repository.</p>""" |
| 364 )) | 364 )) |
| 365 self.hgParentsAct.triggered.connect(self.__hgParents) | 365 self.hgParentsAct.triggered.connect(self.__hgParents) |
| 366 self.actions.append(self.hgParentsAct) | 366 self.actions.append(self.hgParentsAct) |
| 367 | 367 |
| 368 self.hgTipAct = E5Action( | 368 self.hgTipAct = EricAction( |
| 369 self.tr('Show tip'), | 369 self.tr('Show tip'), |
| 370 self.tr('Show tip'), | 370 self.tr('Show tip'), |
| 371 0, 0, self, 'mercurial_tip') | 371 0, 0, self, 'mercurial_tip') |
| 372 self.hgTipAct.setStatusTip(self.tr( | 372 self.hgTipAct.setStatusTip(self.tr( |
| 373 'Show the tip of the repository' | 373 'Show the tip of the repository' |
| 377 """<p>This shows the tip of the repository.</p>""" | 377 """<p>This shows the tip of the repository.</p>""" |
| 378 )) | 378 )) |
| 379 self.hgTipAct.triggered.connect(self.__hgTip) | 379 self.hgTipAct.triggered.connect(self.__hgTip) |
| 380 self.actions.append(self.hgTipAct) | 380 self.actions.append(self.hgTipAct) |
| 381 | 381 |
| 382 self.vcsRevertAct = E5Action( | 382 self.vcsRevertAct = EricAction( |
| 383 self.tr('Revert changes'), | 383 self.tr('Revert changes'), |
| 384 UI.PixmapCache.getIcon("vcsRevert"), | 384 UI.PixmapCache.getIcon("vcsRevert"), |
| 385 self.tr('Re&vert changes'), | 385 self.tr('Re&vert changes'), |
| 386 0, 0, self, 'mercurial_revert') | 386 0, 0, self, 'mercurial_revert') |
| 387 self.vcsRevertAct.setStatusTip(self.tr( | 387 self.vcsRevertAct.setStatusTip(self.tr( |
| 392 """<p>This reverts all changes made to the local project.</p>""" | 392 """<p>This reverts all changes made to the local project.</p>""" |
| 393 )) | 393 )) |
| 394 self.vcsRevertAct.triggered.connect(self.__hgRevert) | 394 self.vcsRevertAct.triggered.connect(self.__hgRevert) |
| 395 self.actions.append(self.vcsRevertAct) | 395 self.actions.append(self.vcsRevertAct) |
| 396 | 396 |
| 397 self.vcsMergeAct = E5Action( | 397 self.vcsMergeAct = EricAction( |
| 398 self.tr('Merge'), | 398 self.tr('Merge'), |
| 399 UI.PixmapCache.getIcon("vcsMerge"), | 399 UI.PixmapCache.getIcon("vcsMerge"), |
| 400 self.tr('Mer&ge changes...'), | 400 self.tr('Mer&ge changes...'), |
| 401 0, 0, self, 'mercurial_merge') | 401 0, 0, self, 'mercurial_merge') |
| 402 self.vcsMergeAct.setStatusTip(self.tr( | 402 self.vcsMergeAct.setStatusTip(self.tr( |
| 408 """ project.</p>""" | 408 """ project.</p>""" |
| 409 )) | 409 )) |
| 410 self.vcsMergeAct.triggered.connect(self._vcsMerge) | 410 self.vcsMergeAct.triggered.connect(self._vcsMerge) |
| 411 self.actions.append(self.vcsMergeAct) | 411 self.actions.append(self.vcsMergeAct) |
| 412 | 412 |
| 413 self.hgCommitMergeAct = E5Action( | 413 self.hgCommitMergeAct = EricAction( |
| 414 self.tr('Commit Merge'), | 414 self.tr('Commit Merge'), |
| 415 self.tr('Commit Merge'), | 415 self.tr('Commit Merge'), |
| 416 0, 0, self, 'mercurial_commit_merge') | 416 0, 0, self, 'mercurial_commit_merge') |
| 417 self.hgCommitMergeAct.setStatusTip(self.tr( | 417 self.hgCommitMergeAct.setStatusTip(self.tr( |
| 418 'Commit all the merged changes.' | 418 'Commit all the merged changes.' |
| 422 """<p>This commits a merge working directory</p>""" | 422 """<p>This commits a merge working directory</p>""" |
| 423 )) | 423 )) |
| 424 self.hgCommitMergeAct.triggered.connect(self.__hgCommitMerge) | 424 self.hgCommitMergeAct.triggered.connect(self.__hgCommitMerge) |
| 425 self.actions.append(self.hgCommitMergeAct) | 425 self.actions.append(self.hgCommitMergeAct) |
| 426 | 426 |
| 427 self.hgAbortMergeAct = E5Action( | 427 self.hgAbortMergeAct = EricAction( |
| 428 self.tr('Abort Merge'), | 428 self.tr('Abort Merge'), |
| 429 self.tr('Abort Merge'), | 429 self.tr('Abort Merge'), |
| 430 0, 0, self, 'mercurial_cancel_merge') | 430 0, 0, self, 'mercurial_cancel_merge') |
| 431 self.hgAbortMergeAct.setStatusTip(self.tr( | 431 self.hgAbortMergeAct.setStatusTip(self.tr( |
| 432 'Abort an uncommitted merge and lose all changes' | 432 'Abort an uncommitted merge and lose all changes' |
| 437 """ to be lost.</p>""" | 437 """ to be lost.</p>""" |
| 438 )) | 438 )) |
| 439 self.hgAbortMergeAct.triggered.connect(self.__hgAbortMerge) | 439 self.hgAbortMergeAct.triggered.connect(self.__hgAbortMerge) |
| 440 self.actions.append(self.hgAbortMergeAct) | 440 self.actions.append(self.hgAbortMergeAct) |
| 441 | 441 |
| 442 self.hgReMergeAct = E5Action( | 442 self.hgReMergeAct = EricAction( |
| 443 self.tr('Re-Merge'), | 443 self.tr('Re-Merge'), |
| 444 UI.PixmapCache.getIcon("vcsMerge"), | 444 UI.PixmapCache.getIcon("vcsMerge"), |
| 445 self.tr('Re-Merge'), | 445 self.tr('Re-Merge'), |
| 446 0, 0, self, 'mercurial_remerge') | 446 0, 0, self, 'mercurial_remerge') |
| 447 self.hgReMergeAct.setStatusTip(self.tr( | 447 self.hgReMergeAct.setStatusTip(self.tr( |
| 453 """ project discarding any previous merge attempt.</p>""" | 453 """ project discarding any previous merge attempt.</p>""" |
| 454 )) | 454 )) |
| 455 self.hgReMergeAct.triggered.connect(self.__hgReMerge) | 455 self.hgReMergeAct.triggered.connect(self.__hgReMerge) |
| 456 self.actions.append(self.hgReMergeAct) | 456 self.actions.append(self.hgReMergeAct) |
| 457 | 457 |
| 458 self.hgShowConflictsAct = E5Action( | 458 self.hgShowConflictsAct = EricAction( |
| 459 self.tr('Show conflicts'), | 459 self.tr('Show conflicts'), |
| 460 self.tr('Show conflicts...'), | 460 self.tr('Show conflicts...'), |
| 461 0, 0, self, 'mercurial_show_conflicts') | 461 0, 0, self, 'mercurial_show_conflicts') |
| 462 self.hgShowConflictsAct.setStatusTip(self.tr( | 462 self.hgShowConflictsAct.setStatusTip(self.tr( |
| 463 'Show a dialog listing all files with conflicts' | 463 'Show a dialog listing all files with conflicts' |
| 468 """ have conflicts.</p>""" | 468 """ have conflicts.</p>""" |
| 469 )) | 469 )) |
| 470 self.hgShowConflictsAct.triggered.connect(self.__hgShowConflicts) | 470 self.hgShowConflictsAct.triggered.connect(self.__hgShowConflicts) |
| 471 self.actions.append(self.hgShowConflictsAct) | 471 self.actions.append(self.hgShowConflictsAct) |
| 472 | 472 |
| 473 self.vcsResolveAct = E5Action( | 473 self.vcsResolveAct = EricAction( |
| 474 self.tr('Conflicts resolved'), | 474 self.tr('Conflicts resolved'), |
| 475 self.tr('Con&flicts resolved'), | 475 self.tr('Con&flicts resolved'), |
| 476 0, 0, self, 'mercurial_resolve') | 476 0, 0, self, 'mercurial_resolve') |
| 477 self.vcsResolveAct.setStatusTip(self.tr( | 477 self.vcsResolveAct.setStatusTip(self.tr( |
| 478 'Mark all conflicts of the local project as resolved' | 478 'Mark all conflicts of the local project as resolved' |
| 483 """ resolved.</p>""" | 483 """ resolved.</p>""" |
| 484 )) | 484 )) |
| 485 self.vcsResolveAct.triggered.connect(self.__hgResolved) | 485 self.vcsResolveAct.triggered.connect(self.__hgResolved) |
| 486 self.actions.append(self.vcsResolveAct) | 486 self.actions.append(self.vcsResolveAct) |
| 487 | 487 |
| 488 self.hgUnresolveAct = E5Action( | 488 self.hgUnresolveAct = EricAction( |
| 489 self.tr('Conflicts unresolved'), | 489 self.tr('Conflicts unresolved'), |
| 490 self.tr('Conflicts unresolved'), | 490 self.tr('Conflicts unresolved'), |
| 491 0, 0, self, 'mercurial_unresolve') | 491 0, 0, self, 'mercurial_unresolve') |
| 492 self.hgUnresolveAct.setStatusTip(self.tr( | 492 self.hgUnresolveAct.setStatusTip(self.tr( |
| 493 'Mark all conflicts of the local project as unresolved' | 493 'Mark all conflicts of the local project as unresolved' |
| 498 """ unresolved.</p>""" | 498 """ unresolved.</p>""" |
| 499 )) | 499 )) |
| 500 self.hgUnresolveAct.triggered.connect(self.__hgUnresolved) | 500 self.hgUnresolveAct.triggered.connect(self.__hgUnresolved) |
| 501 self.actions.append(self.hgUnresolveAct) | 501 self.actions.append(self.hgUnresolveAct) |
| 502 | 502 |
| 503 self.vcsTagAct = E5Action( | 503 self.vcsTagAct = EricAction( |
| 504 self.tr('Tag in repository'), | 504 self.tr('Tag in repository'), |
| 505 UI.PixmapCache.getIcon("vcsTag"), | 505 UI.PixmapCache.getIcon("vcsTag"), |
| 506 self.tr('&Tag in repository...'), | 506 self.tr('&Tag in repository...'), |
| 507 0, 0, self, 'mercurial_tag') | 507 0, 0, self, 'mercurial_tag') |
| 508 self.vcsTagAct.setStatusTip(self.tr( | 508 self.vcsTagAct.setStatusTip(self.tr( |
| 513 """<p>This tags the local project in the repository.</p>""" | 513 """<p>This tags the local project in the repository.</p>""" |
| 514 )) | 514 )) |
| 515 self.vcsTagAct.triggered.connect(self._vcsTag) | 515 self.vcsTagAct.triggered.connect(self._vcsTag) |
| 516 self.actions.append(self.vcsTagAct) | 516 self.actions.append(self.vcsTagAct) |
| 517 | 517 |
| 518 self.hgTagListAct = E5Action( | 518 self.hgTagListAct = EricAction( |
| 519 self.tr('List tags'), | 519 self.tr('List tags'), |
| 520 self.tr('List tags...'), | 520 self.tr('List tags...'), |
| 521 0, 0, self, 'mercurial_list_tags') | 521 0, 0, self, 'mercurial_list_tags') |
| 522 self.hgTagListAct.setStatusTip(self.tr( | 522 self.hgTagListAct.setStatusTip(self.tr( |
| 523 'List tags of the project' | 523 'List tags of the project' |
| 527 """<p>This lists the tags of the project.</p>""" | 527 """<p>This lists the tags of the project.</p>""" |
| 528 )) | 528 )) |
| 529 self.hgTagListAct.triggered.connect(self.__hgTagList) | 529 self.hgTagListAct.triggered.connect(self.__hgTagList) |
| 530 self.actions.append(self.hgTagListAct) | 530 self.actions.append(self.hgTagListAct) |
| 531 | 531 |
| 532 self.hgBranchListAct = E5Action( | 532 self.hgBranchListAct = EricAction( |
| 533 self.tr('List branches'), | 533 self.tr('List branches'), |
| 534 self.tr('List branches...'), | 534 self.tr('List branches...'), |
| 535 0, 0, self, 'mercurial_list_branches') | 535 0, 0, self, 'mercurial_list_branches') |
| 536 self.hgBranchListAct.setStatusTip(self.tr( | 536 self.hgBranchListAct.setStatusTip(self.tr( |
| 537 'List branches of the project' | 537 'List branches of the project' |
| 541 """<p>This lists the branches of the project.</p>""" | 541 """<p>This lists the branches of the project.</p>""" |
| 542 )) | 542 )) |
| 543 self.hgBranchListAct.triggered.connect(self.__hgBranchList) | 543 self.hgBranchListAct.triggered.connect(self.__hgBranchList) |
| 544 self.actions.append(self.hgBranchListAct) | 544 self.actions.append(self.hgBranchListAct) |
| 545 | 545 |
| 546 self.hgBranchAct = E5Action( | 546 self.hgBranchAct = EricAction( |
| 547 self.tr('Create branch'), | 547 self.tr('Create branch'), |
| 548 UI.PixmapCache.getIcon("vcsBranch"), | 548 UI.PixmapCache.getIcon("vcsBranch"), |
| 549 self.tr('Create &branch...'), | 549 self.tr('Create &branch...'), |
| 550 0, 0, self, 'mercurial_branch') | 550 0, 0, self, 'mercurial_branch') |
| 551 self.hgBranchAct.setStatusTip(self.tr( | 551 self.hgBranchAct.setStatusTip(self.tr( |
| 557 """in the repository.</p>""" | 557 """in the repository.</p>""" |
| 558 )) | 558 )) |
| 559 self.hgBranchAct.triggered.connect(self.__hgBranch) | 559 self.hgBranchAct.triggered.connect(self.__hgBranch) |
| 560 self.actions.append(self.hgBranchAct) | 560 self.actions.append(self.hgBranchAct) |
| 561 | 561 |
| 562 self.hgPushBranchAct = E5Action( | 562 self.hgPushBranchAct = EricAction( |
| 563 self.tr('Push new branch'), | 563 self.tr('Push new branch'), |
| 564 UI.PixmapCache.getIcon("vcsCommit"), | 564 UI.PixmapCache.getIcon("vcsCommit"), |
| 565 self.tr('Push new branch'), | 565 self.tr('Push new branch'), |
| 566 0, 0, self, 'mercurial_push_branch') | 566 0, 0, self, 'mercurial_push_branch') |
| 567 self.hgPushBranchAct.setStatusTip(self.tr( | 567 self.hgPushBranchAct.setStatusTip(self.tr( |
| 574 """ as a new named branch.</p>""" | 574 """ as a new named branch.</p>""" |
| 575 )) | 575 )) |
| 576 self.hgPushBranchAct.triggered.connect(self.__hgPushNewBranch) | 576 self.hgPushBranchAct.triggered.connect(self.__hgPushNewBranch) |
| 577 self.actions.append(self.hgPushBranchAct) | 577 self.actions.append(self.hgPushBranchAct) |
| 578 | 578 |
| 579 self.hgCloseBranchAct = E5Action( | 579 self.hgCloseBranchAct = EricAction( |
| 580 self.tr('Close branch'), | 580 self.tr('Close branch'), |
| 581 UI.PixmapCache.getIcon("closehead"), | 581 UI.PixmapCache.getIcon("closehead"), |
| 582 self.tr('Close branch'), | 582 self.tr('Close branch'), |
| 583 0, 0, self, 'mercurial_close_branch') | 583 0, 0, self, 'mercurial_close_branch') |
| 584 self.hgCloseBranchAct.setStatusTip(self.tr( | 584 self.hgCloseBranchAct.setStatusTip(self.tr( |
| 589 """<p>This closes the current branch of the local project.</p>""" | 589 """<p>This closes the current branch of the local project.</p>""" |
| 590 )) | 590 )) |
| 591 self.hgCloseBranchAct.triggered.connect(self.__hgCloseBranch) | 591 self.hgCloseBranchAct.triggered.connect(self.__hgCloseBranch) |
| 592 self.actions.append(self.hgCloseBranchAct) | 592 self.actions.append(self.hgCloseBranchAct) |
| 593 | 593 |
| 594 self.hgShowBranchAct = E5Action( | 594 self.hgShowBranchAct = EricAction( |
| 595 self.tr('Show current branch'), | 595 self.tr('Show current branch'), |
| 596 self.tr('Show current branch'), | 596 self.tr('Show current branch'), |
| 597 0, 0, self, 'mercurial_show_branch') | 597 0, 0, self, 'mercurial_show_branch') |
| 598 self.hgShowBranchAct.setStatusTip(self.tr( | 598 self.hgShowBranchAct.setStatusTip(self.tr( |
| 599 'Show the current branch of the project' | 599 'Show the current branch of the project' |
| 603 """<p>This shows the current branch of the project.</p>""" | 603 """<p>This shows the current branch of the project.</p>""" |
| 604 )) | 604 )) |
| 605 self.hgShowBranchAct.triggered.connect(self.__hgShowBranch) | 605 self.hgShowBranchAct.triggered.connect(self.__hgShowBranch) |
| 606 self.actions.append(self.hgShowBranchAct) | 606 self.actions.append(self.hgShowBranchAct) |
| 607 | 607 |
| 608 self.vcsSwitchAct = E5Action( | 608 self.vcsSwitchAct = EricAction( |
| 609 self.tr('Switch'), | 609 self.tr('Switch'), |
| 610 UI.PixmapCache.getIcon("vcsSwitch"), | 610 UI.PixmapCache.getIcon("vcsSwitch"), |
| 611 self.tr('S&witch...'), | 611 self.tr('S&witch...'), |
| 612 0, 0, self, 'mercurial_switch') | 612 0, 0, self, 'mercurial_switch') |
| 613 self.vcsSwitchAct.setStatusTip(self.tr( | 613 self.vcsSwitchAct.setStatusTip(self.tr( |
| 619 """ revision.</p>""" | 619 """ revision.</p>""" |
| 620 )) | 620 )) |
| 621 self.vcsSwitchAct.triggered.connect(self._vcsSwitch) | 621 self.vcsSwitchAct.triggered.connect(self._vcsSwitch) |
| 622 self.actions.append(self.vcsSwitchAct) | 622 self.actions.append(self.vcsSwitchAct) |
| 623 | 623 |
| 624 self.vcsCleanupAct = E5Action( | 624 self.vcsCleanupAct = EricAction( |
| 625 self.tr('Cleanup'), | 625 self.tr('Cleanup'), |
| 626 self.tr('Cleanu&p'), | 626 self.tr('Cleanu&p'), |
| 627 0, 0, self, 'mercurial_cleanup') | 627 0, 0, self, 'mercurial_cleanup') |
| 628 self.vcsCleanupAct.setStatusTip(self.tr( | 628 self.vcsCleanupAct.setStatusTip(self.tr( |
| 629 'Cleanup the local project' | 629 'Cleanup the local project' |
| 633 """<p>This performs a cleanup of the local project.</p>""" | 633 """<p>This performs a cleanup of the local project.</p>""" |
| 634 )) | 634 )) |
| 635 self.vcsCleanupAct.triggered.connect(self._vcsCleanup) | 635 self.vcsCleanupAct.triggered.connect(self._vcsCleanup) |
| 636 self.actions.append(self.vcsCleanupAct) | 636 self.actions.append(self.vcsCleanupAct) |
| 637 | 637 |
| 638 self.vcsCommandAct = E5Action( | 638 self.vcsCommandAct = EricAction( |
| 639 self.tr('Execute command'), | 639 self.tr('Execute command'), |
| 640 self.tr('E&xecute command...'), | 640 self.tr('E&xecute command...'), |
| 641 0, 0, self, 'mercurial_command') | 641 0, 0, self, 'mercurial_command') |
| 642 self.vcsCommandAct.setStatusTip(self.tr( | 642 self.vcsCommandAct.setStatusTip(self.tr( |
| 643 'Execute an arbitrary Mercurial command' | 643 'Execute an arbitrary Mercurial command' |
| 648 """ command.</p>""" | 648 """ command.</p>""" |
| 649 )) | 649 )) |
| 650 self.vcsCommandAct.triggered.connect(self._vcsCommand) | 650 self.vcsCommandAct.triggered.connect(self._vcsCommand) |
| 651 self.actions.append(self.vcsCommandAct) | 651 self.actions.append(self.vcsCommandAct) |
| 652 | 652 |
| 653 self.hgConfigAct = E5Action( | 653 self.hgConfigAct = EricAction( |
| 654 self.tr('Configure'), | 654 self.tr('Configure'), |
| 655 self.tr('Configure...'), | 655 self.tr('Configure...'), |
| 656 0, 0, self, 'mercurial_configure') | 656 0, 0, self, 'mercurial_configure') |
| 657 self.hgConfigAct.setStatusTip(self.tr( | 657 self.hgConfigAct.setStatusTip(self.tr( |
| 658 'Show the configuration dialog with the Mercurial page selected' | 658 'Show the configuration dialog with the Mercurial page selected' |
| 663 """ selected.</p>""" | 663 """ selected.</p>""" |
| 664 )) | 664 )) |
| 665 self.hgConfigAct.triggered.connect(self.__hgConfigure) | 665 self.hgConfigAct.triggered.connect(self.__hgConfigure) |
| 666 self.actions.append(self.hgConfigAct) | 666 self.actions.append(self.hgConfigAct) |
| 667 | 667 |
| 668 self.hgEditUserConfigAct = E5Action( | 668 self.hgEditUserConfigAct = EricAction( |
| 669 self.tr('Edit user configuration'), | 669 self.tr('Edit user configuration'), |
| 670 self.tr('Edit user configuration...'), | 670 self.tr('Edit user configuration...'), |
| 671 0, 0, self, 'mercurial_user_configure') | 671 0, 0, self, 'mercurial_user_configure') |
| 672 self.hgEditUserConfigAct.setStatusTip(self.tr( | 672 self.hgEditUserConfigAct.setStatusTip(self.tr( |
| 673 'Show an editor to edit the user configuration file' | 673 'Show an editor to edit the user configuration file' |
| 677 """<p>Show an editor to edit the user configuration file.</p>""" | 677 """<p>Show an editor to edit the user configuration file.</p>""" |
| 678 )) | 678 )) |
| 679 self.hgEditUserConfigAct.triggered.connect(self.__hgEditUserConfig) | 679 self.hgEditUserConfigAct.triggered.connect(self.__hgEditUserConfig) |
| 680 self.actions.append(self.hgEditUserConfigAct) | 680 self.actions.append(self.hgEditUserConfigAct) |
| 681 | 681 |
| 682 self.hgRepoConfigAct = E5Action( | 682 self.hgRepoConfigAct = EricAction( |
| 683 self.tr('Edit repository configuration'), | 683 self.tr('Edit repository configuration'), |
| 684 self.tr('Edit repository configuration...'), | 684 self.tr('Edit repository configuration...'), |
| 685 0, 0, self, 'mercurial_repo_configure') | 685 0, 0, self, 'mercurial_repo_configure') |
| 686 self.hgRepoConfigAct.setStatusTip(self.tr( | 686 self.hgRepoConfigAct.setStatusTip(self.tr( |
| 687 'Show an editor to edit the repository configuration file' | 687 'Show an editor to edit the repository configuration file' |
| 692 """ file.</p>""" | 692 """ file.</p>""" |
| 693 )) | 693 )) |
| 694 self.hgRepoConfigAct.triggered.connect(self.__hgEditRepoConfig) | 694 self.hgRepoConfigAct.triggered.connect(self.__hgEditRepoConfig) |
| 695 self.actions.append(self.hgRepoConfigAct) | 695 self.actions.append(self.hgRepoConfigAct) |
| 696 | 696 |
| 697 self.hgShowConfigAct = E5Action( | 697 self.hgShowConfigAct = EricAction( |
| 698 self.tr('Show combined configuration settings'), | 698 self.tr('Show combined configuration settings'), |
| 699 self.tr('Show combined configuration settings...'), | 699 self.tr('Show combined configuration settings...'), |
| 700 0, 0, self, 'mercurial_show_config') | 700 0, 0, self, 'mercurial_show_config') |
| 701 self.hgShowConfigAct.setStatusTip(self.tr( | 701 self.hgShowConfigAct.setStatusTip(self.tr( |
| 702 'Show the combined configuration settings from all configuration' | 702 'Show the combined configuration settings from all configuration' |
| 708 """ from all configuration files.</p>""" | 708 """ from all configuration files.</p>""" |
| 709 )) | 709 )) |
| 710 self.hgShowConfigAct.triggered.connect(self.__hgShowConfig) | 710 self.hgShowConfigAct.triggered.connect(self.__hgShowConfig) |
| 711 self.actions.append(self.hgShowConfigAct) | 711 self.actions.append(self.hgShowConfigAct) |
| 712 | 712 |
| 713 self.hgShowPathsAct = E5Action( | 713 self.hgShowPathsAct = EricAction( |
| 714 self.tr('Show paths'), | 714 self.tr('Show paths'), |
| 715 self.tr('Show paths...'), | 715 self.tr('Show paths...'), |
| 716 0, 0, self, 'mercurial_show_paths') | 716 0, 0, self, 'mercurial_show_paths') |
| 717 self.hgShowPathsAct.setStatusTip(self.tr( | 717 self.hgShowPathsAct.setStatusTip(self.tr( |
| 718 'Show the aliases for remote repositories' | 718 'Show the aliases for remote repositories' |
| 722 """<p>This shows the aliases for remote repositories.</p>""" | 722 """<p>This shows the aliases for remote repositories.</p>""" |
| 723 )) | 723 )) |
| 724 self.hgShowPathsAct.triggered.connect(self.__hgShowPaths) | 724 self.hgShowPathsAct.triggered.connect(self.__hgShowPaths) |
| 725 self.actions.append(self.hgShowPathsAct) | 725 self.actions.append(self.hgShowPathsAct) |
| 726 | 726 |
| 727 self.hgVerifyAct = E5Action( | 727 self.hgVerifyAct = EricAction( |
| 728 self.tr('Verify repository'), | 728 self.tr('Verify repository'), |
| 729 self.tr('Verify repository...'), | 729 self.tr('Verify repository...'), |
| 730 0, 0, self, 'mercurial_verify') | 730 0, 0, self, 'mercurial_verify') |
| 731 self.hgVerifyAct.setStatusTip(self.tr( | 731 self.hgVerifyAct.setStatusTip(self.tr( |
| 732 'Verify the integrity of the repository' | 732 'Verify the integrity of the repository' |
| 736 """<p>This verifies the integrity of the repository.</p>""" | 736 """<p>This verifies the integrity of the repository.</p>""" |
| 737 )) | 737 )) |
| 738 self.hgVerifyAct.triggered.connect(self.__hgVerify) | 738 self.hgVerifyAct.triggered.connect(self.__hgVerify) |
| 739 self.actions.append(self.hgVerifyAct) | 739 self.actions.append(self.hgVerifyAct) |
| 740 | 740 |
| 741 self.hgRecoverAct = E5Action( | 741 self.hgRecoverAct = EricAction( |
| 742 self.tr('Recover'), | 742 self.tr('Recover'), |
| 743 self.tr('Recover...'), | 743 self.tr('Recover...'), |
| 744 0, 0, self, 'mercurial_recover') | 744 0, 0, self, 'mercurial_recover') |
| 745 self.hgRecoverAct.setStatusTip(self.tr( | 745 self.hgRecoverAct.setStatusTip(self.tr( |
| 746 'Recover from an interrupted transaction' | 746 'Recover from an interrupted transaction' |
| 750 """<p>This recovers from an interrupted transaction.</p>""" | 750 """<p>This recovers from an interrupted transaction.</p>""" |
| 751 )) | 751 )) |
| 752 self.hgRecoverAct.triggered.connect(self.__hgRecover) | 752 self.hgRecoverAct.triggered.connect(self.__hgRecover) |
| 753 self.actions.append(self.hgRecoverAct) | 753 self.actions.append(self.hgRecoverAct) |
| 754 | 754 |
| 755 self.hgIdentifyAct = E5Action( | 755 self.hgIdentifyAct = EricAction( |
| 756 self.tr('Identify'), | 756 self.tr('Identify'), |
| 757 self.tr('Identify...'), | 757 self.tr('Identify...'), |
| 758 0, 0, self, 'mercurial_identify') | 758 0, 0, self, 'mercurial_identify') |
| 759 self.hgIdentifyAct.setStatusTip(self.tr( | 759 self.hgIdentifyAct.setStatusTip(self.tr( |
| 760 'Identify the project directory' | 760 'Identify the project directory' |
| 764 """<p>This identifies the project directory.</p>""" | 764 """<p>This identifies the project directory.</p>""" |
| 765 )) | 765 )) |
| 766 self.hgIdentifyAct.triggered.connect(self.__hgIdentify) | 766 self.hgIdentifyAct.triggered.connect(self.__hgIdentify) |
| 767 self.actions.append(self.hgIdentifyAct) | 767 self.actions.append(self.hgIdentifyAct) |
| 768 | 768 |
| 769 self.hgCreateIgnoreAct = E5Action( | 769 self.hgCreateIgnoreAct = EricAction( |
| 770 self.tr('Create .hgignore'), | 770 self.tr('Create .hgignore'), |
| 771 self.tr('Create .hgignore'), | 771 self.tr('Create .hgignore'), |
| 772 0, 0, self, 'mercurial_create ignore') | 772 0, 0, self, 'mercurial_create ignore') |
| 773 self.hgCreateIgnoreAct.setStatusTip(self.tr( | 773 self.hgCreateIgnoreAct.setStatusTip(self.tr( |
| 774 'Create a .hgignore file with default values' | 774 'Create a .hgignore file with default values' |
| 778 """<p>This creates a .hgignore file with default values.</p>""" | 778 """<p>This creates a .hgignore file with default values.</p>""" |
| 779 )) | 779 )) |
| 780 self.hgCreateIgnoreAct.triggered.connect(self.__hgCreateIgnore) | 780 self.hgCreateIgnoreAct.triggered.connect(self.__hgCreateIgnore) |
| 781 self.actions.append(self.hgCreateIgnoreAct) | 781 self.actions.append(self.hgCreateIgnoreAct) |
| 782 | 782 |
| 783 self.hgBundleAct = E5Action( | 783 self.hgBundleAct = EricAction( |
| 784 self.tr('Create changegroup'), | 784 self.tr('Create changegroup'), |
| 785 UI.PixmapCache.getIcon("vcsCreateChangegroup"), | 785 UI.PixmapCache.getIcon("vcsCreateChangegroup"), |
| 786 self.tr('Create changegroup...'), | 786 self.tr('Create changegroup...'), |
| 787 0, 0, self, 'mercurial_bundle') | 787 0, 0, self, 'mercurial_bundle') |
| 788 self.hgBundleAct.setStatusTip(self.tr( | 788 self.hgBundleAct.setStatusTip(self.tr( |
| 794 """ changesets (hg bundle).</p>""" | 794 """ changesets (hg bundle).</p>""" |
| 795 )) | 795 )) |
| 796 self.hgBundleAct.triggered.connect(self.__hgBundle) | 796 self.hgBundleAct.triggered.connect(self.__hgBundle) |
| 797 self.actions.append(self.hgBundleAct) | 797 self.actions.append(self.hgBundleAct) |
| 798 | 798 |
| 799 self.hgPreviewBundleAct = E5Action( | 799 self.hgPreviewBundleAct = EricAction( |
| 800 self.tr('Preview changegroup'), | 800 self.tr('Preview changegroup'), |
| 801 UI.PixmapCache.getIcon("vcsPreviewChangegroup"), | 801 UI.PixmapCache.getIcon("vcsPreviewChangegroup"), |
| 802 self.tr('Preview changegroup...'), | 802 self.tr('Preview changegroup...'), |
| 803 0, 0, self, 'mercurial_preview_bundle') | 803 0, 0, self, 'mercurial_preview_bundle') |
| 804 self.hgPreviewBundleAct.setStatusTip(self.tr( | 804 self.hgPreviewBundleAct.setStatusTip(self.tr( |
| 810 """ of changesets.</p>""" | 810 """ of changesets.</p>""" |
| 811 )) | 811 )) |
| 812 self.hgPreviewBundleAct.triggered.connect(self.__hgPreviewBundle) | 812 self.hgPreviewBundleAct.triggered.connect(self.__hgPreviewBundle) |
| 813 self.actions.append(self.hgPreviewBundleAct) | 813 self.actions.append(self.hgPreviewBundleAct) |
| 814 | 814 |
| 815 self.hgUnbundleAct = E5Action( | 815 self.hgUnbundleAct = EricAction( |
| 816 self.tr('Apply changegroups'), | 816 self.tr('Apply changegroups'), |
| 817 UI.PixmapCache.getIcon("vcsApplyChangegroup"), | 817 UI.PixmapCache.getIcon("vcsApplyChangegroup"), |
| 818 self.tr('Apply changegroups...'), | 818 self.tr('Apply changegroups...'), |
| 819 0, 0, self, 'mercurial_unbundle') | 819 0, 0, self, 'mercurial_unbundle') |
| 820 self.hgUnbundleAct.setStatusTip(self.tr( | 820 self.hgUnbundleAct.setStatusTip(self.tr( |
| 826 """ the 'Create changegroup' action (hg unbundle).</p>""" | 826 """ the 'Create changegroup' action (hg unbundle).</p>""" |
| 827 )) | 827 )) |
| 828 self.hgUnbundleAct.triggered.connect(self.__hgUnbundle) | 828 self.hgUnbundleAct.triggered.connect(self.__hgUnbundle) |
| 829 self.actions.append(self.hgUnbundleAct) | 829 self.actions.append(self.hgUnbundleAct) |
| 830 | 830 |
| 831 self.hgBisectGoodAct = E5Action( | 831 self.hgBisectGoodAct = EricAction( |
| 832 self.tr('Mark as "good"'), | 832 self.tr('Mark as "good"'), |
| 833 self.tr('Mark as "good"...'), | 833 self.tr('Mark as "good"...'), |
| 834 0, 0, self, 'mercurial_bisect_good') | 834 0, 0, self, 'mercurial_bisect_good') |
| 835 self.hgBisectGoodAct.setStatusTip(self.tr( | 835 self.hgBisectGoodAct.setStatusTip(self.tr( |
| 836 'Mark a selectable changeset as good' | 836 'Mark a selectable changeset as good' |
| 840 """<p>This marks a selectable changeset as good.</p>""" | 840 """<p>This marks a selectable changeset as good.</p>""" |
| 841 )) | 841 )) |
| 842 self.hgBisectGoodAct.triggered.connect(self.__hgBisectGood) | 842 self.hgBisectGoodAct.triggered.connect(self.__hgBisectGood) |
| 843 self.actions.append(self.hgBisectGoodAct) | 843 self.actions.append(self.hgBisectGoodAct) |
| 844 | 844 |
| 845 self.hgBisectBadAct = E5Action( | 845 self.hgBisectBadAct = EricAction( |
| 846 self.tr('Mark as "bad"'), | 846 self.tr('Mark as "bad"'), |
| 847 self.tr('Mark as "bad"...'), | 847 self.tr('Mark as "bad"...'), |
| 848 0, 0, self, 'mercurial_bisect_bad') | 848 0, 0, self, 'mercurial_bisect_bad') |
| 849 self.hgBisectBadAct.setStatusTip(self.tr( | 849 self.hgBisectBadAct.setStatusTip(self.tr( |
| 850 'Mark a selectable changeset as bad' | 850 'Mark a selectable changeset as bad' |
| 854 """<p>This marks a selectable changeset as bad.</p>""" | 854 """<p>This marks a selectable changeset as bad.</p>""" |
| 855 )) | 855 )) |
| 856 self.hgBisectBadAct.triggered.connect(self.__hgBisectBad) | 856 self.hgBisectBadAct.triggered.connect(self.__hgBisectBad) |
| 857 self.actions.append(self.hgBisectBadAct) | 857 self.actions.append(self.hgBisectBadAct) |
| 858 | 858 |
| 859 self.hgBisectSkipAct = E5Action( | 859 self.hgBisectSkipAct = EricAction( |
| 860 self.tr('Skip'), | 860 self.tr('Skip'), |
| 861 self.tr('Skip...'), | 861 self.tr('Skip...'), |
| 862 0, 0, self, 'mercurial_bisect_skip') | 862 0, 0, self, 'mercurial_bisect_skip') |
| 863 self.hgBisectSkipAct.setStatusTip(self.tr( | 863 self.hgBisectSkipAct.setStatusTip(self.tr( |
| 864 'Skip a selectable changeset' | 864 'Skip a selectable changeset' |
| 868 """<p>This skips a selectable changeset.</p>""" | 868 """<p>This skips a selectable changeset.</p>""" |
| 869 )) | 869 )) |
| 870 self.hgBisectSkipAct.triggered.connect(self.__hgBisectSkip) | 870 self.hgBisectSkipAct.triggered.connect(self.__hgBisectSkip) |
| 871 self.actions.append(self.hgBisectSkipAct) | 871 self.actions.append(self.hgBisectSkipAct) |
| 872 | 872 |
| 873 self.hgBisectResetAct = E5Action( | 873 self.hgBisectResetAct = EricAction( |
| 874 self.tr('Reset'), | 874 self.tr('Reset'), |
| 875 self.tr('Reset'), | 875 self.tr('Reset'), |
| 876 0, 0, self, 'mercurial_bisect_reset') | 876 0, 0, self, 'mercurial_bisect_reset') |
| 877 self.hgBisectResetAct.setStatusTip(self.tr( | 877 self.hgBisectResetAct.setStatusTip(self.tr( |
| 878 'Reset the bisect search data' | 878 'Reset the bisect search data' |
| 882 """<p>This resets the bisect search data.</p>""" | 882 """<p>This resets the bisect search data.</p>""" |
| 883 )) | 883 )) |
| 884 self.hgBisectResetAct.triggered.connect(self.__hgBisectReset) | 884 self.hgBisectResetAct.triggered.connect(self.__hgBisectReset) |
| 885 self.actions.append(self.hgBisectResetAct) | 885 self.actions.append(self.hgBisectResetAct) |
| 886 | 886 |
| 887 self.hgBackoutAct = E5Action( | 887 self.hgBackoutAct = EricAction( |
| 888 self.tr('Back out changeset'), | 888 self.tr('Back out changeset'), |
| 889 self.tr('Back out changeset'), | 889 self.tr('Back out changeset'), |
| 890 0, 0, self, 'mercurial_backout') | 890 0, 0, self, 'mercurial_backout') |
| 891 self.hgBackoutAct.setStatusTip(self.tr( | 891 self.hgBackoutAct.setStatusTip(self.tr( |
| 892 'Back out changes of an earlier changeset' | 892 'Back out changes of an earlier changeset' |
| 896 """<p>This backs out changes of an earlier changeset.</p>""" | 896 """<p>This backs out changes of an earlier changeset.</p>""" |
| 897 )) | 897 )) |
| 898 self.hgBackoutAct.triggered.connect(self.__hgBackout) | 898 self.hgBackoutAct.triggered.connect(self.__hgBackout) |
| 899 self.actions.append(self.hgBackoutAct) | 899 self.actions.append(self.hgBackoutAct) |
| 900 | 900 |
| 901 self.hgRollbackAct = E5Action( | 901 self.hgRollbackAct = EricAction( |
| 902 self.tr('Rollback last transaction'), | 902 self.tr('Rollback last transaction'), |
| 903 self.tr('Rollback last transaction'), | 903 self.tr('Rollback last transaction'), |
| 904 0, 0, self, 'mercurial_rollback') | 904 0, 0, self, 'mercurial_rollback') |
| 905 self.hgRollbackAct.setStatusTip(self.tr( | 905 self.hgRollbackAct.setStatusTip(self.tr( |
| 906 'Rollback the last transaction' | 906 'Rollback the last transaction' |
| 923 """ care. </strong></p>""" | 923 """ care. </strong></p>""" |
| 924 )) | 924 )) |
| 925 self.hgRollbackAct.triggered.connect(self.__hgRollback) | 925 self.hgRollbackAct.triggered.connect(self.__hgRollback) |
| 926 self.actions.append(self.hgRollbackAct) | 926 self.actions.append(self.hgRollbackAct) |
| 927 | 927 |
| 928 self.hgServeAct = E5Action( | 928 self.hgServeAct = EricAction( |
| 929 self.tr('Serve project repository'), | 929 self.tr('Serve project repository'), |
| 930 self.tr('Serve project repository...'), | 930 self.tr('Serve project repository...'), |
| 931 0, 0, self, 'mercurial_serve') | 931 0, 0, self, 'mercurial_serve') |
| 932 self.hgServeAct.setStatusTip(self.tr( | 932 self.hgServeAct.setStatusTip(self.tr( |
| 933 'Serve the project repository' | 933 'Serve the project repository' |
| 937 """<p>This serves the project repository.</p>""" | 937 """<p>This serves the project repository.</p>""" |
| 938 )) | 938 )) |
| 939 self.hgServeAct.triggered.connect(self.__hgServe) | 939 self.hgServeAct.triggered.connect(self.__hgServe) |
| 940 self.actions.append(self.hgServeAct) | 940 self.actions.append(self.hgServeAct) |
| 941 | 941 |
| 942 self.hgImportAct = E5Action( | 942 self.hgImportAct = EricAction( |
| 943 self.tr('Import Patch'), | 943 self.tr('Import Patch'), |
| 944 UI.PixmapCache.getIcon("vcsImportPatch"), | 944 UI.PixmapCache.getIcon("vcsImportPatch"), |
| 945 self.tr('Import Patch...'), | 945 self.tr('Import Patch...'), |
| 946 0, 0, self, 'mercurial_import') | 946 0, 0, self, 'mercurial_import') |
| 947 self.hgImportAct.setStatusTip(self.tr( | 947 self.hgImportAct.setStatusTip(self.tr( |
| 953 """ project.</p>""" | 953 """ project.</p>""" |
| 954 )) | 954 )) |
| 955 self.hgImportAct.triggered.connect(self.__hgImport) | 955 self.hgImportAct.triggered.connect(self.__hgImport) |
| 956 self.actions.append(self.hgImportAct) | 956 self.actions.append(self.hgImportAct) |
| 957 | 957 |
| 958 self.hgExportAct = E5Action( | 958 self.hgExportAct = EricAction( |
| 959 self.tr('Export Patches'), | 959 self.tr('Export Patches'), |
| 960 UI.PixmapCache.getIcon("vcsExportPatch"), | 960 UI.PixmapCache.getIcon("vcsExportPatch"), |
| 961 self.tr('Export Patches...'), | 961 self.tr('Export Patches...'), |
| 962 0, 0, self, 'mercurial_export') | 962 0, 0, self, 'mercurial_export') |
| 963 self.hgExportAct.setStatusTip(self.tr( | 963 self.hgExportAct.setStatusTip(self.tr( |
| 968 """<p>This exports revisions of the project to patch files.</p>""" | 968 """<p>This exports revisions of the project to patch files.</p>""" |
| 969 )) | 969 )) |
| 970 self.hgExportAct.triggered.connect(self.__hgExport) | 970 self.hgExportAct.triggered.connect(self.__hgExport) |
| 971 self.actions.append(self.hgExportAct) | 971 self.actions.append(self.hgExportAct) |
| 972 | 972 |
| 973 self.hgPhaseAct = E5Action( | 973 self.hgPhaseAct = EricAction( |
| 974 self.tr('Change Phase'), | 974 self.tr('Change Phase'), |
| 975 self.tr('Change Phase...'), | 975 self.tr('Change Phase...'), |
| 976 0, 0, self, 'mercurial_change_phase') | 976 0, 0, self, 'mercurial_change_phase') |
| 977 self.hgPhaseAct.setStatusTip(self.tr( | 977 self.hgPhaseAct.setStatusTip(self.tr( |
| 978 'Change the phase of revisions' | 978 'Change the phase of revisions' |
| 982 """<p>This changes the phase of revisions.</p>""" | 982 """<p>This changes the phase of revisions.</p>""" |
| 983 )) | 983 )) |
| 984 self.hgPhaseAct.triggered.connect(self.__hgPhase) | 984 self.hgPhaseAct.triggered.connect(self.__hgPhase) |
| 985 self.actions.append(self.hgPhaseAct) | 985 self.actions.append(self.hgPhaseAct) |
| 986 | 986 |
| 987 self.hgGraftAct = E5Action( | 987 self.hgGraftAct = EricAction( |
| 988 self.tr('Copy Changesets'), | 988 self.tr('Copy Changesets'), |
| 989 UI.PixmapCache.getIcon("vcsGraft"), | 989 UI.PixmapCache.getIcon("vcsGraft"), |
| 990 self.tr('Copy Changesets'), | 990 self.tr('Copy Changesets'), |
| 991 0, 0, self, 'mercurial_graft') | 991 0, 0, self, 'mercurial_graft') |
| 992 self.hgGraftAct.setStatusTip(self.tr( | 992 self.hgGraftAct.setStatusTip(self.tr( |
| 999 """ description of the original changeset.</p>""" | 999 """ description of the original changeset.</p>""" |
| 1000 )) | 1000 )) |
| 1001 self.hgGraftAct.triggered.connect(self.__hgGraft) | 1001 self.hgGraftAct.triggered.connect(self.__hgGraft) |
| 1002 self.actions.append(self.hgGraftAct) | 1002 self.actions.append(self.hgGraftAct) |
| 1003 | 1003 |
| 1004 self.hgGraftContinueAct = E5Action( | 1004 self.hgGraftContinueAct = EricAction( |
| 1005 self.tr('Continue Copying Session'), | 1005 self.tr('Continue Copying Session'), |
| 1006 self.tr('Continue Copying Session'), | 1006 self.tr('Continue Copying Session'), |
| 1007 0, 0, self, 'mercurial_graft_continue') | 1007 0, 0, self, 'mercurial_graft_continue') |
| 1008 self.hgGraftContinueAct.setStatusTip(self.tr( | 1008 self.hgGraftContinueAct.setStatusTip(self.tr( |
| 1009 'Continue the last copying session after conflicts were resolved' | 1009 'Continue the last copying session after conflicts were resolved' |
| 1014 """ were resolved.</p>""" | 1014 """ were resolved.</p>""" |
| 1015 )) | 1015 )) |
| 1016 self.hgGraftContinueAct.triggered.connect(self.__hgGraftContinue) | 1016 self.hgGraftContinueAct.triggered.connect(self.__hgGraftContinue) |
| 1017 self.actions.append(self.hgGraftContinueAct) | 1017 self.actions.append(self.hgGraftContinueAct) |
| 1018 | 1018 |
| 1019 self.hgGraftStopAct = E5Action( | 1019 self.hgGraftStopAct = EricAction( |
| 1020 self.tr('Stop Copying Session'), | 1020 self.tr('Stop Copying Session'), |
| 1021 self.tr('Stop Copying Session'), | 1021 self.tr('Stop Copying Session'), |
| 1022 0, 0, self, 'mercurial_graft_stop') | 1022 0, 0, self, 'mercurial_graft_stop') |
| 1023 self.hgGraftStopAct.setStatusTip(self.tr( | 1023 self.hgGraftStopAct.setStatusTip(self.tr( |
| 1024 'Stop the interrupted copying session' | 1024 'Stop the interrupted copying session' |
| 1028 """<p>This stops the interrupted copying session.</p>""" | 1028 """<p>This stops the interrupted copying session.</p>""" |
| 1029 )) | 1029 )) |
| 1030 self.hgGraftStopAct.triggered.connect(self.__hgGraftStop) | 1030 self.hgGraftStopAct.triggered.connect(self.__hgGraftStop) |
| 1031 self.actions.append(self.hgGraftStopAct) | 1031 self.actions.append(self.hgGraftStopAct) |
| 1032 | 1032 |
| 1033 self.hgGraftAbortAct = E5Action( | 1033 self.hgGraftAbortAct = EricAction( |
| 1034 self.tr('Abort Copying Session'), | 1034 self.tr('Abort Copying Session'), |
| 1035 self.tr('Abort Copying Session'), | 1035 self.tr('Abort Copying Session'), |
| 1036 0, 0, self, 'mercurial_graft_abort') | 1036 0, 0, self, 'mercurial_graft_abort') |
| 1037 self.hgGraftAbortAct.setStatusTip(self.tr( | 1037 self.hgGraftAbortAct.setStatusTip(self.tr( |
| 1038 'Abort the interrupted copying session and rollback' | 1038 'Abort the interrupted copying session and rollback' |
| 1043 """ rollbacks to the state before the copy.</p>""" | 1043 """ rollbacks to the state before the copy.</p>""" |
| 1044 )) | 1044 )) |
| 1045 self.hgGraftAbortAct.triggered.connect(self.__hgGraftAbort) | 1045 self.hgGraftAbortAct.triggered.connect(self.__hgGraftAbort) |
| 1046 self.actions.append(self.hgGraftAbortAct) | 1046 self.actions.append(self.hgGraftAbortAct) |
| 1047 | 1047 |
| 1048 self.hgAddSubrepoAct = E5Action( | 1048 self.hgAddSubrepoAct = EricAction( |
| 1049 self.tr('Add'), | 1049 self.tr('Add'), |
| 1050 UI.PixmapCache.getIcon("vcsAdd"), | 1050 UI.PixmapCache.getIcon("vcsAdd"), |
| 1051 self.tr('Add...'), | 1051 self.tr('Add...'), |
| 1052 0, 0, self, 'mercurial_add_subrepo') | 1052 0, 0, self, 'mercurial_add_subrepo') |
| 1053 self.hgAddSubrepoAct.setStatusTip(self.tr( | 1053 self.hgAddSubrepoAct.setStatusTip(self.tr( |
| 1058 """<p>Add a sub-repository to the project.</p>""" | 1058 """<p>Add a sub-repository to the project.</p>""" |
| 1059 )) | 1059 )) |
| 1060 self.hgAddSubrepoAct.triggered.connect(self.__hgAddSubrepository) | 1060 self.hgAddSubrepoAct.triggered.connect(self.__hgAddSubrepository) |
| 1061 self.actions.append(self.hgAddSubrepoAct) | 1061 self.actions.append(self.hgAddSubrepoAct) |
| 1062 | 1062 |
| 1063 self.hgRemoveSubreposAct = E5Action( | 1063 self.hgRemoveSubreposAct = EricAction( |
| 1064 self.tr('Remove'), | 1064 self.tr('Remove'), |
| 1065 UI.PixmapCache.getIcon("vcsRemove"), | 1065 UI.PixmapCache.getIcon("vcsRemove"), |
| 1066 self.tr('Remove...'), | 1066 self.tr('Remove...'), |
| 1067 0, 0, self, 'mercurial_remove_subrepos') | 1067 0, 0, self, 'mercurial_remove_subrepos') |
| 1068 self.hgRemoveSubreposAct.setStatusTip(self.tr( | 1068 self.hgRemoveSubreposAct.setStatusTip(self.tr( |
| 1074 )) | 1074 )) |
| 1075 self.hgRemoveSubreposAct.triggered.connect( | 1075 self.hgRemoveSubreposAct.triggered.connect( |
| 1076 self.__hgRemoveSubrepositories) | 1076 self.__hgRemoveSubrepositories) |
| 1077 self.actions.append(self.hgRemoveSubreposAct) | 1077 self.actions.append(self.hgRemoveSubreposAct) |
| 1078 | 1078 |
| 1079 self.hgArchiveAct = E5Action( | 1079 self.hgArchiveAct = EricAction( |
| 1080 self.tr('Create unversioned archive'), | 1080 self.tr('Create unversioned archive'), |
| 1081 UI.PixmapCache.getIcon("vcsExport"), | 1081 UI.PixmapCache.getIcon("vcsExport"), |
| 1082 self.tr('Create unversioned archive...'), | 1082 self.tr('Create unversioned archive...'), |
| 1083 0, 0, self, 'mercurial_archive') | 1083 0, 0, self, 'mercurial_archive') |
| 1084 self.hgArchiveAct.setStatusTip(self.tr( | 1084 self.hgArchiveAct.setStatusTip(self.tr( |
| 1090 """ repository.</p>""" | 1090 """ repository.</p>""" |
| 1091 )) | 1091 )) |
| 1092 self.hgArchiveAct.triggered.connect(self.__hgArchive) | 1092 self.hgArchiveAct.triggered.connect(self.__hgArchive) |
| 1093 self.actions.append(self.hgArchiveAct) | 1093 self.actions.append(self.hgArchiveAct) |
| 1094 | 1094 |
| 1095 self.hgBookmarksListAct = E5Action( | 1095 self.hgBookmarksListAct = EricAction( |
| 1096 self.tr('List bookmarks'), | 1096 self.tr('List bookmarks'), |
| 1097 UI.PixmapCache.getIcon("listBookmarks"), | 1097 UI.PixmapCache.getIcon("listBookmarks"), |
| 1098 self.tr('List bookmarks...'), | 1098 self.tr('List bookmarks...'), |
| 1099 0, 0, self, 'mercurial_list_bookmarks') | 1099 0, 0, self, 'mercurial_list_bookmarks') |
| 1100 self.hgBookmarksListAct.setStatusTip(self.tr( | 1100 self.hgBookmarksListAct.setStatusTip(self.tr( |
| 1105 """<p>This lists the bookmarks of the project.</p>""" | 1105 """<p>This lists the bookmarks of the project.</p>""" |
| 1106 )) | 1106 )) |
| 1107 self.hgBookmarksListAct.triggered.connect(self.__hgBookmarksList) | 1107 self.hgBookmarksListAct.triggered.connect(self.__hgBookmarksList) |
| 1108 self.actions.append(self.hgBookmarksListAct) | 1108 self.actions.append(self.hgBookmarksListAct) |
| 1109 | 1109 |
| 1110 self.hgBookmarkDefineAct = E5Action( | 1110 self.hgBookmarkDefineAct = EricAction( |
| 1111 self.tr('Define bookmark'), | 1111 self.tr('Define bookmark'), |
| 1112 UI.PixmapCache.getIcon("addBookmark"), | 1112 UI.PixmapCache.getIcon("addBookmark"), |
| 1113 self.tr('Define bookmark...'), | 1113 self.tr('Define bookmark...'), |
| 1114 0, 0, self, 'mercurial_define_bookmark') | 1114 0, 0, self, 'mercurial_define_bookmark') |
| 1115 self.hgBookmarkDefineAct.setStatusTip(self.tr( | 1115 self.hgBookmarkDefineAct.setStatusTip(self.tr( |
| 1120 """<p>This defines a bookmark for the project.</p>""" | 1120 """<p>This defines a bookmark for the project.</p>""" |
| 1121 )) | 1121 )) |
| 1122 self.hgBookmarkDefineAct.triggered.connect(self.__hgBookmarkDefine) | 1122 self.hgBookmarkDefineAct.triggered.connect(self.__hgBookmarkDefine) |
| 1123 self.actions.append(self.hgBookmarkDefineAct) | 1123 self.actions.append(self.hgBookmarkDefineAct) |
| 1124 | 1124 |
| 1125 self.hgBookmarkDeleteAct = E5Action( | 1125 self.hgBookmarkDeleteAct = EricAction( |
| 1126 self.tr('Delete bookmark'), | 1126 self.tr('Delete bookmark'), |
| 1127 UI.PixmapCache.getIcon("deleteBookmark"), | 1127 UI.PixmapCache.getIcon("deleteBookmark"), |
| 1128 self.tr('Delete bookmark...'), | 1128 self.tr('Delete bookmark...'), |
| 1129 0, 0, self, 'mercurial_delete_bookmark') | 1129 0, 0, self, 'mercurial_delete_bookmark') |
| 1130 self.hgBookmarkDeleteAct.setStatusTip(self.tr( | 1130 self.hgBookmarkDeleteAct.setStatusTip(self.tr( |
| 1135 """<p>This deletes a bookmark of the project.</p>""" | 1135 """<p>This deletes a bookmark of the project.</p>""" |
| 1136 )) | 1136 )) |
| 1137 self.hgBookmarkDeleteAct.triggered.connect(self.__hgBookmarkDelete) | 1137 self.hgBookmarkDeleteAct.triggered.connect(self.__hgBookmarkDelete) |
| 1138 self.actions.append(self.hgBookmarkDeleteAct) | 1138 self.actions.append(self.hgBookmarkDeleteAct) |
| 1139 | 1139 |
| 1140 self.hgBookmarkRenameAct = E5Action( | 1140 self.hgBookmarkRenameAct = EricAction( |
| 1141 self.tr('Rename bookmark'), | 1141 self.tr('Rename bookmark'), |
| 1142 UI.PixmapCache.getIcon("renameBookmark"), | 1142 UI.PixmapCache.getIcon("renameBookmark"), |
| 1143 self.tr('Rename bookmark...'), | 1143 self.tr('Rename bookmark...'), |
| 1144 0, 0, self, 'mercurial_rename_bookmark') | 1144 0, 0, self, 'mercurial_rename_bookmark') |
| 1145 self.hgBookmarkRenameAct.setStatusTip(self.tr( | 1145 self.hgBookmarkRenameAct.setStatusTip(self.tr( |
| 1150 """<p>This renames a bookmark of the project.</p>""" | 1150 """<p>This renames a bookmark of the project.</p>""" |
| 1151 )) | 1151 )) |
| 1152 self.hgBookmarkRenameAct.triggered.connect(self.__hgBookmarkRename) | 1152 self.hgBookmarkRenameAct.triggered.connect(self.__hgBookmarkRename) |
| 1153 self.actions.append(self.hgBookmarkRenameAct) | 1153 self.actions.append(self.hgBookmarkRenameAct) |
| 1154 | 1154 |
| 1155 self.hgBookmarkMoveAct = E5Action( | 1155 self.hgBookmarkMoveAct = EricAction( |
| 1156 self.tr('Move bookmark'), | 1156 self.tr('Move bookmark'), |
| 1157 UI.PixmapCache.getIcon("moveBookmark"), | 1157 UI.PixmapCache.getIcon("moveBookmark"), |
| 1158 self.tr('Move bookmark...'), | 1158 self.tr('Move bookmark...'), |
| 1159 0, 0, self, 'mercurial_move_bookmark') | 1159 0, 0, self, 'mercurial_move_bookmark') |
| 1160 self.hgBookmarkMoveAct.setStatusTip(self.tr( | 1160 self.hgBookmarkMoveAct.setStatusTip(self.tr( |
| 1166 """ changeset.</p>""" | 1166 """ changeset.</p>""" |
| 1167 )) | 1167 )) |
| 1168 self.hgBookmarkMoveAct.triggered.connect(self.__hgBookmarkMove) | 1168 self.hgBookmarkMoveAct.triggered.connect(self.__hgBookmarkMove) |
| 1169 self.actions.append(self.hgBookmarkMoveAct) | 1169 self.actions.append(self.hgBookmarkMoveAct) |
| 1170 | 1170 |
| 1171 self.hgBookmarkIncomingAct = E5Action( | 1171 self.hgBookmarkIncomingAct = EricAction( |
| 1172 self.tr('Show incoming bookmarks'), | 1172 self.tr('Show incoming bookmarks'), |
| 1173 UI.PixmapCache.getIcon("incomingBookmark"), | 1173 UI.PixmapCache.getIcon("incomingBookmark"), |
| 1174 self.tr('Show incoming bookmarks'), | 1174 self.tr('Show incoming bookmarks'), |
| 1175 0, 0, self, 'mercurial_incoming_bookmarks') | 1175 0, 0, self, 'mercurial_incoming_bookmarks') |
| 1176 self.hgBookmarkIncomingAct.setStatusTip(self.tr( | 1176 self.hgBookmarkIncomingAct.setStatusTip(self.tr( |
| 1183 )) | 1183 )) |
| 1184 self.hgBookmarkIncomingAct.triggered.connect( | 1184 self.hgBookmarkIncomingAct.triggered.connect( |
| 1185 self.__hgBookmarkIncoming) | 1185 self.__hgBookmarkIncoming) |
| 1186 self.actions.append(self.hgBookmarkIncomingAct) | 1186 self.actions.append(self.hgBookmarkIncomingAct) |
| 1187 | 1187 |
| 1188 self.hgBookmarkPullAct = E5Action( | 1188 self.hgBookmarkPullAct = EricAction( |
| 1189 self.tr('Pull bookmark'), | 1189 self.tr('Pull bookmark'), |
| 1190 UI.PixmapCache.getIcon("pullBookmark"), | 1190 UI.PixmapCache.getIcon("pullBookmark"), |
| 1191 self.tr('Pull bookmark'), | 1191 self.tr('Pull bookmark'), |
| 1192 0, 0, self, 'mercurial_pull_bookmark') | 1192 0, 0, self, 'mercurial_pull_bookmark') |
| 1193 self.hgBookmarkPullAct.setStatusTip(self.tr( | 1193 self.hgBookmarkPullAct.setStatusTip(self.tr( |
| 1199 """local repository.</p>""" | 1199 """local repository.</p>""" |
| 1200 )) | 1200 )) |
| 1201 self.hgBookmarkPullAct.triggered.connect(self.__hgBookmarkPull) | 1201 self.hgBookmarkPullAct.triggered.connect(self.__hgBookmarkPull) |
| 1202 self.actions.append(self.hgBookmarkPullAct) | 1202 self.actions.append(self.hgBookmarkPullAct) |
| 1203 | 1203 |
| 1204 self.hgBookmarkPullCurrentAct = E5Action( | 1204 self.hgBookmarkPullCurrentAct = EricAction( |
| 1205 self.tr('Pull current bookmark'), | 1205 self.tr('Pull current bookmark'), |
| 1206 UI.PixmapCache.getIcon("pullBookmark"), | 1206 UI.PixmapCache.getIcon("pullBookmark"), |
| 1207 self.tr('Pull current bookmark'), | 1207 self.tr('Pull current bookmark'), |
| 1208 0, 0, self, 'mercurial_pull_current_bookmark') | 1208 0, 0, self, 'mercurial_pull_current_bookmark') |
| 1209 self.hgBookmarkPullCurrentAct.setStatusTip(self.tr( | 1209 self.hgBookmarkPullCurrentAct.setStatusTip(self.tr( |
| 1215 """ repository into the local repository.</p>""" | 1215 """ repository into the local repository.</p>""" |
| 1216 )) | 1216 )) |
| 1217 self.hgBookmarkPullCurrentAct.triggered.connect( | 1217 self.hgBookmarkPullCurrentAct.triggered.connect( |
| 1218 self.__hgBookmarkPullCurrent) | 1218 self.__hgBookmarkPullCurrent) |
| 1219 | 1219 |
| 1220 self.hgBookmarkOutgoingAct = E5Action( | 1220 self.hgBookmarkOutgoingAct = EricAction( |
| 1221 self.tr('Show outgoing bookmarks'), | 1221 self.tr('Show outgoing bookmarks'), |
| 1222 UI.PixmapCache.getIcon("outgoingBookmark"), | 1222 UI.PixmapCache.getIcon("outgoingBookmark"), |
| 1223 self.tr('Show outgoing bookmarks'), | 1223 self.tr('Show outgoing bookmarks'), |
| 1224 0, 0, self, 'mercurial_outgoing_bookmarks') | 1224 0, 0, self, 'mercurial_outgoing_bookmarks') |
| 1225 self.hgBookmarkOutgoingAct.setStatusTip(self.tr( | 1225 self.hgBookmarkOutgoingAct.setStatusTip(self.tr( |
| 1232 )) | 1232 )) |
| 1233 self.hgBookmarkOutgoingAct.triggered.connect( | 1233 self.hgBookmarkOutgoingAct.triggered.connect( |
| 1234 self.__hgBookmarkOutgoing) | 1234 self.__hgBookmarkOutgoing) |
| 1235 self.actions.append(self.hgBookmarkOutgoingAct) | 1235 self.actions.append(self.hgBookmarkOutgoingAct) |
| 1236 | 1236 |
| 1237 self.hgBookmarkPushAct = E5Action( | 1237 self.hgBookmarkPushAct = EricAction( |
| 1238 self.tr('Push bookmark'), | 1238 self.tr('Push bookmark'), |
| 1239 UI.PixmapCache.getIcon("pushBookmark"), | 1239 UI.PixmapCache.getIcon("pushBookmark"), |
| 1240 self.tr('Push bookmark'), | 1240 self.tr('Push bookmark'), |
| 1241 0, 0, self, 'mercurial_push_bookmark') | 1241 0, 0, self, 'mercurial_push_bookmark') |
| 1242 self.hgBookmarkPushAct.setStatusTip(self.tr( | 1242 self.hgBookmarkPushAct.setStatusTip(self.tr( |
| 1248 """remote repository.</p>""" | 1248 """remote repository.</p>""" |
| 1249 )) | 1249 )) |
| 1250 self.hgBookmarkPushAct.triggered.connect(self.__hgBookmarkPush) | 1250 self.hgBookmarkPushAct.triggered.connect(self.__hgBookmarkPush) |
| 1251 self.actions.append(self.hgBookmarkPushAct) | 1251 self.actions.append(self.hgBookmarkPushAct) |
| 1252 | 1252 |
| 1253 self.hgBookmarkPushCurrentAct = E5Action( | 1253 self.hgBookmarkPushCurrentAct = EricAction( |
| 1254 self.tr('Push current bookmark'), | 1254 self.tr('Push current bookmark'), |
| 1255 UI.PixmapCache.getIcon("pushBookmark"), | 1255 UI.PixmapCache.getIcon("pushBookmark"), |
| 1256 self.tr('Push current bookmark'), | 1256 self.tr('Push current bookmark'), |
| 1257 0, 0, self, 'mercurial_push_current_bookmark') | 1257 0, 0, self, 'mercurial_push_current_bookmark') |
| 1258 self.hgBookmarkPushCurrentAct.setStatusTip(self.tr( | 1258 self.hgBookmarkPushCurrentAct.setStatusTip(self.tr( |
| 1265 )) | 1265 )) |
| 1266 self.hgBookmarkPushCurrentAct.triggered.connect( | 1266 self.hgBookmarkPushCurrentAct.triggered.connect( |
| 1267 self.__hgBookmarkPushCurrent) | 1267 self.__hgBookmarkPushCurrent) |
| 1268 self.actions.append(self.hgBookmarkPushCurrentAct) | 1268 self.actions.append(self.hgBookmarkPushCurrentAct) |
| 1269 | 1269 |
| 1270 self.hgBookmarkPushAllAct = E5Action( | 1270 self.hgBookmarkPushAllAct = EricAction( |
| 1271 self.tr('Push all bookmarks'), | 1271 self.tr('Push all bookmarks'), |
| 1272 UI.PixmapCache.getIcon("pushBookmark"), | 1272 UI.PixmapCache.getIcon("pushBookmark"), |
| 1273 self.tr('Push all bookmarks'), | 1273 self.tr('Push all bookmarks'), |
| 1274 0, 0, self, 'mercurial_push_all_bookmarks') | 1274 0, 0, self, 'mercurial_push_all_bookmarks') |
| 1275 self.hgBookmarkPushAllAct.setStatusTip(self.tr( | 1275 self.hgBookmarkPushAllAct.setStatusTip(self.tr( |
| 1281 """ repository to a remote repository.</p>""" | 1281 """ repository to a remote repository.</p>""" |
| 1282 )) | 1282 )) |
| 1283 self.hgBookmarkPushAllAct.triggered.connect( | 1283 self.hgBookmarkPushAllAct.triggered.connect( |
| 1284 self.__hgBookmarkPushAll) | 1284 self.__hgBookmarkPushAll) |
| 1285 | 1285 |
| 1286 self.hgDeleteBackupsAct = E5Action( | 1286 self.hgDeleteBackupsAct = EricAction( |
| 1287 self.tr('Delete all backups'), | 1287 self.tr('Delete all backups'), |
| 1288 UI.PixmapCache.getIcon("clearPrivateData"), | 1288 UI.PixmapCache.getIcon("clearPrivateData"), |
| 1289 self.tr('Delete all backups'), | 1289 self.tr('Delete all backups'), |
| 1290 0, 0, self, 'mercurial_delete_all_backups') | 1290 0, 0, self, 'mercurial_delete_all_backups') |
| 1291 self.hgDeleteBackupsAct.setStatusTip(self.tr( | 1291 self.hgDeleteBackupsAct.setStatusTip(self.tr( |
| 1524 """ | 1524 """ |
| 1525 Public slot to initialize the VCS toolbar. | 1525 Public slot to initialize the VCS toolbar. |
| 1526 | 1526 |
| 1527 @param ui reference to the main window (UserInterface) | 1527 @param ui reference to the main window (UserInterface) |
| 1528 @param toolbarManager reference to a toolbar manager object | 1528 @param toolbarManager reference to a toolbar manager object |
| 1529 (E5ToolBarManager) | 1529 (EricToolBarManager) |
| 1530 """ | 1530 """ |
| 1531 self.__toolbarManager = toolbarManager | 1531 self.__toolbarManager = toolbarManager |
| 1532 | 1532 |
| 1533 self.__toolbar = QToolBar(self.tr("Mercurial"), ui) | 1533 self.__toolbar = QToolBar(self.tr("Mercurial"), ui) |
| 1534 self.__toolbar.setIconSize(UI.Config.ToolBarIconSize) | 1534 self.__toolbar.setIconSize(UI.Config.ToolBarIconSize) |
| 1595 """ | 1595 """ |
| 1596 Public method to remove a toolbar created by initToolbar(). | 1596 Public method to remove a toolbar created by initToolbar(). |
| 1597 | 1597 |
| 1598 @param ui reference to the main window (UserInterface) | 1598 @param ui reference to the main window (UserInterface) |
| 1599 @param toolbarManager reference to a toolbar manager object | 1599 @param toolbarManager reference to a toolbar manager object |
| 1600 (E5ToolBarManager) | 1600 (EricToolBarManager) |
| 1601 """ | 1601 """ |
| 1602 ui.removeToolBar(self.__toolbar) | 1602 ui.removeToolBar(self.__toolbar) |
| 1603 ui.unregisterToolbar("mercurial") | 1603 ui.unregisterToolbar("mercurial") |
| 1604 | 1604 |
| 1605 title = self.__toolbar.windowTitle() | 1605 title = self.__toolbar.windowTitle() |
| 1677 """ | 1677 """ |
| 1678 Private slot used to pull changes from a remote repository. | 1678 Private slot used to pull changes from a remote repository. |
| 1679 """ | 1679 """ |
| 1680 shouldReopen = self.vcs.hgPull() | 1680 shouldReopen = self.vcs.hgPull() |
| 1681 if shouldReopen: | 1681 if shouldReopen: |
| 1682 res = E5MessageBox.yesNo( | 1682 res = EricMessageBox.yesNo( |
| 1683 self.parent(), | 1683 self.parent(), |
| 1684 self.tr("Pull"), | 1684 self.tr("Pull"), |
| 1685 self.tr("""The project should be reread. Do this now?"""), | 1685 self.tr("""The project should be reread. Do this now?"""), |
| 1686 yesDefault=True) | 1686 yesDefault=True) |
| 1687 if res: | 1687 if res: |
| 1782 | 1782 |
| 1783 def __hgConfigure(self): | 1783 def __hgConfigure(self): |
| 1784 """ | 1784 """ |
| 1785 Private method to open the configuration dialog. | 1785 Private method to open the configuration dialog. |
| 1786 """ | 1786 """ |
| 1787 e5App().getObject("UserInterface").showPreferences("zzz_mercurialPage") | 1787 ericApp().getObject("UserInterface").showPreferences("zzz_mercurialPage") |
| 1788 | 1788 |
| 1789 def __hgCloseBranch(self): | 1789 def __hgCloseBranch(self): |
| 1790 """ | 1790 """ |
| 1791 Private slot used to close the current branch of the local project. | 1791 Private slot used to close the current branch of the local project. |
| 1792 """ | 1792 """ |
| 1866 """ | 1866 """ |
| 1867 Private slot used to apply changegroup files. | 1867 Private slot used to apply changegroup files. |
| 1868 """ | 1868 """ |
| 1869 shouldReopen = self.vcs.hgUnbundle() | 1869 shouldReopen = self.vcs.hgUnbundle() |
| 1870 if shouldReopen: | 1870 if shouldReopen: |
| 1871 res = E5MessageBox.yesNo( | 1871 res = EricMessageBox.yesNo( |
| 1872 self.parent(), | 1872 self.parent(), |
| 1873 self.tr("Apply changegroups"), | 1873 self.tr("Apply changegroups"), |
| 1874 self.tr("""The project should be reread. Do this now?"""), | 1874 self.tr("""The project should be reread. Do this now?"""), |
| 1875 yesDefault=True) | 1875 yesDefault=True) |
| 1876 if res: | 1876 if res: |
| 1922 """ | 1922 """ |
| 1923 Private slot used to import a patch file. | 1923 Private slot used to import a patch file. |
| 1924 """ | 1924 """ |
| 1925 shouldReopen = self.vcs.hgImport() | 1925 shouldReopen = self.vcs.hgImport() |
| 1926 if shouldReopen: | 1926 if shouldReopen: |
| 1927 res = E5MessageBox.yesNo( | 1927 res = EricMessageBox.yesNo( |
| 1928 self.parent(), | 1928 self.parent(), |
| 1929 self.tr("Import Patch"), | 1929 self.tr("Import Patch"), |
| 1930 self.tr("""The project should be reread. Do this now?"""), | 1930 self.tr("""The project should be reread. Do this now?"""), |
| 1931 yesDefault=True) | 1931 yesDefault=True) |
| 1932 if res: | 1932 if res: |
| 1942 """ | 1942 """ |
| 1943 Private slot used to revert changes made to the local project. | 1943 Private slot used to revert changes made to the local project. |
| 1944 """ | 1944 """ |
| 1945 shouldReopen = self.vcs.hgRevert(self.project.ppath) | 1945 shouldReopen = self.vcs.hgRevert(self.project.ppath) |
| 1946 if shouldReopen: | 1946 if shouldReopen: |
| 1947 res = E5MessageBox.yesNo( | 1947 res = EricMessageBox.yesNo( |
| 1948 self.parent(), | 1948 self.parent(), |
| 1949 self.tr("Revert Changes"), | 1949 self.tr("Revert Changes"), |
| 1950 self.tr("""The project should be reread. Do this now?"""), | 1950 self.tr("""The project should be reread. Do this now?"""), |
| 1951 yesDefault=True) | 1951 yesDefault=True) |
| 1952 if res: | 1952 if res: |
| 1962 """ | 1962 """ |
| 1963 Private slot used to copy changesets from another branch. | 1963 Private slot used to copy changesets from another branch. |
| 1964 """ | 1964 """ |
| 1965 shouldReopen = self.vcs.hgGraft() | 1965 shouldReopen = self.vcs.hgGraft() |
| 1966 if shouldReopen: | 1966 if shouldReopen: |
| 1967 res = E5MessageBox.yesNo( | 1967 res = EricMessageBox.yesNo( |
| 1968 None, | 1968 None, |
| 1969 self.tr("Copy Changesets"), | 1969 self.tr("Copy Changesets"), |
| 1970 self.tr("""The project should be reread. Do this now?"""), | 1970 self.tr("""The project should be reread. Do this now?"""), |
| 1971 yesDefault=True) | 1971 yesDefault=True) |
| 1972 if res: | 1972 if res: |
| 1977 Private slot used to continue the last copying session after conflicts | 1977 Private slot used to continue the last copying session after conflicts |
| 1978 were resolved. | 1978 were resolved. |
| 1979 """ | 1979 """ |
| 1980 shouldReopen = self.vcs.hgGraftContinue() | 1980 shouldReopen = self.vcs.hgGraftContinue() |
| 1981 if shouldReopen: | 1981 if shouldReopen: |
| 1982 res = E5MessageBox.yesNo( | 1982 res = EricMessageBox.yesNo( |
| 1983 None, | 1983 None, |
| 1984 self.tr("Copy Changesets (Continue)"), | 1984 self.tr("Copy Changesets (Continue)"), |
| 1985 self.tr("""The project should be reread. Do this now?"""), | 1985 self.tr("""The project should be reread. Do this now?"""), |
| 1986 yesDefault=True) | 1986 yesDefault=True) |
| 1987 if res: | 1987 if res: |
| 1991 """ | 1991 """ |
| 1992 Private slot used to stop an interrupted copying session. | 1992 Private slot used to stop an interrupted copying session. |
| 1993 """ | 1993 """ |
| 1994 shouldReopen = self.vcs.hgGraftStop() | 1994 shouldReopen = self.vcs.hgGraftStop() |
| 1995 if shouldReopen: | 1995 if shouldReopen: |
| 1996 res = E5MessageBox.yesNo( | 1996 res = EricMessageBox.yesNo( |
| 1997 None, | 1997 None, |
| 1998 self.tr("Copy Changesets (Stop)"), | 1998 self.tr("Copy Changesets (Stop)"), |
| 1999 self.tr("""The project should be reread. Do this now?"""), | 1999 self.tr("""The project should be reread. Do this now?"""), |
| 2000 yesDefault=True) | 2000 yesDefault=True) |
| 2001 if res: | 2001 if res: |
| 2006 Private slot used to abort an interrupted copying session and perform | 2006 Private slot used to abort an interrupted copying session and perform |
| 2007 a rollback. | 2007 a rollback. |
| 2008 """ | 2008 """ |
| 2009 shouldReopen = self.vcs.hgGraftAbort() | 2009 shouldReopen = self.vcs.hgGraftAbort() |
| 2010 if shouldReopen: | 2010 if shouldReopen: |
| 2011 res = E5MessageBox.yesNo( | 2011 res = EricMessageBox.yesNo( |
| 2012 None, | 2012 None, |
| 2013 self.tr("Copy Changesets (Abort)"), | 2013 self.tr("Copy Changesets (Abort)"), |
| 2014 self.tr("""The project should be reread. Do this now?"""), | 2014 self.tr("""The project should be reread. Do this now?"""), |
| 2015 yesDefault=True) | 2015 yesDefault=True) |
| 2016 if res: | 2016 if res: |
