Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py
src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py
- branch
- eric7
- changeset 9576
- be9f8e7e42e0
- parent 9473
- 3f23dbf37dbe
- child 9653
- e67609152c5e
equal
deleted
inserted
replaced
| 9575:635b6c5a36e1 | 9576:be9f8e7e42e0 |
|---|---|
| 82 self.__modeMessages = { | 82 self.__modeMessages = { |
| 83 "work2stage": self.tr("Working Tree to Staging Area"), | 83 "work2stage": self.tr("Working Tree to Staging Area"), |
| 84 "stage2repo": self.tr("Staging Area to HEAD Commit"), | 84 "stage2repo": self.tr("Staging Area to HEAD Commit"), |
| 85 "work2repo": self.tr("Working Tree to HEAD Commit"), | 85 "work2repo": self.tr("Working Tree to HEAD Commit"), |
| 86 "work2stage2repo": self.tr( | 86 "work2stage2repo": self.tr( |
| 87 "Working to Staging (top)" " and Staging to HEAD (bottom)" | 87 "Working to Staging (top) and Staging to HEAD (bottom)" |
| 88 ), | 88 ), |
| 89 "stash": self.tr("Stash Contents"), | 89 "stash": self.tr("Stash Contents"), |
| 90 "stashName": self.tr("Stash Contents of {0}"), | 90 "stashName": self.tr("Stash Contents of {0}"), |
| 91 } | 91 } |
| 92 | 92 |
| 332 if fpath.exists(): | 332 if fpath.exists(): |
| 333 res = EricMessageBox.yesNo( | 333 res = EricMessageBox.yesNo( |
| 334 self, | 334 self, |
| 335 self.tr("Save Diff"), | 335 self.tr("Save Diff"), |
| 336 self.tr( | 336 self.tr( |
| 337 "<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>" | 337 "<p>The patch file <b>{0}</b> already exists. Overwrite it?</p>" |
| 338 ).format(fpath), | 338 ).format(fpath), |
| 339 icon=EricMessageBox.Warning, | 339 icon=EricMessageBox.Warning, |
| 340 ) | 340 ) |
| 341 if not res: | 341 if not res: |
| 342 return | 342 return |
