Plugins/VcsPlugins/vcsMercurial/hg.py

changeset 553
5af61623ae3c
parent 546
c3e7bf5648be
child 564
b3d966393ba9
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Fri Sep 03 18:53:24 2010 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Fri Sep 03 20:04:49 2010 +0200
@@ -1676,7 +1676,7 @@
                 self.trUtf8("Create .hgignore file"),
                 self.trUtf8("""<p>The file <b>{0}</b> exists already."""
                             """ Overwrite it?</p>""").format(ignoreName),
-                type_ = E5MessageBox.Warning)
+                icon = E5MessageBox.Warning)
         else:
             res = True
         if res:
@@ -1738,7 +1738,7 @@
                     self.trUtf8("<p>The Mercurial changegroup file <b>{0}</b> "
                                 "already exists. Overwrite it?</p>")
                         .format(fname),
-                    type_ = E5MessageBox.Warning)
+                    icon = E5MessageBox.Warning)
                 if not res:
                     return
             fname = Utilities.toNativeSeparators(fname)
@@ -2038,4 +2038,4 @@
         @param interval check interval for the monitor thread in seconds (integer)
         @return reference to the monitor thread (QThread)
         """
-        return HgStatusMonitorThread(interval, project, self)
+        return HgStatusMonitorThread(interval, project, self)
\ No newline at end of file

eric ide

mercurial