Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
- branch
- eric7
- changeset 11218
- 43dfc40728d2
- parent 11148
- 15e30f0c76a8
equal
deleted
inserted
replaced
| 11217:856628e8a303 | 11218:43dfc40728d2 |
|---|---|
| 1000 | 1000 |
| 1001 project = ericApp().getObject("Project") | 1001 project = ericApp().getObject("Project") |
| 1002 names = [project.getRelativePath(nam) for nam in names] | 1002 names = [project.getRelativePath(nam) for nam in names] |
| 1003 if names[0]: | 1003 if names[0]: |
| 1004 dlg = DeleteFilesConfirmationDialog( | 1004 dlg = DeleteFilesConfirmationDialog( |
| 1005 self.parent(), | 1005 self.__ui, |
| 1006 self.tr("Revert changes"), | 1006 self.tr("Revert changes"), |
| 1007 self.tr( | 1007 self.tr( |
| 1008 "Do you really want to revert all changes to these files" | 1008 "Do you really want to revert all changes to these files" |
| 1009 " or directories?" | 1009 " or directories?" |
| 1010 ), | 1010 ), |
| 1095 | 1095 |
| 1096 project = ericApp().getObject("Project") | 1096 project = ericApp().getObject("Project") |
| 1097 names = [project.getRelativePath(nam) for nam in names] | 1097 names = [project.getRelativePath(nam) for nam in names] |
| 1098 if names[0]: | 1098 if names[0]: |
| 1099 dlg = DeleteFilesConfirmationDialog( | 1099 dlg = DeleteFilesConfirmationDialog( |
| 1100 self.parent(), | 1100 self.__ui, |
| 1101 self.tr("Re-Merge"), | 1101 self.tr("Re-Merge"), |
| 1102 self.tr("Do you really want to re-merge these files or directories?"), | 1102 self.tr("Do you really want to re-merge these files or directories?"), |
| 1103 names, | 1103 names, |
| 1104 ) | 1104 ) |
| 1105 yes = dlg.exec() == QDialog.DialogCode.Accepted | 1105 yes = dlg.exec() == QDialog.DialogCode.Accepted |
