--- a/Plugins/PluginVcsMercurial.py Tue Oct 15 22:03:54 2013 +0200 +++ b/Plugins/PluginVcsMercurial.py Fri Oct 18 23:00:41 2013 +0200 @@ -34,7 +34,8 @@ className = "VcsMercurialPlugin" packageName = "__core__" shortDescription = "Implements the Mercurial version control interface." -longDescription = """This plugin provides the Mercurial version control interface.""" +longDescription = \ + """This plugin provides the Mercurial version control interface.""" pyqtApi = 2 # End-Of-Header @@ -71,8 +72,8 @@ """ Public function to get the indicators for this version control system. - @return dictionary with indicator as key and a tuple with the vcs name (string) - and vcs display string (string) + @return dictionary with indicator as key and a tuple with the vcs name + (string) and vcs display string (string) """ global pluginTypename data = {} @@ -106,10 +107,12 @@ """ Module function to create the configuration page. + @param configDlg reference to the configuration dialog (QDialog) @return reference to the configuration page """ global mercurialCfgPluginObject - from VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage import MercurialPage + from VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage import \ + MercurialPage if mercurialCfgPluginObject is None: mercurialCfgPluginObject = VcsMercurialPlugin(None) page = MercurialPage(mercurialCfgPluginObject) @@ -120,7 +123,8 @@ """ Module function returning data as required by the configuration dialog. - @return dictionary with key "zzz_mercurialPage" containing the relevant data + @return dictionary with key "zzz_mercurialPage" containing the relevant + data """ return { "zzz_mercurialPage": \ @@ -135,7 +139,8 @@ """ Module function to prepare for an uninstallation. """ - if not e5App().getObject("PluginManager").isPluginLoaded("PluginVcsMercurial"): + if not e5App().getObject("PluginManager").isPluginLoaded( + "PluginVcsMercurial"): Preferences.Prefs.settings.remove("Mercurial") @@ -168,8 +173,8 @@ from VcsPlugins.vcsMercurial.ProjectHelper import HgProjectHelper self.__projectHelperObject = HgProjectHelper(None, None) try: - e5App().registerPluginObject(pluginTypename, self.__projectHelperObject, - pluginType) + e5App().registerPluginObject( + pluginTypename, self.__projectHelperObject, pluginType) except KeyError: pass # ignore duplicate registration readShortcuts(pluginName=pluginTypename) @@ -206,8 +211,8 @@ @param key the key of the value to get @return the requested setting """ - if key in ["StopLogOnCopy", "UseLogBrowser", "PullUpdate", "PreferUnbundle", - "CreateBackup"]: + if key in ["StopLogOnCopy", "UseLogBrowser", "PullUpdate", + "PreferUnbundle", "CreateBackup"]: return Preferences.toBool(Preferences.Prefs.settings.value( "Mercurial/" + key, self.__mercurialDefaults[key])) elif key in ["LogLimit", "CommitMessages", "ServerPort"]: