Mercurial Repositories > eric / file comparison
comparison: src/eric7/VCS/StatusWidget.py
src/eric7/VCS/StatusWidget.py
- branch
- eric7
- changeset 9576
- be9f8e7e42e0
- parent 9573
- 9960d19d66b5
- child 9653
- e67609152c5e
equal
deleted
inserted
replaced
| 9575:635b6c5a36e1 | 9576:be9f8e7e42e0 |
|---|---|
| 248 | 248 |
| 249 self.__diffAct = self.__actionsMenu.addAction( | 249 self.__diffAct = self.__actionsMenu.addAction( |
| 250 EricPixmapCache.getIcon("vcsDiff"), self.tr("Differences"), self.__diff | 250 EricPixmapCache.getIcon("vcsDiff"), self.tr("Differences"), self.__diff |
| 251 ) | 251 ) |
| 252 self.__diffAct.setToolTip( | 252 self.__diffAct.setToolTip( |
| 253 self.tr( | 253 self.tr("Shows the differences of the selected entry in a separate dialog") |
| 254 "Shows the differences of the selected entry in a" " separate dialog" | |
| 255 ) | |
| 256 ) | 254 ) |
| 257 self.__sbsDiffAct = self.__actionsMenu.addAction( | 255 self.__sbsDiffAct = self.__actionsMenu.addAction( |
| 258 EricPixmapCache.getIcon("vcsSbsDiff"), | 256 EricPixmapCache.getIcon("vcsSbsDiff"), |
| 259 self.tr("Differences Side-By-Side"), | 257 self.tr("Differences Side-By-Side"), |
| 260 self.__sbsDiff, | 258 self.__sbsDiff, |
| 558 | 556 |
| 559 if not names: | 557 if not names: |
| 560 EricMessageBox.information( | 558 EricMessageBox.information( |
| 561 self, | 559 self, |
| 562 self.tr("Add"), | 560 self.tr("Add"), |
| 563 self.tr( | 561 self.tr("""There are no unversioned entries available/selected."""), |
| 564 """There are no unversioned entries available/selected.""" | |
| 565 ), | |
| 566 ) | 562 ) |
| 567 return | 563 return |
| 568 | 564 |
| 569 self.__addedItemsText = ( | 565 self.__addedItemsText = ( |
| 570 [itm.text() for itm in self.__getUnversionedItems()] | 566 [itm.text() for itm in self.__getUnversionedItems()] |
| 767 ) | 763 ) |
| 768 if not names: | 764 if not names: |
| 769 EricMessageBox.information( | 765 EricMessageBox.information( |
| 770 self, | 766 self, |
| 771 self.tr("Differences"), | 767 self.tr("Differences"), |
| 772 self.tr( | 768 self.tr("""There are no uncommitted changes available/selected."""), |
| 773 """There are no uncommitted changes available/selected.""" | |
| 774 ), | |
| 775 ) | 769 ) |
| 776 return | 770 return |
| 777 | 771 |
| 778 vcs = self.__project.getVcs() | 772 vcs = self.__project.getVcs() |
| 779 vcs and vcs.vcsDiff(names) | 773 vcs and vcs.vcsDiff(names) |
| 798 ] | 792 ] |
| 799 if not names: | 793 if not names: |
| 800 EricMessageBox.information( | 794 EricMessageBox.information( |
| 801 self, | 795 self, |
| 802 self.tr("Differences Side-By-Side"), | 796 self.tr("Differences Side-By-Side"), |
| 803 self.tr( | 797 self.tr("""There are no uncommitted changes available/selected."""), |
| 804 """There are no uncommitted changes available/selected.""" | |
| 805 ), | |
| 806 ) | 798 ) |
| 807 return | 799 return |
| 808 elif len(names) > 1: | 800 elif len(names) > 1: |
| 809 EricMessageBox.information( | 801 EricMessageBox.information( |
| 810 self, | 802 self, |
| 832 ] | 824 ] |
| 833 if not names: | 825 if not names: |
| 834 EricMessageBox.information( | 826 EricMessageBox.information( |
| 835 self, | 827 self, |
| 836 self.tr("Revert"), | 828 self.tr("Revert"), |
| 837 self.tr( | 829 self.tr("""There are no uncommitted changes available/selected."""), |
| 838 """There are no uncommitted changes available/selected.""" | |
| 839 ), | |
| 840 ) | 830 ) |
| 841 return | 831 return |
| 842 | 832 |
| 843 vcs = self.__project.getVcs() | 833 vcs = self.__project.getVcs() |
| 844 vcs and vcs.vcsRevert(names) | 834 vcs and vcs.vcsRevert(names) |
| 913 ] | 903 ] |
| 914 if not names: | 904 if not names: |
| 915 EricMessageBox.information( | 905 EricMessageBox.information( |
| 916 self, | 906 self, |
| 917 self.tr("Conflict Resolved"), | 907 self.tr("Conflict Resolved"), |
| 918 self.tr( | 908 self.tr("""There are no conflicting entries available/selected."""), |
| 919 """There are no conflicting entries available/selected.""" | |
| 920 ), | |
| 921 ) | 909 ) |
| 922 return | 910 return |
| 923 | 911 |
| 924 vcs = self.__project.getVcs() | 912 vcs = self.__project.getVcs() |
| 925 vcs and vcs.vcsResolved(names) | 913 vcs and vcs.vcsResolved(names) |
