Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py
Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py
- changeset 3020
- 542e97d4ecb3
- parent 3008
- 7848489bcb92
- child 3023
- 34ce20603bf7
equal
deleted
inserted
replaced
| 3019:7912530a33e2 | 3020:542e97d4ecb3 |
|---|---|
| 273 self.process.start('hg', args) | 273 self.process.start('hg', args) |
| 274 procStarted = self.process.waitForStarted(5000) | 274 procStarted = self.process.waitForStarted(5000) |
| 275 if not procStarted: | 275 if not procStarted: |
| 276 self.inputGroup.setEnabled(False) | 276 self.inputGroup.setEnabled(False) |
| 277 self.inputGroup.hide() | 277 self.inputGroup.hide() |
| 278 E5MessageBox.critical(self, | 278 E5MessageBox.critical( |
| 279 self, | |
| 279 self.trUtf8('Process Generation Error'), | 280 self.trUtf8('Process Generation Error'), |
| 280 self.trUtf8( | 281 self.trUtf8( |
| 281 'The process {0} could not be started. ' | 282 'The process {0} could not be started. ' |
| 282 'Ensure, that it is in the search path.' | 283 'Ensure, that it is in the search path.' |
| 283 ).format('hg')) | 284 ).format('hg')) |
| 587 self.vcs.vcsCommit(self.dname, "", mq=True) | 588 self.vcs.vcsCommit(self.dname, "", mq=True) |
| 588 else: | 589 else: |
| 589 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ | 590 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ |
| 590 for itm in self.__getCommitableItems()] | 591 for itm in self.__getCommitableItems()] |
| 591 if not names: | 592 if not names: |
| 592 E5MessageBox.information(self, | 593 E5MessageBox.information( |
| 594 self, | |
| 593 self.trUtf8("Commit"), | 595 self.trUtf8("Commit"), |
| 594 self.trUtf8("""There are no entries selected to be""" | 596 self.trUtf8("""There are no entries selected to be""" |
| 595 """ committed.""")) | 597 """ committed.""")) |
| 596 return | 598 return |
| 597 | 599 |
| 626 Private slot to handle the Add context menu entry. | 628 Private slot to handle the Add context menu entry. |
| 627 """ | 629 """ |
| 628 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ | 630 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ |
| 629 for itm in self.__getUnversionedItems()] | 631 for itm in self.__getUnversionedItems()] |
| 630 if not names: | 632 if not names: |
| 631 E5MessageBox.information(self, | 633 E5MessageBox.information( |
| 634 self, | |
| 632 self.trUtf8("Add"), | 635 self.trUtf8("Add"), |
| 633 self.trUtf8("""There are no unversioned entries""" | 636 self.trUtf8("""There are no unversioned entries""" |
| 634 """ available/selected.""")) | 637 """ available/selected.""")) |
| 635 return | 638 return |
| 636 | 639 |
| 647 Private slot to handle the Remove context menu entry. | 650 Private slot to handle the Remove context menu entry. |
| 648 """ | 651 """ |
| 649 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ | 652 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ |
| 650 for itm in self.__getMissingItems()] | 653 for itm in self.__getMissingItems()] |
| 651 if not names: | 654 if not names: |
| 652 E5MessageBox.information(self, | 655 E5MessageBox.information( |
| 656 self, | |
| 653 self.trUtf8("Remove"), | 657 self.trUtf8("Remove"), |
| 654 self.trUtf8("""There are no missing entries""" | 658 self.trUtf8("""There are no missing entries""" |
| 655 """ available/selected.""")) | 659 """ available/selected.""")) |
| 656 return | 660 return |
| 657 | 661 |
| 663 Private slot to handle the Revert context menu entry. | 667 Private slot to handle the Revert context menu entry. |
| 664 """ | 668 """ |
| 665 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ | 669 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ |
| 666 for itm in self.__getModifiedItems()] | 670 for itm in self.__getModifiedItems()] |
| 667 if not names: | 671 if not names: |
| 668 E5MessageBox.information(self, | 672 E5MessageBox.information( |
| 673 self, | |
| 669 self.trUtf8("Revert"), | 674 self.trUtf8("Revert"), |
| 670 self.trUtf8("""There are no uncommitted changes""" | 675 self.trUtf8("""There are no uncommitted changes""" |
| 671 """ available/selected.""")) | 676 """ available/selected.""")) |
| 672 return | 677 return |
| 673 | 678 |
| 686 Private slot to handle the Restore Missing context menu entry. | 691 Private slot to handle the Restore Missing context menu entry. |
| 687 """ | 692 """ |
| 688 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) | 693 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) |
| 689 for itm in self.__getMissingItems()] | 694 for itm in self.__getMissingItems()] |
| 690 if not names: | 695 if not names: |
| 691 E5MessageBox.information(self, | 696 E5MessageBox.information( |
| 697 self, | |
| 692 self.trUtf8("Revert"), | 698 self.trUtf8("Revert"), |
| 693 self.trUtf8("""There are no missing entries""" | 699 self.trUtf8("""There are no missing entries""" |
| 694 """ available/selected.""")) | 700 """ available/selected.""")) |
| 695 return | 701 return |
| 696 | 702 |
| 703 Private slot to handle the Diff context menu entry. | 709 Private slot to handle the Diff context menu entry. |
| 704 """ | 710 """ |
| 705 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) | 711 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) |
| 706 for itm in self.__getModifiedItems()] | 712 for itm in self.__getModifiedItems()] |
| 707 if not names: | 713 if not names: |
| 708 E5MessageBox.information(self, | 714 E5MessageBox.information( |
| 715 self, | |
| 709 self.trUtf8("Differences"), | 716 self.trUtf8("Differences"), |
| 710 self.trUtf8("""There are no uncommitted changes""" | 717 self.trUtf8("""There are no uncommitted changes""" |
| 711 """ available/selected.""")) | 718 """ available/selected.""")) |
| 712 return | 719 return |
| 713 | 720 |
| 722 Private slot to handle the Diff context menu entry. | 729 Private slot to handle the Diff context menu entry. |
| 723 """ | 730 """ |
| 724 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) | 731 names = [os.path.join(self.dname, itm.text(self.__pathColumn)) |
| 725 for itm in self.__getModifiedItems()] | 732 for itm in self.__getModifiedItems()] |
| 726 if not names: | 733 if not names: |
| 727 E5MessageBox.information(self, | 734 E5MessageBox.information( |
| 735 self, | |
| 728 self.trUtf8("Side-by-Side Diff"), | 736 self.trUtf8("Side-by-Side Diff"), |
| 729 self.trUtf8("""There are no uncommitted changes""" | 737 self.trUtf8("""There are no uncommitted changes""" |
| 730 """ available/selected.""")) | 738 """ available/selected.""")) |
| 731 return | 739 return |
| 732 elif len(names) > 1: | 740 elif len(names) > 1: |
| 733 E5MessageBox.information(self, | 741 E5MessageBox.information( |
| 742 self, | |
| 734 self.trUtf8("Side-by-Side Diff"), | 743 self.trUtf8("Side-by-Side Diff"), |
| 735 self.trUtf8("""Only one file with uncommitted changes""" | 744 self.trUtf8("""Only one file with uncommitted changes""" |
| 736 """ must be selected.""")) | 745 """ must be selected.""")) |
| 737 return | 746 return |
| 738 | 747 |
