Mercurial Repositories > eric / file comparison
comparison: src/eric7/VCS/StatusWidget.py
src/eric7/VCS/StatusWidget.py
- branch
- eric7
- changeset 9573
- 9960d19d66b5
- parent 9473
- 3f23dbf37dbe
- child 9576
- be9f8e7e42e0
equal
deleted
inserted
replaced
| 9572:3b46c662a004 | 9573:9960d19d66b5 |
|---|---|
| 499 | 499 |
| 500 if not names: | 500 if not names: |
| 501 EricMessageBox.information( | 501 EricMessageBox.information( |
| 502 self, | 502 self, |
| 503 self.tr("Commit"), | 503 self.tr("Commit"), |
| 504 self.tr("""There are no entries selected to be""" """ committed."""), | 504 self.tr("""There are no entries selected to be committed."""), |
| 505 ) | 505 ) |
| 506 return | 506 return |
| 507 | 507 |
| 508 if Preferences.getVCS("AutoSaveFiles"): | 508 if Preferences.getVCS("AutoSaveFiles"): |
| 509 vm = ericApp().getObject("ViewManager") | 509 vm = ericApp().getObject("ViewManager") |
| 559 if not names: | 559 if not names: |
| 560 EricMessageBox.information( | 560 EricMessageBox.information( |
| 561 self, | 561 self, |
| 562 self.tr("Add"), | 562 self.tr("Add"), |
| 563 self.tr( | 563 self.tr( |
| 564 """There are no unversioned entries""" """ available/selected.""" | 564 """There are no unversioned entries available/selected.""" |
| 565 ), | 565 ), |
| 566 ) | 566 ) |
| 567 return | 567 return |
| 568 | 568 |
| 569 self.__addedItemsText = ( | 569 self.__addedItemsText = ( |
| 768 if not names: | 768 if not names: |
| 769 EricMessageBox.information( | 769 EricMessageBox.information( |
| 770 self, | 770 self, |
| 771 self.tr("Differences"), | 771 self.tr("Differences"), |
| 772 self.tr( | 772 self.tr( |
| 773 """There are no uncommitted changes""" """ available/selected.""" | 773 """There are no uncommitted changes available/selected.""" |
| 774 ), | 774 ), |
| 775 ) | 775 ) |
| 776 return | 776 return |
| 777 | 777 |
| 778 vcs = self.__project.getVcs() | 778 vcs = self.__project.getVcs() |
| 799 if not names: | 799 if not names: |
| 800 EricMessageBox.information( | 800 EricMessageBox.information( |
| 801 self, | 801 self, |
| 802 self.tr("Differences Side-By-Side"), | 802 self.tr("Differences Side-By-Side"), |
| 803 self.tr( | 803 self.tr( |
| 804 """There are no uncommitted changes""" """ available/selected.""" | 804 """There are no uncommitted changes available/selected.""" |
| 805 ), | 805 ), |
| 806 ) | 806 ) |
| 807 return | 807 return |
| 808 elif len(names) > 1: | 808 elif len(names) > 1: |
| 809 EricMessageBox.information( | 809 EricMessageBox.information( |
| 833 if not names: | 833 if not names: |
| 834 EricMessageBox.information( | 834 EricMessageBox.information( |
| 835 self, | 835 self, |
| 836 self.tr("Revert"), | 836 self.tr("Revert"), |
| 837 self.tr( | 837 self.tr( |
| 838 """There are no uncommitted changes""" """ available/selected.""" | 838 """There are no uncommitted changes available/selected.""" |
| 839 ), | 839 ), |
| 840 ) | 840 ) |
| 841 return | 841 return |
| 842 | 842 |
| 843 vcs = self.__project.getVcs() | 843 vcs = self.__project.getVcs() |
| 856 ] | 856 ] |
| 857 if not names: | 857 if not names: |
| 858 EricMessageBox.information( | 858 EricMessageBox.information( |
| 859 self, | 859 self, |
| 860 self.tr("Forget Missing"), | 860 self.tr("Forget Missing"), |
| 861 self.tr("""There are no missing entries""" """ available/selected."""), | 861 self.tr("""There are no missing entries available/selected."""), |
| 862 ) | 862 ) |
| 863 return | 863 return |
| 864 | 864 |
| 865 vcs = self.__project.getVcs() | 865 vcs = self.__project.getVcs() |
| 866 vcs and vcs.vcsForget(names) | 866 vcs and vcs.vcsForget(names) |
| 878 ] | 878 ] |
| 879 if not names: | 879 if not names: |
| 880 EricMessageBox.information( | 880 EricMessageBox.information( |
| 881 self, | 881 self, |
| 882 self.tr("Restore Missing"), | 882 self.tr("Restore Missing"), |
| 883 self.tr("""There are no missing entries""" """ available/selected."""), | 883 self.tr("""There are no missing entries available/selected."""), |
| 884 ) | 884 ) |
| 885 return | 885 return |
| 886 | 886 |
| 887 vcs = self.__project.getVcs() | 887 vcs = self.__project.getVcs() |
| 888 vcs and vcs.vcsRevert(names) | 888 vcs and vcs.vcsRevert(names) |
| 914 if not names: | 914 if not names: |
| 915 EricMessageBox.information( | 915 EricMessageBox.information( |
| 916 self, | 916 self, |
| 917 self.tr("Conflict Resolved"), | 917 self.tr("Conflict Resolved"), |
| 918 self.tr( | 918 self.tr( |
| 919 """There are no conflicting entries""" """ available/selected.""" | 919 """There are no conflicting entries available/selected.""" |
| 920 ), | 920 ), |
| 921 ) | 921 ) |
| 922 return | 922 return |
| 923 | 923 |
| 924 vcs = self.__project.getVcs() | 924 vcs = self.__project.getVcs() |
| 975 | 975 |
| 976 if not names: | 976 if not names: |
| 977 EricMessageBox.information( | 977 EricMessageBox.information( |
| 978 self, | 978 self, |
| 979 self.tr("Commit"), | 979 self.tr("Commit"), |
| 980 self.tr("""There are no entries selected to be""" """ committed."""), | 980 self.tr("""There are no entries selected to be committed."""), |
| 981 ) | 981 ) |
| 982 return | 982 return |
| 983 | 983 |
| 984 if Preferences.getVCS("AutoSaveFiles"): | 984 if Preferences.getVCS("AutoSaveFiles"): |
| 985 vm = ericApp().getObject("ViewManager") | 985 vm = ericApp().getObject("ViewManager") |
