Mercurial Repositories > eric / file diff

--- a/Plugins/PluginVcsMercurial.py	Mon May 30 19:23:59 2011 +0200
+++ b/Plugins/PluginVcsMercurial.py	Mon May 30 19:50:55 2011 +0200
@@ -158,6 +158,7 @@
             "PullUpdate": False,
             "ServerPort": 8000,
             "ServerStyle": "",
+            "CleanupPatterns": "*.orig *.rej",
         }
         
         from VcsPlugins.vcsMercurial.ProjectHelper import HgProjectHelper
@@ -205,13 +206,14 @@
             return Preferences.toBool(Preferences.Prefs.settings.value(
                 "Mercurial/" + key, self.__mercurialDefaults[key]))
         elif key in ["LogLimit", "CommitMessages", "ServerPort"]:
-            return int(Preferences.Prefs.settings.value("Mercurial/" + key,
-                self.__mercurialDefaults[key]))
+            return int(Preferences.Prefs.settings.value(
+                "Mercurial/" + key, self.__mercurialDefaults[key]))
         elif key in ["Commits"]:
             return Preferences.toList(Preferences.Prefs.settings.value(
-                "Mercurial/" + key))
+                "Mercurial/" + key, self.__mercurialDefaults[key]))
         else:
-            return Preferences.Prefs.settings.value("Mercurial/" + key)
+            return Preferences.Prefs.settings.value(
+                "Mercurial/" + key, self.__mercurialDefaults[key])
     
     def setPreferences(self, key, value):
         """