Mercurial Repositories > eric / file diff

diff -r 1538031b5175 -r c3e7bf5648be Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Thu Sep 02 08:58:41 2010 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Thu Sep 02 16:36:23 2010 +0200
@@ -10,7 +10,7 @@
 import os
 
 from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, QFileInfo
-from PyQt4.QtGui import QWidget, QDialogButtonBox, QBrush, QColor, QMessageBox, \
+from PyQt4.QtGui import QWidget, QDialogButtonBox, QBrush, QColor, \
     QTextCursor, QFileDialog, QLineEdit
 
 from E5Gui import E5MessageBox
@@ -277,15 +277,12 @@
             if ex:
                 fname += ex
         if QFileInfo(fname).exists():
-            res = E5MessageBox.warning(self,
+            res = E5MessageBox.yesNo(self,
                 self.trUtf8("Save Diff"),
-                self.trUtf8("<p>The patch file <b>{0}</b> already exists.</p>")
-                    .format(fname),
-                QMessageBox.StandardButtons(\
-                    QMessageBox.Abort | \
-                    QMessageBox.Save),
-                QMessageBox.Abort)
-            if res != QMessageBox.Save:
+                self.trUtf8("<p>The patch file <b>{0}</b> already exists."
+                            " Overwrite it?</p>").format(fname),
+                type_ = E5MessageBox.Warning)
+            if not res:
                 return
         fname = Utilities.toNativeSeparators(fname)
         
@@ -347,4 +344,4 @@
             self.intercept = False
             evt.accept()
             return
-        QWidget.keyPressEvent(self, evt)
\ No newline at end of file
+        QWidget.keyPressEvent(self, evt)