Mercurial Repositories > eric / changeset
changeset
HgStatusDialog: backed out the disabling of the status list for merges because it prevents to review the individual changes and to inspect the list for long lists of changed files.
Sat, 31 Aug 2019 12:18:44 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 31 Aug 2019 12:18:44 +0200
- changeset 7188
- f9c57c6fa7c4
- parent 7187
- 11b0c7802a70
- child 7189
- 4d22e3cb9827
HgStatusDialog: backed out the disabling of the status list for merges because it prevents to review the individual changes and to inspect the list for long lists of changed files.
| eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py | file | annotate | diff | comparison | revisions |
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Fri Aug 30 19:25:42 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sat Aug 31 12:18:44 2019 +0200 @@ -407,8 +407,6 @@ self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) self.refreshButton.setEnabled(False) - - self.statusList.setEnabled(not self.vcs.canCommitMerge(self.dname)) def __finish(self): """ @@ -575,8 +573,6 @@ """ Private slot to refresh the status display. """ - self.statusList.setEnabled(not self.vcs.canCommitMerge(self.dname)) - selectedItems = self.statusList.selectedItems() if len(selectedItems) == 1: self.__selectedName = selectedItems[0].text(self.__pathColumn) @@ -935,7 +931,7 @@ """ Private slot to handle the Commit Merge context menu entry. """ - self.vcs.vcsCommit(self.dname, 'Merge', merge=True) + self.vcs.vcsCommit(self.dname, self.tr('Merge'), merge=True) self.__committed() def __abortMerge(self):
