Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py
eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py
- branch
- eric7
- changeset 8621
- 8c9f41115c04
- parent 8412
- 16e8c2896469
- child 8881
- 54e42bc2437a
equal
deleted
inserted
replaced
| 8620:84f7f7867b5f | 8621:8c9f41115c04 |
|---|---|
| 232 "Reverts the changes of the selected files")) | 232 "Reverts the changes of the selected files")) |
| 233 | 233 |
| 234 self.__actionsMenu.addSeparator() | 234 self.__actionsMenu.addSeparator() |
| 235 | 235 |
| 236 self.__forgetAct = self.__actionsMenu.addAction( | 236 self.__forgetAct = self.__actionsMenu.addAction( |
| 237 self.tr("Forget missing"), self.__forget) | 237 self.tr("Forget Missing"), self.__forget) |
| 238 self.__forgetAct.setToolTip(self.tr( | 238 self.__forgetAct.setToolTip(self.tr( |
| 239 "Forgets about the selected missing files")) | 239 "Forgets about the selected missing files")) |
| 240 self.__restoreAct = self.__actionsMenu.addAction( | 240 self.__restoreAct = self.__actionsMenu.addAction( |
| 241 self.tr("Restore missing"), self.__restoreMissing) | 241 self.tr("Restore Missing"), self.__restoreMissing) |
| 242 self.__restoreAct.setToolTip(self.tr( | 242 self.__restoreAct.setToolTip(self.tr( |
| 243 "Restores the selected missing files")) | 243 "Restores the selected missing files")) |
| 244 | 244 |
| 245 self.__actionsMenu.addSeparator() | 245 self.__actionsMenu.addSeparator() |
| 246 | 246 |
| 247 self.__editAct = self.__actionsMenu.addAction( | 247 self.__editAct = self.__actionsMenu.addAction( |
| 248 self.tr("Edit file"), self.__editConflict) | 248 self.tr("Edit Conflict"), self.__editConflict) |
| 249 self.__editAct.setToolTip(self.tr( | 249 self.__editAct.setToolTip(self.tr( |
| 250 "Edit the selected conflicting file")) | 250 "Edit the selected conflicting file")) |
| 251 | 251 |
| 252 self.__actionsMenu.addSeparator() | 252 self.__actionsMenu.addSeparator() |
| 253 | 253 |
| 794 self.tr("Revert"), | 794 self.tr("Revert"), |
| 795 self.tr("""There are no uncommitted, unstaged changes""" | 795 self.tr("""There are no uncommitted, unstaged changes""" |
| 796 """ available/selected.""")) | 796 """ available/selected.""")) |
| 797 return | 797 return |
| 798 | 798 |
| 799 self.vcs.gitRevert(names) | 799 self.vcs.vcsRevert(names) |
| 800 self.raise_() | 800 self.raise_() |
| 801 self.activateWindow() | 801 self.activateWindow() |
| 802 self.on_refreshButton_clicked() | 802 self.on_refreshButton_clicked() |
| 803 | 803 |
| 804 project = ericApp().getObject("Project") | 804 project = ericApp().getObject("Project") |
| 818 self.tr("Restore Missing"), | 818 self.tr("Restore Missing"), |
| 819 self.tr("""There are no missing entries""" | 819 self.tr("""There are no missing entries""" |
| 820 """ available/selected.""")) | 820 """ available/selected.""")) |
| 821 return | 821 return |
| 822 | 822 |
| 823 self.vcs.gitRevert(names) | 823 self.vcs.vcsRevert(names) |
| 824 self.on_refreshButton_clicked() | 824 self.on_refreshButton_clicked() |
| 825 self.vcs.checkVCSStatus() | 825 self.vcs.checkVCSStatus() |
| 826 | 826 |
| 827 def __editConflict(self): | 827 def __editConflict(self): |
| 828 """ | 828 """ |
| 829 Private slot to handle the Edit file context menu entry. | 829 Private slot to handle the Edit Conflict context menu entry. |
| 830 """ | 830 """ |
| 831 itm = self.__getConflictingItems()[0] | 831 itm = self.__getConflictingItems()[0] |
| 832 filename = os.path.join(self.__repodir, itm.text(self.__pathColumn)) | 832 filename = os.path.join(self.__repodir, itm.text(self.__pathColumn)) |
| 833 if Utilities.MimeTypes.isTextFile(filename): | 833 if Utilities.MimeTypes.isTextFile(filename): |
| 834 ericApp().getObject("ViewManager").getEditor(filename) | 834 ericApp().getObject("ViewManager").getEditor(filename) |
| 858 self.diff.show() | 858 self.diff.show() |
| 859 self.diff.start(names, diffMode=diffMode, refreshable=True) | 859 self.diff.start(names, diffMode=diffMode, refreshable=True) |
| 860 | 860 |
| 861 def __sbsDiff(self): | 861 def __sbsDiff(self): |
| 862 """ | 862 """ |
| 863 Private slot to handle the Diff context menu entry. | 863 Private slot to handle the Side-By-Side Diff context menu entry. |
| 864 """ | 864 """ |
| 865 itm = self.__getModifiedOnlyItems()[0] | 865 itm = self.__getModifiedOnlyItems()[0] |
| 866 workModified = (itm.text(self.__statusWorkColumn) in | 866 workModified = (itm.text(self.__statusWorkColumn) in |
| 867 self.modifiedOnlyIndicators) | 867 self.modifiedOnlyIndicators) |
| 868 stageModified = (itm.text(self.__statusIndexColumn) in | 868 stageModified = (itm.text(self.__statusIndexColumn) in |
| 876 self.tr("Staging Area to HEAD Commit"), | 876 self.tr("Staging Area to HEAD Commit"), |
| 877 self.tr("Working Tree to HEAD Commit"), | 877 self.tr("Working Tree to HEAD Commit"), |
| 878 ] | 878 ] |
| 879 result, ok = QInputDialog.getItem( | 879 result, ok = QInputDialog.getItem( |
| 880 None, | 880 None, |
| 881 self.tr("Side-by-Side Difference"), | 881 self.tr("Differences Side-by-Side"), |
| 882 self.tr("Select the compare method."), | 882 self.tr("Select the compare method."), |
| 883 messages, | 883 messages, |
| 884 0, False) | 884 0, False) |
| 885 if not ok: | 885 if not ok: |
| 886 return | 886 return |
| 897 self.tr("Working Tree to Staging Area"), | 897 self.tr("Working Tree to Staging Area"), |
| 898 self.tr("Working Tree to HEAD Commit"), | 898 self.tr("Working Tree to HEAD Commit"), |
| 899 ] | 899 ] |
| 900 result, ok = QInputDialog.getItem( | 900 result, ok = QInputDialog.getItem( |
| 901 None, | 901 None, |
| 902 self.tr("Side-by-Side Difference"), | 902 self.tr("Differences Side-by-Side"), |
| 903 self.tr("Select the compare method."), | 903 self.tr("Select the compare method."), |
| 904 messages, | 904 messages, |
| 905 0, False) | 905 0, False) |
| 906 if not ok: | 906 if not ok: |
| 907 return | 907 return |
| 911 else: | 911 else: |
| 912 revisions = ["HEAD", ""] | 912 revisions = ["HEAD", ""] |
| 913 else: | 913 else: |
| 914 revisions = ["HEAD", "Stage"] | 914 revisions = ["HEAD", "Stage"] |
| 915 | 915 |
| 916 self.vcs.gitSbsDiff(names[0], revisions=revisions) | 916 self.vcs.vcsSbsDiff(names[0], revisions=revisions) |
| 917 | 917 |
| 918 def __getCommitableItems(self): | 918 def __getCommitableItems(self): |
| 919 """ | 919 """ |
| 920 Private method to retrieve all entries the user wants to commit. | 920 Private method to retrieve all entries the user wants to commit. |
| 921 | 921 |
