Mercurial Repositories > eric / changeset
changeset
Corrected some code style issues.
Wed, 12 Mar 2014 18:46:12 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 12 Mar 2014 18:46:12 +0100
- changeset 3359
- 6b6c224d67d6
- parent 3358
- 57af7e9fda48
- child 3360
- 15ea213fcdfb
Corrected some code style issues.
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html Wed Mar 12 18:44:34 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html Wed Mar 12 18:46:12 2014 +0100 @@ -121,7 +121,7 @@ <dd> dictionary of populated menu (dict of QMenu). The dict must have the keys 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' - and 'dirMultiMenu'. + and 'dirMultiMenu'. </dd> </dl><dl> <dt>Raises <b>NotImplementedError</b>:</dt>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html Wed Mar 12 18:44:34 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html Wed Mar 12 18:46:12 2014 +0100 @@ -210,10 +210,10 @@ </dd><dt><i>mq</i></dt> <dd> flag indicating to show the queue status as well (boolean) -</dd><dt><i>mq</i></dt> +</dd><dt><i>largefiles</i></dt> <dd> -flag indicating to show the largefiles status as well - (boolean) +flag indicating to show the largefiles status as + well (boolean) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.html Wed Mar 12 18:44:34 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.html Wed Mar 12 18:46:12 2014 +0100 @@ -115,7 +115,7 @@ <dd> dictionary of populated menu (dict of QMenu). The dict must have the keys 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' - and 'dirMultiMenu'. + and 'dirMultiMenu'. </dd> </dl><a NAME="LargefilesProjectBrowserHelper.menuTitle" ID="LargefilesProjectBrowserHelper.menuTitle"></a> <h4>LargefilesProjectBrowserHelper.menuTitle</h4>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.largefiles.html Wed Mar 12 18:44:34 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.largefiles.html Wed Mar 12 18:46:12 2014 +0100 @@ -93,7 +93,7 @@ <p> Public method used to add a file to the Mercurial repository. </p><dl> -<dt><i>name</i></dt> +<dt><i>names</i></dt> <dd> file name(s) to be added (string or list of string) </dd><dt><i>mode</i></dt>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.html Wed Mar 12 18:44:34 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.html Wed Mar 12 18:46:12 2014 +0100 @@ -77,7 +77,13 @@ <p> Constructor </p><dl> -<dt><i>parent</i></dt> +<dt><i>message</i></dt> +<dd> +message to be shown (string) +</dd><dt><i>shelveNames</i></dt> +<dd> +list of shelve names (list of string) +</dd><dt><i>parent</i></dt> <dd> reference to the parent widget (QWidget) </dd>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html Wed Mar 12 18:44:34 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html Wed Mar 12 18:46:12 2014 +0100 @@ -125,7 +125,7 @@ <dd> dictionary of populated menu (dict of QMenu). The dict must have the keys 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' - and 'dirMultiMenu'. + and 'dirMultiMenu'. </dd> </dl><a NAME="ShelveProjectBrowserHelper.menuTitle" ID="ShelveProjectBrowserHelper.menuTitle"></a> <h4>ShelveProjectBrowserHelper.menuTitle</h4>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Wed Mar 12 18:44:34 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Wed Mar 12 18:46:12 2014 +0100 @@ -1088,10 +1088,10 @@ <dt><i>mq</i></dt> <dd> flag indicating to show the queue status as well (boolean) -</dd><dt><i>mq</i></dt> +</dd><dt><i>largefiles</i></dt> <dd> -flag indicating to show the largefiles status as well - (boolean) +flag indicating to show the largefiles status as + well (boolean) </dd> </dl><a NAME="Hg.hgUnbundle" ID="Hg.hgUnbundle"></a> <h4>Hg.hgUnbundle</h4>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html Wed Mar 12 18:44:34 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html Wed Mar 12 18:46:12 2014 +0100 @@ -414,7 +414,8 @@ filename to show the log for (string) </dd><dt><i>isFile=</i></dt> <dd> -flag indicating log for a file is to be shown (boolean) +flag indicating log for a file is to be shown + (boolean) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html Wed Mar 12 18:44:34 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html Wed Mar 12 18:46:12 2014 +0100 @@ -478,7 +478,8 @@ filename to show the log for (string) </dd><dt><i>isFile=</i></dt> <dd> -flag indicating log for a file is to be shown (boolean) +flag indicating log for a file is to be shown + (boolean) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectBrowserHelper.py Wed Mar 12 18:44:34 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectBrowserHelper.py Wed Mar 12 18:46:12 2014 +0100 @@ -41,7 +41,7 @@ @ireturn dictionary of populated menu (dict of QMenu). The dict must have the keys 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' - and 'dirMultiMenu'. + and 'dirMultiMenu'. @exception NotImplementedError raised if the class has not been reimplemented """
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Wed Mar 12 18:44:34 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Wed Mar 12 18:46:12 2014 +0100 @@ -786,7 +786,7 @@ process.waitForFinished(30000) if self.commandMode != "incoming" or \ - (self.vcs.bundleFile and + (self.vcs.bundleFile and os.path.exists(self.vcs.bundleFile)) or \ self.__bundle: self.process.start('hg', args)
--- a/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Wed Mar 12 18:44:34 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Wed Mar 12 18:46:12 2014 +0100 @@ -65,8 +65,8 @@ @param path path name of the working directory (string) @param mq flag indicating to show the queue status as well (boolean) - @param mq flag indicating to show the largefiles status as well - (boolean) + @param largefiles flag indicating to show the largefiles status as + well (boolean) """ self.errorGroup.hide() self.__path = path
--- a/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py Wed Mar 12 18:44:34 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py Wed Mar 12 18:46:12 2014 +0100 @@ -36,7 +36,7 @@ @return dictionary of populated menu (dict of QMenu). The dict must have the keys 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' - and 'dirMultiMenu'. + and 'dirMultiMenu'. """ self.__menus = {} self.__addSingleActs = []
--- a/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/__init__.py Wed Mar 12 18:44:34 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/__init__.py Wed Mar 12 18:46:12 2014 +0100 @@ -7,6 +7,7 @@ Package implementing the largefiles extension support interface. """ + def getDefaults(): """ Function to get the default values of the extension.
--- a/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py Wed Mar 12 18:44:34 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py Wed Mar 12 18:46:12 2014 +0100 @@ -47,7 +47,7 @@ while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): repodir = os.path.dirname(repodir) if os.path.splitdrive(repodir)[1] == os.sep: - return False + return from .LfConvertDataDialog import LfConvertDataDialog dlg = LfConvertDataDialog(projectDir, direction) @@ -101,7 +101,7 @@ """ Public method used to add a file to the Mercurial repository. - @param name file name(s) to be added (string or list of string) + @param names file name(s) to be added (string or list of string) @param mode add mode (string one of 'normal' or 'large') """ args = self.vcs.initCommand("add")
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Wed Mar 12 18:44:34 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Wed Mar 12 18:46:12 2014 +0100 @@ -240,7 +240,7 @@ """ act = None if key in ['mainMenu', 'multiMenu', 'backMenu', 'dirMenu', - 'dirMultiMenu']: + 'dirMultiMenu']: extensionsMenu = QMenu(self.tr("Extensions"), menu) extensionsMenu.setTearOffEnabled(True) for extensionMenuTitle in sorted(self.__extensionMenuTitles):
--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.py Wed Mar 12 18:44:34 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.py Wed Mar 12 18:46:12 2014 +0100 @@ -18,6 +18,8 @@ """ Constructor + @param message message to be shown (string) + @param shelveNames list of shelve names (list of string) @param parent reference to the parent widget (QWidget) """ super().__init__(parent)
--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py Wed Mar 12 18:44:34 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py Wed Mar 12 18:46:12 2014 +0100 @@ -34,7 +34,7 @@ @return dictionary of populated menu (dict of QMenu). The dict must have the keys 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' - and 'dirMultiMenu'. + and 'dirMultiMenu'. """ self.__menus = {}
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Wed Mar 12 18:44:34 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Wed Mar 12 18:46:12 2014 +0100 @@ -886,8 +886,8 @@ working directory state. @param mq flag indicating to show the queue status as well (boolean) - @param mq flag indicating to show the largefiles status as well - (boolean) + @param largefiles flag indicating to show the largefiles status as + well (boolean) """ from .HgSummaryDialog import HgSummaryDialog self.summary = HgSummaryDialog(self) @@ -2221,7 +2221,7 @@ cfgFile = os.path.join(repodir, self.adminDir, "hgrc") if not os.path.exists(cfgFile): # open dialog to enter the initial data - withLargefiles = (self.isExtensionActive("largefiles") and + withLargefiles = (self.isExtensionActive("largefiles") and withLargefiles) from .HgRepoConfigDataDialog import HgRepoConfigDataDialog dlg = HgRepoConfigDataDialog(withLargefiles=withLargefiles,
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Wed Mar 12 18:44:34 2014 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Wed Mar 12 18:46:12 2014 +0100 @@ -332,7 +332,8 @@ Public slot to start the svn log command. @param fn filename to show the log for (string) - @keyparam isFile flag indicating log for a file is to be shown (boolean) + @keyparam isFile flag indicating log for a file is to be shown + (boolean) """ self.sbsCheckBox.setEnabled(isFile) self.sbsCheckBox.setVisible(isFile)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Wed Mar 12 18:44:34 2014 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Wed Mar 12 18:46:12 2014 +0100 @@ -291,7 +291,8 @@ Public slot to start the svn log command. @param fn filename to show the log for (string) - @keyparam isFile flag indicating log for a file is to be shown (boolean) + @keyparam isFile flag indicating log for a file is to be shown + (boolean) """ self.sbsCheckBox.setEnabled(isFile) self.sbsCheckBox.setVisible(isFile)
--- a/Project/PropertiesDialog.py Wed Mar 12 18:44:34 2014 +0100 +++ b/Project/PropertiesDialog.py Wed Mar 12 18:46:12 2014 +0100 @@ -140,7 +140,7 @@ self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( bool(self.dirEdit.text()) and - Utilities.fromNativeSeparators(self.dirEdit.text()) not in + Utilities.fromNativeSeparators(self.dirEdit.text()) not in self.__initPaths) @pyqtSlot(str)
