Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py
src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py
- branch
- eric7
- changeset 9576
- be9f8e7e42e0
- parent 9573
- 9960d19d66b5
- child 9616
- 13aa04c979d7
equal
deleted
inserted
replaced
| 9575:635b6c5a36e1 | 9576:be9f8e7e42e0 |
|---|---|
| 224 | 224 |
| 225 self.__diffAct = self.__actionsMenu.addAction( | 225 self.__diffAct = self.__actionsMenu.addAction( |
| 226 self.tr("Differences"), self.__diff | 226 self.tr("Differences"), self.__diff |
| 227 ) | 227 ) |
| 228 self.__diffAct.setToolTip( | 228 self.__diffAct.setToolTip( |
| 229 self.tr( | 229 self.tr("Shows the differences of the selected entry in a separate dialog") |
| 230 "Shows the differences of the selected entry in a" " separate dialog" | |
| 231 ) | |
| 232 ) | 230 ) |
| 233 self.__sbsDiffAct = self.__actionsMenu.addAction( | 231 self.__sbsDiffAct = self.__actionsMenu.addAction( |
| 234 self.tr("Differences Side-By-Side"), self.__sbsDiff | 232 self.tr("Differences Side-By-Side"), self.__sbsDiff |
| 235 ) | 233 ) |
| 236 self.__sbsDiffAct.setToolTip( | 234 self.__sbsDiffAct.setToolTip( |
| 717 ] | 715 ] |
| 718 if not names: | 716 if not names: |
| 719 EricMessageBox.information( | 717 EricMessageBox.information( |
| 720 self, | 718 self, |
| 721 self.tr("Add"), | 719 self.tr("Add"), |
| 722 self.tr( | 720 self.tr("""There are no unversioned entries available/selected."""), |
| 723 """There are no unversioned entries available/selected.""" | |
| 724 ), | |
| 725 ) | 721 ) |
| 726 return | 722 return |
| 727 | 723 |
| 728 self.vcs.vcsAdd(names) | 724 self.vcs.vcsAdd(names) |
| 729 self.on_refreshButton_clicked() | 725 self.on_refreshButton_clicked() |
| 743 ] | 739 ] |
| 744 if not names: | 740 if not names: |
| 745 EricMessageBox.information( | 741 EricMessageBox.information( |
| 746 self, | 742 self, |
| 747 self.tr("Stage"), | 743 self.tr("Stage"), |
| 748 self.tr( | 744 self.tr("""There are no stageable entries available/selected."""), |
| 749 """There are no stageable entries available/selected.""" | |
| 750 ), | |
| 751 ) | 745 ) |
| 752 return | 746 return |
| 753 | 747 |
| 754 self.vcs.vcsAdd(names) | 748 self.vcs.vcsAdd(names) |
| 755 self.on_refreshButton_clicked() | 749 self.on_refreshButton_clicked() |
| 769 ] | 763 ] |
| 770 if not names: | 764 if not names: |
| 771 EricMessageBox.information( | 765 EricMessageBox.information( |
| 772 self, | 766 self, |
| 773 self.tr("Unstage"), | 767 self.tr("Unstage"), |
| 774 self.tr( | 768 self.tr("""There are no unstageable entries available/selected."""), |
| 775 """There are no unstageable entries available/selected.""" | |
| 776 ), | |
| 777 ) | 769 ) |
| 778 return | 770 return |
| 779 | 771 |
| 780 self.vcs.gitUnstage(names) | 772 self.vcs.gitUnstage(names) |
| 781 self.on_refreshButton_clicked() | 773 self.on_refreshButton_clicked() |
| 878 ] | 870 ] |
| 879 if not namesW and not namesS: | 871 if not namesW and not namesS: |
| 880 EricMessageBox.information( | 872 EricMessageBox.information( |
| 881 self, | 873 self, |
| 882 self.tr("Differences"), | 874 self.tr("Differences"), |
| 883 self.tr( | 875 self.tr("""There are no uncommitted changes available/selected."""), |
| 884 """There are no uncommitted changes available/selected.""" | |
| 885 ), | |
| 886 ) | 876 ) |
| 887 return | 877 return |
| 888 | 878 |
| 889 diffMode = "work2stage2repo" | 879 diffMode = "work2stage2repo" |
| 890 names = namesW + namesS | 880 names = namesW + namesS |
