Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py
- branch
- Py2 comp.
- changeset 3058
- 0a02c433f52d
- parent 3057
- 10516539f238
- parent 3020
- 542e97d4ecb3
- child 3060
- 5883ce99ee12
equal
deleted
inserted
replaced
| 3057:10516539f238 | 3058:0a02c433f52d |
|---|---|
| 407 if ok and patch: | 407 if ok and patch: |
| 408 args.append(patch) | 408 args.append(patch) |
| 409 else: | 409 else: |
| 410 return False | 410 return False |
| 411 else: | 411 else: |
| 412 E5MessageBox.information(None, | 412 E5MessageBox.information( |
| 413 None, | |
| 413 self.trUtf8("Select Patch"), | 414 self.trUtf8("Select Patch"), |
| 414 self.trUtf8("""No patches to select from.""")) | 415 self.trUtf8("""No patches to select from.""")) |
| 415 return False | 416 return False |
| 416 | 417 |
| 417 dia = HgDialog(title, self.vcs) | 418 dia = HgDialog(title, self.vcs) |
| 519 dia = HgDialog(self.trUtf8("Delete Patch"), self.vcs) | 520 dia = HgDialog(self.trUtf8("Delete Patch"), self.vcs) |
| 520 res = dia.startProcess(args, repodir) | 521 res = dia.startProcess(args, repodir) |
| 521 if res: | 522 if res: |
| 522 dia.exec_() | 523 dia.exec_() |
| 523 else: | 524 else: |
| 524 E5MessageBox.information(None, | 525 E5MessageBox.information( |
| 526 None, | |
| 525 self.trUtf8("Select Patch"), | 527 self.trUtf8("Select Patch"), |
| 526 self.trUtf8("""No patches to select from.""")) | 528 self.trUtf8("""No patches to select from.""")) |
| 527 | 529 |
| 528 def hgQueueFoldUnappliedPatches(self, name): | 530 def hgQueueFoldUnappliedPatches(self, name): |
| 529 """ | 531 """ |
| 557 dia = HgDialog(self.trUtf8("Fold Patches"), self.vcs) | 559 dia = HgDialog(self.trUtf8("Fold Patches"), self.vcs) |
| 558 res = dia.startProcess(args, repodir) | 560 res = dia.startProcess(args, repodir) |
| 559 if res: | 561 if res: |
| 560 dia.exec_() | 562 dia.exec_() |
| 561 else: | 563 else: |
| 562 E5MessageBox.information(None, | 564 E5MessageBox.information( |
| 565 None, | |
| 563 self.trUtf8("Fold Patches"), | 566 self.trUtf8("Fold Patches"), |
| 564 self.trUtf8("""No patches selected.""")) | 567 self.trUtf8("""No patches selected.""")) |
| 565 else: | 568 else: |
| 566 E5MessageBox.information(None, | 569 E5MessageBox.information( |
| 570 None, | |
| 567 self.trUtf8("Fold Patches"), | 571 self.trUtf8("Fold Patches"), |
| 568 self.trUtf8("""No patches available to be folded.""")) | 572 self.trUtf8("""No patches available to be folded.""")) |
| 569 | 573 |
| 570 def hgQueueGuardsList(self, name): | 574 def hgQueueGuardsList(self, name): |
| 571 """ | 575 """ |
| 587 self.queuesListGuardsDialog = \ | 591 self.queuesListGuardsDialog = \ |
| 588 HgQueuesListGuardsDialog(self.vcs, patchnames) | 592 HgQueuesListGuardsDialog(self.vcs, patchnames) |
| 589 self.queuesListGuardsDialog.show() | 593 self.queuesListGuardsDialog.show() |
| 590 self.queuesListGuardsDialog.start(name) | 594 self.queuesListGuardsDialog.start(name) |
| 591 else: | 595 else: |
| 592 E5MessageBox.information(None, | 596 E5MessageBox.information( |
| 597 None, | |
| 593 self.trUtf8("List Guards"), | 598 self.trUtf8("List Guards"), |
| 594 self.trUtf8("""No patches available to list guards for.""")) | 599 self.trUtf8("""No patches available to list guards for.""")) |
| 595 | 600 |
| 596 def hgQueueGuardsListAll(self, name): | 601 def hgQueueGuardsListAll(self, name): |
| 597 """ | 602 """ |
| 624 self.queuesDefineGuardsDialog = HgQueuesDefineGuardsDialog( | 629 self.queuesDefineGuardsDialog = HgQueuesDefineGuardsDialog( |
| 625 self.vcs, self, patchnames) | 630 self.vcs, self, patchnames) |
| 626 self.queuesDefineGuardsDialog.show() | 631 self.queuesDefineGuardsDialog.show() |
| 627 self.queuesDefineGuardsDialog.start(name) | 632 self.queuesDefineGuardsDialog.start(name) |
| 628 else: | 633 else: |
| 629 E5MessageBox.information(None, | 634 E5MessageBox.information( |
| 635 None, | |
| 630 self.trUtf8("Define Guards"), | 636 self.trUtf8("Define Guards"), |
| 631 self.trUtf8("""No patches available to define guards for.""")) | 637 self.trUtf8("""No patches available to define guards for.""")) |
| 632 | 638 |
| 633 def hgQueueGuardsDropAll(self, name): | 639 def hgQueueGuardsDropAll(self, name): |
| 634 """ | 640 """ |
| 669 process.start('hg', args) | 675 process.start('hg', args) |
| 670 procStarted = process.waitForStarted(5000) | 676 procStarted = process.waitForStarted(5000) |
| 671 if procStarted: | 677 if procStarted: |
| 672 process.waitForFinished(30000) | 678 process.waitForFinished(30000) |
| 673 else: | 679 else: |
| 674 E5MessageBox.information(None, | 680 E5MessageBox.information( |
| 681 None, | |
| 675 self.trUtf8("Drop All Guards"), | 682 self.trUtf8("Drop All Guards"), |
| 676 self.trUtf8("""No patches available to define guards for.""")) | 683 self.trUtf8("""No patches available to define guards for.""")) |
| 677 | 684 |
| 678 def hgQueueGuardsSetActive(self, name): | 685 def hgQueueGuardsSetActive(self, name): |
| 679 """ | 686 """ |
| 705 dia = HgDialog(self.trUtf8('Set Active Guards'), self.vcs) | 712 dia = HgDialog(self.trUtf8('Set Active Guards'), self.vcs) |
| 706 res = dia.startProcess(args, repodir) | 713 res = dia.startProcess(args, repodir) |
| 707 if res: | 714 if res: |
| 708 dia.exec_() | 715 dia.exec_() |
| 709 else: | 716 else: |
| 710 E5MessageBox.information(None, | 717 E5MessageBox.information( |
| 718 None, | |
| 711 self.trUtf8("Set Active Guards"), | 719 self.trUtf8("Set Active Guards"), |
| 712 self.trUtf8("""No guards available to select from.""")) | 720 self.trUtf8("""No guards available to select from.""")) |
| 713 return | 721 return |
| 714 | 722 |
| 715 def hgQueueGuardsDeactivate(self, name): | 723 def hgQueueGuardsDeactivate(self, name): |
| 811 errMsg = self.trUtf8( | 819 errMsg = self.trUtf8( |
| 812 "Error while creating a new queue.") | 820 "Error while creating a new queue.") |
| 813 else: | 821 else: |
| 814 errMsg = self.trUtf8( | 822 errMsg = self.trUtf8( |
| 815 "Error while renaming the active queue.") | 823 "Error while renaming the active queue.") |
| 816 E5MessageBox.warning(None, | 824 E5MessageBox.warning( |
| 825 None, | |
| 817 title, | 826 title, |
| 818 """<p>{0}</p><p>{1}</p>""".format(errMsg, error)) | 827 """<p>{0}</p><p>{1}</p>""".format(errMsg, error)) |
| 819 else: | 828 else: |
| 820 if self.queuesListQueuesDialog is not None and \ | 829 if self.queuesListQueuesDialog is not None and \ |
| 821 self.queuesListQueuesDialog.isVisible(): | 830 self.queuesListQueuesDialog.isVisible(): |
| 887 elif operation == Queues.QUEUE_DELETE: | 896 elif operation == Queues.QUEUE_DELETE: |
| 888 errMsg = self.trUtf8("Error while deleting the queue.") | 897 errMsg = self.trUtf8("Error while deleting the queue.") |
| 889 elif operation == Queues.QUEUE_ACTIVATE: | 898 elif operation == Queues.QUEUE_ACTIVATE: |
| 890 errMsg = self.trUtf8( | 899 errMsg = self.trUtf8( |
| 891 "Error while setting the active queue.") | 900 "Error while setting the active queue.") |
| 892 E5MessageBox.warning(None, | 901 E5MessageBox.warning( |
| 902 None, | |
| 893 title, | 903 title, |
| 894 """<p>{0}</p><p>{1}</p>""".format(errMsg, error)) | 904 """<p>{0}</p><p>{1}</p>""".format(errMsg, error)) |
| 895 else: | 905 else: |
| 896 if self.queuesListQueuesDialog is not None and \ | 906 if self.queuesListQueuesDialog is not None and \ |
| 897 self.queuesListQueuesDialog.isVisible(): | 907 self.queuesListQueuesDialog.isVisible(): |
