Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py
- changeset 3020
- 542e97d4ecb3
- parent 3008
- 7848489bcb92
- child 3034
- 7ce719013078
- child 3058
- 0a02c433f52d
equal
deleted
inserted
replaced
| 3019:7912530a33e2 | 3020:542e97d4ecb3 |
|---|---|
| 401 if ok and patch: | 401 if ok and patch: |
| 402 args.append(patch) | 402 args.append(patch) |
| 403 else: | 403 else: |
| 404 return False | 404 return False |
| 405 else: | 405 else: |
| 406 E5MessageBox.information(None, | 406 E5MessageBox.information( |
| 407 None, | |
| 407 self.trUtf8("Select Patch"), | 408 self.trUtf8("Select Patch"), |
| 408 self.trUtf8("""No patches to select from.""")) | 409 self.trUtf8("""No patches to select from.""")) |
| 409 return False | 410 return False |
| 410 | 411 |
| 411 dia = HgDialog(title, self.vcs) | 412 dia = HgDialog(title, self.vcs) |
| 513 dia = HgDialog(self.trUtf8("Delete Patch"), self.vcs) | 514 dia = HgDialog(self.trUtf8("Delete Patch"), self.vcs) |
| 514 res = dia.startProcess(args, repodir) | 515 res = dia.startProcess(args, repodir) |
| 515 if res: | 516 if res: |
| 516 dia.exec_() | 517 dia.exec_() |
| 517 else: | 518 else: |
| 518 E5MessageBox.information(None, | 519 E5MessageBox.information( |
| 520 None, | |
| 519 self.trUtf8("Select Patch"), | 521 self.trUtf8("Select Patch"), |
| 520 self.trUtf8("""No patches to select from.""")) | 522 self.trUtf8("""No patches to select from.""")) |
| 521 | 523 |
| 522 def hgQueueFoldUnappliedPatches(self, name): | 524 def hgQueueFoldUnappliedPatches(self, name): |
| 523 """ | 525 """ |
| 551 dia = HgDialog(self.trUtf8("Fold Patches"), self.vcs) | 553 dia = HgDialog(self.trUtf8("Fold Patches"), self.vcs) |
| 552 res = dia.startProcess(args, repodir) | 554 res = dia.startProcess(args, repodir) |
| 553 if res: | 555 if res: |
| 554 dia.exec_() | 556 dia.exec_() |
| 555 else: | 557 else: |
| 556 E5MessageBox.information(None, | 558 E5MessageBox.information( |
| 559 None, | |
| 557 self.trUtf8("Fold Patches"), | 560 self.trUtf8("Fold Patches"), |
| 558 self.trUtf8("""No patches selected.""")) | 561 self.trUtf8("""No patches selected.""")) |
| 559 else: | 562 else: |
| 560 E5MessageBox.information(None, | 563 E5MessageBox.information( |
| 564 None, | |
| 561 self.trUtf8("Fold Patches"), | 565 self.trUtf8("Fold Patches"), |
| 562 self.trUtf8("""No patches available to be folded.""")) | 566 self.trUtf8("""No patches available to be folded.""")) |
| 563 | 567 |
| 564 def hgQueueGuardsList(self, name): | 568 def hgQueueGuardsList(self, name): |
| 565 """ | 569 """ |
| 581 self.queuesListGuardsDialog = \ | 585 self.queuesListGuardsDialog = \ |
| 582 HgQueuesListGuardsDialog(self.vcs, patchnames) | 586 HgQueuesListGuardsDialog(self.vcs, patchnames) |
| 583 self.queuesListGuardsDialog.show() | 587 self.queuesListGuardsDialog.show() |
| 584 self.queuesListGuardsDialog.start(name) | 588 self.queuesListGuardsDialog.start(name) |
| 585 else: | 589 else: |
| 586 E5MessageBox.information(None, | 590 E5MessageBox.information( |
| 591 None, | |
| 587 self.trUtf8("List Guards"), | 592 self.trUtf8("List Guards"), |
| 588 self.trUtf8("""No patches available to list guards for.""")) | 593 self.trUtf8("""No patches available to list guards for.""")) |
| 589 | 594 |
| 590 def hgQueueGuardsListAll(self, name): | 595 def hgQueueGuardsListAll(self, name): |
| 591 """ | 596 """ |
| 618 self.queuesDefineGuardsDialog = HgQueuesDefineGuardsDialog( | 623 self.queuesDefineGuardsDialog = HgQueuesDefineGuardsDialog( |
| 619 self.vcs, self, patchnames) | 624 self.vcs, self, patchnames) |
| 620 self.queuesDefineGuardsDialog.show() | 625 self.queuesDefineGuardsDialog.show() |
| 621 self.queuesDefineGuardsDialog.start(name) | 626 self.queuesDefineGuardsDialog.start(name) |
| 622 else: | 627 else: |
| 623 E5MessageBox.information(None, | 628 E5MessageBox.information( |
| 629 None, | |
| 624 self.trUtf8("Define Guards"), | 630 self.trUtf8("Define Guards"), |
| 625 self.trUtf8("""No patches available to define guards for.""")) | 631 self.trUtf8("""No patches available to define guards for.""")) |
| 626 | 632 |
| 627 def hgQueueGuardsDropAll(self, name): | 633 def hgQueueGuardsDropAll(self, name): |
| 628 """ | 634 """ |
| 663 process.start('hg', args) | 669 process.start('hg', args) |
| 664 procStarted = process.waitForStarted(5000) | 670 procStarted = process.waitForStarted(5000) |
| 665 if procStarted: | 671 if procStarted: |
| 666 process.waitForFinished(30000) | 672 process.waitForFinished(30000) |
| 667 else: | 673 else: |
| 668 E5MessageBox.information(None, | 674 E5MessageBox.information( |
| 675 None, | |
| 669 self.trUtf8("Drop All Guards"), | 676 self.trUtf8("Drop All Guards"), |
| 670 self.trUtf8("""No patches available to define guards for.""")) | 677 self.trUtf8("""No patches available to define guards for.""")) |
| 671 | 678 |
| 672 def hgQueueGuardsSetActive(self, name): | 679 def hgQueueGuardsSetActive(self, name): |
| 673 """ | 680 """ |
| 699 dia = HgDialog(self.trUtf8('Set Active Guards'), self.vcs) | 706 dia = HgDialog(self.trUtf8('Set Active Guards'), self.vcs) |
| 700 res = dia.startProcess(args, repodir) | 707 res = dia.startProcess(args, repodir) |
| 701 if res: | 708 if res: |
| 702 dia.exec_() | 709 dia.exec_() |
| 703 else: | 710 else: |
| 704 E5MessageBox.information(None, | 711 E5MessageBox.information( |
| 712 None, | |
| 705 self.trUtf8("Set Active Guards"), | 713 self.trUtf8("Set Active Guards"), |
| 706 self.trUtf8("""No guards available to select from.""")) | 714 self.trUtf8("""No guards available to select from.""")) |
| 707 return | 715 return |
| 708 | 716 |
| 709 def hgQueueGuardsDeactivate(self, name): | 717 def hgQueueGuardsDeactivate(self, name): |
| 805 errMsg = self.trUtf8( | 813 errMsg = self.trUtf8( |
| 806 "Error while creating a new queue.") | 814 "Error while creating a new queue.") |
| 807 else: | 815 else: |
| 808 errMsg = self.trUtf8( | 816 errMsg = self.trUtf8( |
| 809 "Error while renaming the active queue.") | 817 "Error while renaming the active queue.") |
| 810 E5MessageBox.warning(None, | 818 E5MessageBox.warning( |
| 819 None, | |
| 811 title, | 820 title, |
| 812 """<p>{0}</p><p>{1}</p>""".format(errMsg, error)) | 821 """<p>{0}</p><p>{1}</p>""".format(errMsg, error)) |
| 813 else: | 822 else: |
| 814 if self.queuesListQueuesDialog is not None and \ | 823 if self.queuesListQueuesDialog is not None and \ |
| 815 self.queuesListQueuesDialog.isVisible(): | 824 self.queuesListQueuesDialog.isVisible(): |
| 881 elif operation == Queues.QUEUE_DELETE: | 890 elif operation == Queues.QUEUE_DELETE: |
| 882 errMsg = self.trUtf8("Error while deleting the queue.") | 891 errMsg = self.trUtf8("Error while deleting the queue.") |
| 883 elif operation == Queues.QUEUE_ACTIVATE: | 892 elif operation == Queues.QUEUE_ACTIVATE: |
| 884 errMsg = self.trUtf8( | 893 errMsg = self.trUtf8( |
| 885 "Error while setting the active queue.") | 894 "Error while setting the active queue.") |
| 886 E5MessageBox.warning(None, | 895 E5MessageBox.warning( |
| 896 None, | |
| 887 title, | 897 title, |
| 888 """<p>{0}</p><p>{1}</p>""".format(errMsg, error)) | 898 """<p>{0}</p><p>{1}</p>""".format(errMsg, error)) |
| 889 else: | 899 else: |
| 890 if self.queuesListQueuesDialog is not None and \ | 900 if self.queuesListQueuesDialog is not None and \ |
| 891 self.queuesListQueuesDialog.isVisible(): | 901 self.queuesListQueuesDialog.isVisible(): |
