Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py
eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py
- changeset 8143
- 2c730d5fd177
- parent 7979
- 54b73174ab61
- child 8176
- 31965986ecd1
- child 8205
- 4a0f1f896341
equal
deleted
inserted
replaced
| 8141:27f636beebad | 8143:2c730d5fd177 |
|---|---|
| 167 """ | 167 """ |
| 168 Public method to create a new named patch. | 168 Public method to create a new named patch. |
| 169 """ | 169 """ |
| 170 from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog | 170 from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog |
| 171 dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.NEW_MODE) | 171 dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.NEW_MODE) |
| 172 if dlg.exec() == QDialog.Accepted: | 172 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 173 (name, message, | 173 (name, message, |
| 174 (userData, currentUser, userName), | 174 (userData, currentUser, userName), |
| 175 (dateData, currentDate, dateStr)) = dlg.getData() | 175 (dateData, currentDate, dateStr)) = dlg.getData() |
| 176 | 176 |
| 177 args = self.vcs.initCommand("qnew") | 177 args = self.vcs.initCommand("qnew") |
| 210 if editMessage: | 210 if editMessage: |
| 211 currentMessage = self.__getCommitMessage() | 211 currentMessage = self.__getCommitMessage() |
| 212 from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog | 212 from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog |
| 213 dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.REFRESH_MODE, | 213 dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.REFRESH_MODE, |
| 214 currentMessage) | 214 currentMessage) |
| 215 if dlg.exec() == QDialog.Accepted: | 215 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 216 (name, message, | 216 (name, message, |
| 217 (userData, currentUser, userName), | 217 (userData, currentUser, userName), |
| 218 (dateData, currentDate, dateStr)) = dlg.getData() | 218 (dateData, currentDate, dateStr)) = dlg.getData() |
| 219 if message != "" and message != currentMessage: | 219 if message != "" and message != currentMessage: |
| 220 args.append("--message") | 220 args.append("--message") |
| 357 if currentPatch: | 357 if currentPatch: |
| 358 from .HgQueuesRenamePatchDialog import ( | 358 from .HgQueuesRenamePatchDialog import ( |
| 359 HgQueuesRenamePatchDialog | 359 HgQueuesRenamePatchDialog |
| 360 ) | 360 ) |
| 361 dlg = HgQueuesRenamePatchDialog(currentPatch, patchnames) | 361 dlg = HgQueuesRenamePatchDialog(currentPatch, patchnames) |
| 362 if dlg.exec() == QDialog.Accepted: | 362 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 363 newName, selectedPatch = dlg.getData() | 363 newName, selectedPatch = dlg.getData() |
| 364 if selectedPatch: | 364 if selectedPatch: |
| 365 args.append(selectedPatch) | 365 args.append(selectedPatch) |
| 366 args.append(newName) | 366 args.append(newName) |
| 367 | 367 |
| 404 patchnames = sorted( | 404 patchnames = sorted( |
| 405 self.__getPatchesList(Queues.UNAPPLIED_LIST, withSummary=True)) | 405 self.__getPatchesList(Queues.UNAPPLIED_LIST, withSummary=True)) |
| 406 if patchnames: | 406 if patchnames: |
| 407 from .HgQueuesFoldDialog import HgQueuesFoldDialog | 407 from .HgQueuesFoldDialog import HgQueuesFoldDialog |
| 408 dlg = HgQueuesFoldDialog(patchnames) | 408 dlg = HgQueuesFoldDialog(patchnames) |
| 409 if dlg.exec() == QDialog.Accepted: | 409 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 410 message, patchesList = dlg.getData() | 410 message, patchesList = dlg.getData() |
| 411 if message: | 411 if message: |
| 412 args.append("--message") | 412 args.append("--message") |
| 413 args.append(message) | 413 args.append(message) |
| 414 if patchesList: | 414 if patchesList: |
| 510 from .HgQueuesGuardsSelectionDialog import ( | 510 from .HgQueuesGuardsSelectionDialog import ( |
| 511 HgQueuesGuardsSelectionDialog | 511 HgQueuesGuardsSelectionDialog |
| 512 ) | 512 ) |
| 513 dlg = HgQueuesGuardsSelectionDialog( | 513 dlg = HgQueuesGuardsSelectionDialog( |
| 514 guardsList, activeGuards=activeGuardsList, listOnly=False) | 514 guardsList, activeGuards=activeGuardsList, listOnly=False) |
| 515 if dlg.exec() == QDialog.Accepted: | 515 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 516 guards = dlg.getData() | 516 guards = dlg.getData() |
| 517 if guards: | 517 if guards: |
| 518 args = self.vcs.initCommand("qselect") | 518 args = self.vcs.initCommand("qselect") |
| 519 args.extend(guards) | 519 args.extend(guards) |
| 520 | 520 |
| 567 HgQueuesQueueManagementDialog | 567 HgQueuesQueueManagementDialog |
| 568 ) | 568 ) |
| 569 dlg = HgQueuesQueueManagementDialog( | 569 dlg = HgQueuesQueueManagementDialog( |
| 570 HgQueuesQueueManagementDialog.NAME_INPUT, | 570 HgQueuesQueueManagementDialog.NAME_INPUT, |
| 571 title, False, self.vcs) | 571 title, False, self.vcs) |
| 572 if dlg.exec() == QDialog.Accepted: | 572 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 573 queueName = dlg.getData() | 573 queueName = dlg.getData() |
| 574 if queueName: | 574 if queueName: |
| 575 args = self.vcs.initCommand("qqueue") | 575 args = self.vcs.initCommand("qqueue") |
| 576 if isCreate: | 576 if isCreate: |
| 577 args.append("--create") | 577 args.append("--create") |
| 622 HgQueuesQueueManagementDialog | 622 HgQueuesQueueManagementDialog |
| 623 ) | 623 ) |
| 624 dlg = HgQueuesQueueManagementDialog( | 624 dlg = HgQueuesQueueManagementDialog( |
| 625 HgQueuesQueueManagementDialog.QUEUE_INPUT, | 625 HgQueuesQueueManagementDialog.QUEUE_INPUT, |
| 626 title, True, self.vcs) | 626 title, True, self.vcs) |
| 627 if dlg.exec() == QDialog.Accepted: | 627 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 628 queueName = dlg.getData() | 628 queueName = dlg.getData() |
| 629 if queueName: | 629 if queueName: |
| 630 args = self.vcs.initCommand("qqueue") | 630 args = self.vcs.initCommand("qqueue") |
| 631 if operation == Queues.QUEUE_PURGE: | 631 if operation == Queues.QUEUE_PURGE: |
| 632 args.append("--purge") | 632 args.append("--purge") |
