Sun, 12 Feb 2017 18:07:05 +0100
Regenerated source docu.
--- a/APIs/Python3/eric6.api Sun Feb 12 18:06:07 2017 +0100 +++ b/APIs/Python3/eric6.api Sun Feb 12 18:07:05 2017 +0100 @@ -4049,6 +4049,7 @@ eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.DEFAULT_EXCLUDE?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.DEFAULT_IGNORE?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.DOCSTRING_REGEX?7 +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.DUNDER_REGEX?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.DiffReport.error?4(line_number, offset, text, check) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.DiffReport?1(options) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.ERRORCODE_REGEX?7 @@ -4070,6 +4071,9 @@ eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.SINGLETONS?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.SKIP_COMMENTS?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.SKIP_TOKENS?7 +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.STARTSWITH_DEF_REGEX?7 +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.STARTSWITH_INDENT_STATEMENT_REGEX?7 +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.STARTSWITH_TOP_LEVEL_REGEX?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.StandardReport.error?4(line_number, offset, text, check) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.StandardReport.error_args?4(line_number, offset, code, check, *args) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.StandardReport.get_file_results?4() @@ -4639,12 +4643,12 @@ eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage?1(plugin) eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.HgFetchDialog.getData?4() eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.HgFetchDialog.on_recentComboBox_activated?4(txt) -eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.HgFetchDialog?1(parent=None) +eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.HgFetchDialog?1(vcs, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.FetchProjectHelper.initActions?4() eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.FetchProjectHelper.initMenu?4(mainMenu) eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.FetchProjectHelper.menuTitle?4() eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.FetchProjectHelper?1() -eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch.Fetch.hgFetch?4(name) +eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch.Fetch.hgFetch?4(name, revisions=None) eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch.Fetch?1(vcs) eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.HgGpgSignDialog.getData?4() eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.HgGpgSignDialog.on_bookmarkButton_toggled?4(checked) @@ -4672,7 +4676,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.ProjectHelper.GpgProjectHelper.initMenu?4(mainMenu) eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.ProjectHelper.GpgProjectHelper.menuTitle?4() eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.ProjectHelper.GpgProjectHelper?1() -eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.gpg.Gpg.hgGpgSign?4(path) +eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.gpg.Gpg.hgGpgSign?4(path, revisions=None) eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.gpg.Gpg.hgGpgSignatures?4(path) eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.gpg.Gpg.hgGpgVerifySignatures?4(path, rev=None) eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.gpg.Gpg.shutdown?4() @@ -4881,11 +4885,10 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.keyPressEvent?4(evt) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_branchCombo_activated?4(txt) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_buttonBox_clicked?4(button) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffP1Button_clicked?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffP2Button_clicked?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffRevisionsButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffSelectLabel_linkActivated?4(link) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_downButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_fieldCombo_activated?4(txt) +eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_filesTree_currentItemChanged?4(current, previous) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_findNextButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_findPrevButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_fromDate_dateChanged?4(date) @@ -4898,6 +4901,8 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_refreshButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_rxEdit_returnPressed?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_rxEdit_textChanged?4(txt) +eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_saveLabel_linkActivated?4(link) +eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_sbsSelectLabel_linkActivated?4(link) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_toDate_dateChanged?4(date) @@ -4935,7 +4940,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.HgRepoConfigDataDialog.on_defaultPushShowPasswordButton_clicked?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.HgRepoConfigDataDialog.on_defaultShowPasswordButton_clicked?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.HgRepoConfigDataDialog?1(withLargefiles=False, largefilesData=None, parent=None) -eric6.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.getRevision?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.getRevision?4(revset=True) eric6.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_bookmarkButton_toggled?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_bookmarkCombo_editTextChanged?4(txt) eric6.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_branchButton_toggled?4(checked) @@ -5324,7 +5329,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBookmarkPush?4(name, current=False, bookmark=None) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBookmarkRename?4(name, renameInfo=None) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBranch?4(name) -eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBundle?4(name) +eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBundle?4(name, bundleData=None) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCancelMerge?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgConflicts?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCopy?4(name, project) @@ -5351,7 +5356,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgOutgoing?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPhase?4(name, data=None) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPreviewBundle?4(name) -eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPull?4(name) +eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPull?4(name, revisions=None) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPush?4(name, force=False, newBranch=False, rev=None) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgReMerge?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRecover?4(name) @@ -5365,7 +5370,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgShowConfig?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgShowPaths?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgSummary?4(mq=False, largefiles=False) -eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgUnbundle?4(name) +eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgUnbundle?4(name, files=None) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgVerify?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.iniFileChanged?7 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.initCommand?4(command) @@ -5388,7 +5393,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsInit?4(vcsDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsInitConfig?4(project) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsLogBrowser?4(name, isFile=False) -eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsMerge?4(name) +eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsMerge?4(name, rev="") eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsMove?4(name, project, target=None, noDialog=False) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsName?4() eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsNewProjectOptionsDialog?4(parent=None)
--- a/Documentation/Help/source.qhp Sun Feb 12 18:06:07 2017 +0100 +++ b/Documentation/Help/source.qhp Sun Feb 12 18:07:05 2017 +0100 @@ -7552,29 +7552,35 @@ <keyword name="HgLogBrowserDialog (Constructor)" id="HgLogBrowserDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__init__" /> <keyword name="HgLogBrowserDialog (Module)" id="HgLogBrowserDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html" /> <keyword name="HgLogBrowserDialog.__actionMode" id="HgLogBrowserDialog.__actionMode" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__actionMode" /> + <keyword name="HgLogBrowserDialog.__actionsMenuHovered" id="HgLogBrowserDialog.__actionsMenuHovered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__actionsMenuHovered" /> <keyword name="HgLogBrowserDialog.__addFinishCallback" id="HgLogBrowserDialog.__addFinishCallback" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__addFinishCallback" /> <keyword name="HgLogBrowserDialog.__bookmarkActTriggered" id="HgLogBrowserDialog.__bookmarkActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__bookmarkActTriggered" /> <keyword name="HgLogBrowserDialog.__bookmarkMoveActTriggered" id="HgLogBrowserDialog.__bookmarkMoveActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__bookmarkMoveActTriggered" /> <keyword name="HgLogBrowserDialog.__branchColor" id="HgLogBrowserDialog.__branchColor" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__branchColor" /> - <keyword name="HgLogBrowserDialog.__diffRevisions" id="HgLogBrowserDialog.__diffRevisions" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__diffRevisions" /> + <keyword name="HgLogBrowserDialog.__bundleActTriggered" id="HgLogBrowserDialog.__bundleActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__bundleActTriggered" /> <keyword name="HgLogBrowserDialog.__fetchActTriggered" id="HgLogBrowserDialog.__fetchActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__fetchActTriggered" /> <keyword name="HgLogBrowserDialog.__filterLogs" id="HgLogBrowserDialog.__filterLogs" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__filterLogs" /> <keyword name="HgLogBrowserDialog.__findItem" id="HgLogBrowserDialog.__findItem" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__findItem" /> <keyword name="HgLogBrowserDialog.__finish" id="HgLogBrowserDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__finish" /> + <keyword name="HgLogBrowserDialog.__generateDetailsTableText" id="HgLogBrowserDialog.__generateDetailsTableText" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__generateDetailsTableText" /> + <keyword name="HgLogBrowserDialog.__generateDiffs" id="HgLogBrowserDialog.__generateDiffs" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__generateDiffs" /> <keyword name="HgLogBrowserDialog.__generateEdges" id="HgLogBrowserDialog.__generateEdges" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__generateEdges" /> - <keyword name="HgLogBrowserDialog.__generateFileItem" id="HgLogBrowserDialog.__generateFileItem" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__generateFileItem" /> <keyword name="HgLogBrowserDialog.__generateIcon" id="HgLogBrowserDialog.__generateIcon" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__generateIcon" /> <keyword name="HgLogBrowserDialog.__generateLogItem" id="HgLogBrowserDialog.__generateLogItem" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__generateLogItem" /> + <keyword name="HgLogBrowserDialog.__generatorFinished" id="HgLogBrowserDialog.__generatorFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__generatorFinished" /> <keyword name="HgLogBrowserDialog.__getClosedBranches" id="HgLogBrowserDialog.__getClosedBranches" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getClosedBranches" /> <keyword name="HgLogBrowserDialog.__getColor" id="HgLogBrowserDialog.__getColor" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getColor" /> <keyword name="HgLogBrowserDialog.__getLogEntries" id="HgLogBrowserDialog.__getLogEntries" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getLogEntries" /> <keyword name="HgLogBrowserDialog.__getParents" id="HgLogBrowserDialog.__getParents" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getParents" /> <keyword name="HgLogBrowserDialog.__getRevisionOfTag" id="HgLogBrowserDialog.__getRevisionOfTag" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getRevisionOfTag" /> + <keyword name="HgLogBrowserDialog.__gpgSignActTriggered" id="HgLogBrowserDialog.__gpgSignActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__gpgSignActTriggered" /> + <keyword name="HgLogBrowserDialog.__gpgVerifyActTriggered" id="HgLogBrowserDialog.__gpgVerifyActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__gpgVerifyActTriggered" /> <keyword name="HgLogBrowserDialog.__graftActTriggered" id="HgLogBrowserDialog.__graftActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__graftActTriggered" /> <keyword name="HgLogBrowserDialog.__identifyProject" id="HgLogBrowserDialog.__identifyProject" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__identifyProject" /> <keyword name="HgLogBrowserDialog.__initActionsMenu" id="HgLogBrowserDialog.__initActionsMenu" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__initActionsMenu" /> <keyword name="HgLogBrowserDialog.__initData" id="HgLogBrowserDialog.__initData" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__initData" /> <keyword name="HgLogBrowserDialog.__lfPullActTriggered" id="HgLogBrowserDialog.__lfPullActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__lfPullActTriggered" /> + <keyword name="HgLogBrowserDialog.__mergeActTriggered" id="HgLogBrowserDialog.__mergeActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__mergeActTriggered" /> <keyword name="HgLogBrowserDialog.__modifyForLargeFiles" id="HgLogBrowserDialog.__modifyForLargeFiles" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__modifyForLargeFiles" /> <keyword name="HgLogBrowserDialog.__phaseActTriggered" id="HgLogBrowserDialog.__phaseActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__phaseActTriggered" /> <keyword name="HgLogBrowserDialog.__prepareFieldSearch" id="HgLogBrowserDialog.__prepareFieldSearch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__prepareFieldSearch" /> @@ -7585,28 +7591,32 @@ <keyword name="HgLogBrowserDialog.__pushAllActTriggered" id="HgLogBrowserDialog.__pushAllActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__pushAllActTriggered" /> <keyword name="HgLogBrowserDialog.__readStderr" id="HgLogBrowserDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__readStderr" /> <keyword name="HgLogBrowserDialog.__readStdout" id="HgLogBrowserDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__readStdout" /> + <keyword name="HgLogBrowserDialog.__reloadGeometry" id="HgLogBrowserDialog.__reloadGeometry" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__reloadGeometry" /> <keyword name="HgLogBrowserDialog.__resetUI" id="HgLogBrowserDialog.__resetUI" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__resetUI" /> <keyword name="HgLogBrowserDialog.__resizeColumnsFiles" id="HgLogBrowserDialog.__resizeColumnsFiles" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__resizeColumnsFiles" /> <keyword name="HgLogBrowserDialog.__resizeColumnsLog" id="HgLogBrowserDialog.__resizeColumnsLog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__resizeColumnsLog" /> <keyword name="HgLogBrowserDialog.__resortFiles" id="HgLogBrowserDialog.__resortFiles" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__resortFiles" /> + <keyword name="HgLogBrowserDialog.__restoreSplitterStates" id="HgLogBrowserDialog.__restoreSplitterStates" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__restoreSplitterStates" /> <keyword name="HgLogBrowserDialog.__revisionClicked" id="HgLogBrowserDialog.__revisionClicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__revisionClicked" /> + <keyword name="HgLogBrowserDialog.__selectAllActTriggered" id="HgLogBrowserDialog.__selectAllActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__selectAllActTriggered" /> <keyword name="HgLogBrowserDialog.__showError" id="HgLogBrowserDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__showError" /> <keyword name="HgLogBrowserDialog.__stripActTriggered" id="HgLogBrowserDialog.__stripActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__stripActTriggered" /> <keyword name="HgLogBrowserDialog.__switchActTriggered" id="HgLogBrowserDialog.__switchActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__switchActTriggered" /> <keyword name="HgLogBrowserDialog.__tagActTriggered" id="HgLogBrowserDialog.__tagActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__tagActTriggered" /> - <keyword name="HgLogBrowserDialog.__updateDiffButtons" id="HgLogBrowserDialog.__updateDiffButtons" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__updateDiffButtons" /> - <keyword name="HgLogBrowserDialog.__updateGui" id="HgLogBrowserDialog.__updateGui" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__updateGui" /> + <keyword name="HgLogBrowserDialog.__unbundleActTriggered" id="HgLogBrowserDialog.__unbundleActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__unbundleActTriggered" /> + <keyword name="HgLogBrowserDialog.__updateDetailsAndFiles" id="HgLogBrowserDialog.__updateDetailsAndFiles" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__updateDetailsAndFiles" /> + <keyword name="HgLogBrowserDialog.__updateFilesTree" id="HgLogBrowserDialog.__updateFilesTree" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__updateFilesTree" /> + <keyword name="HgLogBrowserDialog.__updateSbsSelectLabel" id="HgLogBrowserDialog.__updateSbsSelectLabel" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__updateSbsSelectLabel" /> <keyword name="HgLogBrowserDialog.__updateToolMenuActions" id="HgLogBrowserDialog.__updateToolMenuActions" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__updateToolMenuActions" /> <keyword name="HgLogBrowserDialog.closeEvent" id="HgLogBrowserDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.closeEvent" /> <keyword name="HgLogBrowserDialog.col2x" id="HgLogBrowserDialog.col2x" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.col2x" /> <keyword name="HgLogBrowserDialog.keyPressEvent" id="HgLogBrowserDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.keyPressEvent" /> <keyword name="HgLogBrowserDialog.on_branchCombo_activated" id="HgLogBrowserDialog.on_branchCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_branchCombo_activated" /> <keyword name="HgLogBrowserDialog.on_buttonBox_clicked" id="HgLogBrowserDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_buttonBox_clicked" /> - <keyword name="HgLogBrowserDialog.on_diffP1Button_clicked" id="HgLogBrowserDialog.on_diffP1Button_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffP1Button_clicked" /> - <keyword name="HgLogBrowserDialog.on_diffP2Button_clicked" id="HgLogBrowserDialog.on_diffP2Button_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffP2Button_clicked" /> - <keyword name="HgLogBrowserDialog.on_diffRevisionsButton_clicked" id="HgLogBrowserDialog.on_diffRevisionsButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffRevisionsButton_clicked" /> + <keyword name="HgLogBrowserDialog.on_diffSelectLabel_linkActivated" id="HgLogBrowserDialog.on_diffSelectLabel_linkActivated" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffSelectLabel_linkActivated" /> <keyword name="HgLogBrowserDialog.on_downButton_clicked" id="HgLogBrowserDialog.on_downButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_downButton_clicked" /> <keyword name="HgLogBrowserDialog.on_fieldCombo_activated" id="HgLogBrowserDialog.on_fieldCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_fieldCombo_activated" /> + <keyword name="HgLogBrowserDialog.on_filesTree_currentItemChanged" id="HgLogBrowserDialog.on_filesTree_currentItemChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_filesTree_currentItemChanged" /> <keyword name="HgLogBrowserDialog.on_findNextButton_clicked" id="HgLogBrowserDialog.on_findNextButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_findNextButton_clicked" /> <keyword name="HgLogBrowserDialog.on_findPrevButton_clicked" id="HgLogBrowserDialog.on_findPrevButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_findPrevButton_clicked" /> <keyword name="HgLogBrowserDialog.on_fromDate_dateChanged" id="HgLogBrowserDialog.on_fromDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_fromDate_dateChanged" /> @@ -7619,6 +7629,8 @@ <keyword name="HgLogBrowserDialog.on_refreshButton_clicked" id="HgLogBrowserDialog.on_refreshButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_refreshButton_clicked" /> <keyword name="HgLogBrowserDialog.on_rxEdit_returnPressed" id="HgLogBrowserDialog.on_rxEdit_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_rxEdit_returnPressed" /> <keyword name="HgLogBrowserDialog.on_rxEdit_textChanged" id="HgLogBrowserDialog.on_rxEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_rxEdit_textChanged" /> + <keyword name="HgLogBrowserDialog.on_saveLabel_linkActivated" id="HgLogBrowserDialog.on_saveLabel_linkActivated" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_saveLabel_linkActivated" /> + <keyword name="HgLogBrowserDialog.on_sbsSelectLabel_linkActivated" id="HgLogBrowserDialog.on_sbsSelectLabel_linkActivated" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_sbsSelectLabel_linkActivated" /> <keyword name="HgLogBrowserDialog.on_sendButton_clicked" id="HgLogBrowserDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_sendButton_clicked" /> <keyword name="HgLogBrowserDialog.on_stopCheckBox_clicked" id="HgLogBrowserDialog.on_stopCheckBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_stopCheckBox_clicked" /> <keyword name="HgLogBrowserDialog.on_toDate_dateChanged" id="HgLogBrowserDialog.on_toDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_toDate_dateChanged" />
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html Sun Feb 12 18:06:07 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html Sun Feb 12 18:07:05 2017 +0100 @@ -23,7 +23,7 @@ <h3>Global Attributes</h3> <table> -<tr><td>ARITHMETIC_OP</td></tr><tr><td>BENCHMARK_KEYS</td></tr><tr><td>COMMENT_WITH_NL</td></tr><tr><td>COMPARE_NEGATIVE_REGEX</td></tr><tr><td>COMPARE_SINGLETON_REGEX</td></tr><tr><td>COMPARE_TYPE_REGEX</td></tr><tr><td>DEFAULT_EXCLUDE</td></tr><tr><td>DEFAULT_IGNORE</td></tr><tr><td>DOCSTRING_REGEX</td></tr><tr><td>ERRORCODE_REGEX</td></tr><tr><td>EXTRANEOUS_WHITESPACE_REGEX</td></tr><tr><td>HUNK_REGEX</td></tr><tr><td>INDENT_REGEX</td></tr><tr><td>KEYWORDS</td></tr><tr><td>KEYWORD_REGEX</td></tr><tr><td>LAMBDA_REGEX</td></tr><tr><td>MAX_LINE_LENGTH</td></tr><tr><td>NEWLINE</td></tr><tr><td>OPERATOR_REGEX</td></tr><tr><td>PROJECT_CONFIG</td></tr><tr><td>PyCF_ONLY_AST</td></tr><tr><td>RAISE_COMMA_REGEX</td></tr><tr><td>REPORT_FORMAT</td></tr><tr><td>RERAISE_COMMA_REGEX</td></tr><tr><td>SINGLETONS</td></tr><tr><td>SKIP_COMMENTS</td></tr><tr><td>SKIP_TOKENS</td></tr><tr><td>TESTSUITE_PATH</td></tr><tr><td>UNARY_OPERATORS</td></tr><tr><td>WHITESPACE</td></tr><tr><td>WHITESPACE_AFTER_COMMA_REGEX</td></tr><tr><td>WS_NEEDED_OPERATORS</td></tr><tr><td>WS_OPTIONAL_OPERATORS</td></tr><tr><td>__version__</td></tr><tr><td>_checks</td></tr><tr><td>noqa</td></tr> +<tr><td>ARITHMETIC_OP</td></tr><tr><td>BENCHMARK_KEYS</td></tr><tr><td>COMMENT_WITH_NL</td></tr><tr><td>COMPARE_NEGATIVE_REGEX</td></tr><tr><td>COMPARE_SINGLETON_REGEX</td></tr><tr><td>COMPARE_TYPE_REGEX</td></tr><tr><td>DEFAULT_EXCLUDE</td></tr><tr><td>DEFAULT_IGNORE</td></tr><tr><td>DOCSTRING_REGEX</td></tr><tr><td>DUNDER_REGEX</td></tr><tr><td>ERRORCODE_REGEX</td></tr><tr><td>EXTRANEOUS_WHITESPACE_REGEX</td></tr><tr><td>HUNK_REGEX</td></tr><tr><td>INDENT_REGEX</td></tr><tr><td>KEYWORDS</td></tr><tr><td>KEYWORD_REGEX</td></tr><tr><td>LAMBDA_REGEX</td></tr><tr><td>MAX_LINE_LENGTH</td></tr><tr><td>NEWLINE</td></tr><tr><td>OPERATOR_REGEX</td></tr><tr><td>PROJECT_CONFIG</td></tr><tr><td>PyCF_ONLY_AST</td></tr><tr><td>RAISE_COMMA_REGEX</td></tr><tr><td>REPORT_FORMAT</td></tr><tr><td>RERAISE_COMMA_REGEX</td></tr><tr><td>SINGLETONS</td></tr><tr><td>SKIP_COMMENTS</td></tr><tr><td>SKIP_TOKENS</td></tr><tr><td>STARTSWITH_DEF_REGEX</td></tr><tr><td>STARTSWITH_INDENT_STATEMENT_REGEX</td></tr><tr><td>STARTSWITH_TOP_LEVEL_REGEX</td></tr><tr><td>TESTSUITE_PATH</td></tr><tr><td>UNARY_OPERATORS</td></tr><tr><td>WHITESPACE</td></tr><tr><td>WHITESPACE_AFTER_COMMA_REGEX</td></tr><tr><td>WS_NEEDED_OPERATORS</td></tr><tr><td>WS_OPTIONAL_OPERATORS</td></tr><tr><td>__version__</td></tr><tr><td>_checks</td></tr><tr><td>noqa</td></tr> </table> <h3>Classes</h3> <table> @@ -801,6 +801,7 @@ E303: def a():\n\n\n\n pass E304: @decorator\n\ndef a():\n pass E305: def a():\n pass\na() + E306: def a():\n def b():\n pass\n def c():\n pass </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> @@ -916,7 +917,6 @@ E702: do_one(); do_two(); do_three() E703: do_four(); # useless semicolon E704: def f(x): return 2*x - E705: async def f(x): return 2*x E731: f = lambda x: 2*x </p> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html Sun Feb 12 18:06:07 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html Sun Feb 12 18:07:05 2017 +0100 @@ -73,13 +73,16 @@ </table> <a NAME="HgFetchDialog.__init__" ID="HgFetchDialog.__init__"></a> <h4>HgFetchDialog (Constructor)</h4> -<b>HgFetchDialog</b>(<i>parent=None</i>) +<b>HgFetchDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl> -<dt><i>parent</i></dt> +<dt><i>vcs</i> (Hg)</dt> <dd> -reference to the parent widget (QWidget) +reference to the Mercurial vcs object +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget </dd> </dl><a NAME="HgFetchDialog.getData" ID="HgFetchDialog.getData"></a> <h4>HgFetchDialog.getData</h4>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch.html Sun Feb 12 18:06:07 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch.html Sun Feb 12 18:07:05 2017 +0100 @@ -80,18 +80,27 @@ </dd> </dl><a NAME="Fetch.hgFetch" ID="Fetch.hgFetch"></a> <h4>Fetch.hgFetch</h4> -<b>hgFetch</b>(<i>name</i>) +<b>hgFetch</b>(<i>name, revisions=None</i>) <p> Public method to fetch changes from a remote repository. </p><dl> -<dt><i>name</i></dt> +<dt><i>name</i> (str)</dt> <dd> -file/directory name (string) +directory name of the project to be fetched to +</dd><dt><i>revisions</i> (list of str)</dt> +<dd> +list of revisions to be pulled </dd> </dl><dl> <dt>Returns:</dt> <dd> -flag indicating that the project should be reread (boolean) +flag indicating, that the update contained an add + or delete +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.gpg.html Sun Feb 12 18:06:07 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.gpg.html Sun Feb 12 18:07:05 2017 +0100 @@ -89,13 +89,16 @@ </dd> </dl><a NAME="Gpg.hgGpgSign" ID="Gpg.hgGpgSign"></a> <h4>Gpg.hgGpgSign</h4> -<b>hgGpgSign</b>(<i>path</i>) +<b>hgGpgSign</b>(<i>path, revisions=None</i>) <p> Public method used to list the available bookmarks. </p><dl> -<dt><i>path</i></dt> +<dt><i>path</i> (str)</dt> <dd> -directory name of the project (string) +directory name of the project +</dd><dt><i>revisions</i> (list of str)</dt> +<dd> +list containing the revisions to be signed </dd> </dl><a NAME="Gpg.hgGpgSignatures" ID="Gpg.hgGpgSignatures"></a> <h4>Gpg.hgGpgSignatures</h4>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Sun Feb 12 18:06:07 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Sun Feb 12 18:07:05 2017 +0100 @@ -63,6 +63,9 @@ <td><a href="#HgLogBrowserDialog.__actionMode">__actionMode</a></td> <td>Private method to get the selected action mode.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__actionsMenuHovered">__actionsMenuHovered</a></td> +<td>Private slot to show the tooltip for an action menu entry.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__addFinishCallback">__addFinishCallback</a></td> <td>Private method to add a method to be called once the process finished.</td> </tr><tr> @@ -75,8 +78,8 @@ <td><a href="#HgLogBrowserDialog.__branchColor">__branchColor</a></td> <td>Private method to calculate a color for a given branch name.</td> </tr><tr> -<td><a href="#HgLogBrowserDialog.__diffRevisions">__diffRevisions</a></td> -<td>Private method to do a diff of two revisions.</td> +<td><a href="#HgLogBrowserDialog.__bundleActTriggered">__bundleActTriggered</a></td> +<td>Private slot to create a changegroup file.</td> </tr><tr> <td><a href="#HgLogBrowserDialog.__fetchActTriggered">__fetchActTriggered</a></td> <td>Private slot to fetch changes from a remote repository.</td> @@ -90,18 +93,24 @@ <td><a href="#HgLogBrowserDialog.__finish">__finish</a></td> <td>Private slot called when the process finished or the user pressed the button.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__generateDetailsTableText">__generateDetailsTableText</a></td> +<td>Private method to generate an HTML table with the details of the given changeset.</td> +</tr><tr> +<td><a href="#HgLogBrowserDialog.__generateDiffs">__generateDiffs</a></td> +<td>Private slot to generate diff outputs for the selected item.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__generateEdges">__generateEdges</a></td> <td>Private method to generate edge info for the give data.</td> </tr><tr> -<td><a href="#HgLogBrowserDialog.__generateFileItem">__generateFileItem</a></td> -<td>Private method to generate a changed files tree entry.</td> -</tr><tr> <td><a href="#HgLogBrowserDialog.__generateIcon">__generateIcon</a></td> <td>Private method to generate an icon containing the revision tree for the given data.</td> </tr><tr> <td><a href="#HgLogBrowserDialog.__generateLogItem">__generateLogItem</a></td> <td>Private method to generate a log tree entry.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__generatorFinished">__generatorFinished</a></td> +<td>Private slot connected to the finished signal of the diff generator.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__getClosedBranches">__getClosedBranches</a></td> <td>Private method to get the list of closed branches.</td> </tr><tr> @@ -117,6 +126,12 @@ <td><a href="#HgLogBrowserDialog.__getRevisionOfTag">__getRevisionOfTag</a></td> <td>Private method to get the revision of a tag.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__gpgSignActTriggered">__gpgSignActTriggered</a></td> +<td>Private slot to sign the selected revisions.</td> +</tr><tr> +<td><a href="#HgLogBrowserDialog.__gpgVerifyActTriggered">__gpgVerifyActTriggered</a></td> +<td>Private slot to verify the signatures of a selected revisions.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__graftActTriggered">__graftActTriggered</a></td> <td>Private slot to handle the Copy Changesets action.</td> </tr><tr> @@ -132,6 +147,9 @@ <td><a href="#HgLogBrowserDialog.__lfPullActTriggered">__lfPullActTriggered</a></td> <td>Private slot to pull large files of selected revisions.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__mergeActTriggered">__mergeActTriggered</a></td> +<td>Private slot to merge the working directory with the selected changeset.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__modifyForLargeFiles">__modifyForLargeFiles</a></td> <td>Private method to convert the displayed file name for a large file.</td> </tr><tr> @@ -162,6 +180,9 @@ <td><a href="#HgLogBrowserDialog.__readStdout">__readStdout</a></td> <td>Private slot to handle the readyReadStandardOutput signal.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__reloadGeometry">__reloadGeometry</a></td> +<td>Private method to restore the geometry.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__resetUI">__resetUI</a></td> <td>Private method to reset the user interface.</td> </tr><tr> @@ -174,9 +195,15 @@ <td><a href="#HgLogBrowserDialog.__resortFiles">__resortFiles</a></td> <td>Private method to resort the changed files tree.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__restoreSplitterStates">__restoreSplitterStates</a></td> +<td>Private method to restore the state of the various splitters.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__revisionClicked">__revisionClicked</a></td> <td>Private slot to handle the anchorClicked signal of the changeset details pane.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__selectAllActTriggered">__selectAllActTriggered</a></td> +<td>Private method to select or unselect all log entries.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__showError">__showError</a></td> <td>Private slot to show some error.</td> </tr><tr> @@ -189,11 +216,17 @@ <td><a href="#HgLogBrowserDialog.__tagActTriggered">__tagActTriggered</a></td> <td>Private slot to tag the selected revision.</td> </tr><tr> -<td><a href="#HgLogBrowserDialog.__updateDiffButtons">__updateDiffButtons</a></td> -<td>Private slot to update the enabled status of the diff buttons.</td> +<td><a href="#HgLogBrowserDialog.__unbundleActTriggered">__unbundleActTriggered</a></td> +<td>Private slot to apply the currently previewed bundle file.</td> +</tr><tr> +<td><a href="#HgLogBrowserDialog.__updateDetailsAndFiles">__updateDetailsAndFiles</a></td> +<td>Private slot to update the details and file changes panes.</td> </tr><tr> -<td><a href="#HgLogBrowserDialog.__updateGui">__updateGui</a></td> -<td>Private slot to update GUI elements except tool menu actions.</td> +<td><a href="#HgLogBrowserDialog.__updateFilesTree">__updateFilesTree</a></td> +<td>Private method to update the files tree with changes of the given item.</td> +</tr><tr> +<td><a href="#HgLogBrowserDialog.__updateSbsSelectLabel">__updateSbsSelectLabel</a></td> +<td>Private slot to update the enabled status of the diff buttons.</td> </tr><tr> <td><a href="#HgLogBrowserDialog.__updateToolMenuActions">__updateToolMenuActions</a></td> <td>Private slot to update the status of the tool menu actions and the tool menu button.</td> @@ -213,14 +246,8 @@ <td><a href="#HgLogBrowserDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> <td>Private slot called by a button of the button box clicked.</td> </tr><tr> -<td><a href="#HgLogBrowserDialog.on_diffP1Button_clicked">on_diffP1Button_clicked</a></td> -<td>Private slot to handle the Diff to Parent 1 button.</td> -</tr><tr> -<td><a href="#HgLogBrowserDialog.on_diffP2Button_clicked">on_diffP2Button_clicked</a></td> -<td>Private slot to handle the Diff to Parent 2 button.</td> -</tr><tr> -<td><a href="#HgLogBrowserDialog.on_diffRevisionsButton_clicked">on_diffRevisionsButton_clicked</a></td> -<td>Private slot to handle the Compare Revisions button.</td> +<td><a href="#HgLogBrowserDialog.on_diffSelectLabel_linkActivated">on_diffSelectLabel_linkActivated</a></td> +<td>Private slot to handle the selection of a diff target.</td> </tr><tr> <td><a href="#HgLogBrowserDialog.on_downButton_clicked">on_downButton_clicked</a></td> <td>Private slot to move the current item down one entry.</td> @@ -228,6 +255,9 @@ <td><a href="#HgLogBrowserDialog.on_fieldCombo_activated">on_fieldCombo_activated</a></td> <td>Private slot called, when a new filter field is selected.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.on_filesTree_currentItemChanged">on_filesTree_currentItemChanged</a></td> +<td>Private slot called, when the current item of the files tree changes.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.on_findNextButton_clicked">on_findNextButton_clicked</a></td> <td>Private slot to find the next item matching the entered criteria.</td> </tr><tr> @@ -264,6 +294,12 @@ <td><a href="#HgLogBrowserDialog.on_rxEdit_textChanged">on_rxEdit_textChanged</a></td> <td>Private slot called, when a filter expression is entered.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.on_saveLabel_linkActivated">on_saveLabel_linkActivated</a></td> +<td>Private slot to handle the selection of the save link.</td> +</tr><tr> +<td><a href="#HgLogBrowserDialog.on_sbsSelectLabel_linkActivated">on_sbsSelectLabel_linkActivated</a></td> +<td>Private slot to handle selection of a side-by-side link.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> <td>Private slot to send the input to the mercurial process.</td> </tr><tr> @@ -313,6 +349,16 @@ <dd> selected action mode (string, one of filter or find) </dd> +</dl><a NAME="HgLogBrowserDialog.__actionsMenuHovered" ID="HgLogBrowserDialog.__actionsMenuHovered"></a> +<h4>HgLogBrowserDialog.__actionsMenuHovered</h4> +<b>__actionsMenuHovered</b>(<i>action</i>) +<p> + Private slot to show the tooltip for an action menu entry. +</p><dl> +<dt><i>action</i> (QAction)</dt> +<dd> +action to show tooltip for +</dd> </dl><a NAME="HgLogBrowserDialog.__addFinishCallback" ID="HgLogBrowserDialog.__addFinishCallback"></a> <h4>HgLogBrowserDialog.__addFinishCallback</h4> <b>__addFinishCallback</b>(<i>callback</i>) @@ -351,20 +397,12 @@ <dd> name of the color to use (string) </dd> -</dl><a NAME="HgLogBrowserDialog.__diffRevisions" ID="HgLogBrowserDialog.__diffRevisions"></a> -<h4>HgLogBrowserDialog.__diffRevisions</h4> -<b>__diffRevisions</b>(<i>rev1, rev2</i>) +</dl><a NAME="HgLogBrowserDialog.__bundleActTriggered" ID="HgLogBrowserDialog.__bundleActTriggered"></a> +<h4>HgLogBrowserDialog.__bundleActTriggered</h4> +<b>__bundleActTriggered</b>(<i></i>) <p> - Private method to do a diff of two revisions. -</p><dl> -<dt><i>rev1</i></dt> -<dd> -first revision number (integer) -</dd><dt><i>rev2</i></dt> -<dd> -second revision number (integer) -</dd> -</dl><a NAME="HgLogBrowserDialog.__fetchActTriggered" ID="HgLogBrowserDialog.__fetchActTriggered"></a> + Private slot to create a changegroup file. +</p><a NAME="HgLogBrowserDialog.__fetchActTriggered" ID="HgLogBrowserDialog.__fetchActTriggered"></a> <h4>HgLogBrowserDialog.__fetchActTriggered</h4> <b>__fetchActTriggered</b>(<i></i>) <p> @@ -393,7 +431,38 @@ <p> Private slot called when the process finished or the user pressed the button. -</p><a NAME="HgLogBrowserDialog.__generateEdges" ID="HgLogBrowserDialog.__generateEdges"></a> +</p><a NAME="HgLogBrowserDialog.__generateDetailsTableText" ID="HgLogBrowserDialog.__generateDetailsTableText"></a> +<h4>HgLogBrowserDialog.__generateDetailsTableText</h4> +<b>__generateDetailsTableText</b>(<i>itm</i>) +<p> + Private method to generate an HTML table with the details of the given + changeset. +</p><dl> +<dt><i>itm</i> (QTreeWidgetItem)</dt> +<dd> +reference to the item the table should be based on +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +HTML table containing details +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="HgLogBrowserDialog.__generateDiffs" ID="HgLogBrowserDialog.__generateDiffs"></a> +<h4>HgLogBrowserDialog.__generateDiffs</h4> +<b>__generateDiffs</b>(<i>parent=1</i>) +<p> + Private slot to generate diff outputs for the selected item. +</p><dl> +<dt><i>parent</i> (int)</dt> +<dd> +number of parent to diff against +</dd> +</dl><a NAME="HgLogBrowserDialog.__generateEdges" ID="HgLogBrowserDialog.__generateEdges"></a> <h4>HgLogBrowserDialog.__generateEdges</h4> <b>__generateEdges</b>(<i>rev, parents</i>) <p> @@ -414,27 +483,6 @@ between the given node and its parents (integer, integer, [(integer, integer, integer), ...]) </dd> -</dl><a NAME="HgLogBrowserDialog.__generateFileItem" ID="HgLogBrowserDialog.__generateFileItem"></a> -<h4>HgLogBrowserDialog.__generateFileItem</h4> -<b>__generateFileItem</b>(<i>action, path, copyfrom</i>) -<p> - Private method to generate a changed files tree entry. -</p><dl> -<dt><i>action</i></dt> -<dd> -indicator for the change action ("A", "D" or "M") -</dd><dt><i>path</i></dt> -<dd> -path of the file in the repository (string) -</dd><dt><i>copyfrom</i></dt> -<dd> -path the file was copied from (string) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -reference to the generated item (QTreeWidgetItem) -</dd> </dl><a NAME="HgLogBrowserDialog.__generateIcon" ID="HgLogBrowserDialog.__generateIcon"></a> <h4>HgLogBrowserDialog.__generateIcon</h4> <b>__generateIcon</b>(<i>column, color, bottomedges, topedges, dotColor, currentRev, closed</i>) @@ -520,7 +568,12 @@ <dd> reference to the generated item (QTreeWidgetItem) </dd> -</dl><a NAME="HgLogBrowserDialog.__getClosedBranches" ID="HgLogBrowserDialog.__getClosedBranches"></a> +</dl><a NAME="HgLogBrowserDialog.__generatorFinished" ID="HgLogBrowserDialog.__generatorFinished"></a> +<h4>HgLogBrowserDialog.__generatorFinished</h4> +<b>__generatorFinished</b>(<i></i>) +<p> + Private slot connected to the finished signal of the diff generator. +</p><a NAME="HgLogBrowserDialog.__getClosedBranches" ID="HgLogBrowserDialog.__getClosedBranches"></a> <h4>HgLogBrowserDialog.__getClosedBranches</h4> <b>__getClosedBranches</b>(<i></i>) <p> @@ -589,7 +642,17 @@ <dd> tuple of (str, str) </dd> -</dl><a NAME="HgLogBrowserDialog.__graftActTriggered" ID="HgLogBrowserDialog.__graftActTriggered"></a> +</dl><a NAME="HgLogBrowserDialog.__gpgSignActTriggered" ID="HgLogBrowserDialog.__gpgSignActTriggered"></a> +<h4>HgLogBrowserDialog.__gpgSignActTriggered</h4> +<b>__gpgSignActTriggered</b>(<i></i>) +<p> + Private slot to sign the selected revisions. +</p><a NAME="HgLogBrowserDialog.__gpgVerifyActTriggered" ID="HgLogBrowserDialog.__gpgVerifyActTriggered"></a> +<h4>HgLogBrowserDialog.__gpgVerifyActTriggered</h4> +<b>__gpgVerifyActTriggered</b>(<i></i>) +<p> + Private slot to verify the signatures of a selected revisions. +</p><a NAME="HgLogBrowserDialog.__graftActTriggered" ID="HgLogBrowserDialog.__graftActTriggered"></a> <h4>HgLogBrowserDialog.__graftActTriggered</h4> <b>__graftActTriggered</b>(<i></i>) <p> @@ -614,6 +677,12 @@ <b>__lfPullActTriggered</b>(<i></i>) <p> Private slot to pull large files of selected revisions. +</p><a NAME="HgLogBrowserDialog.__mergeActTriggered" ID="HgLogBrowserDialog.__mergeActTriggered"></a> +<h4>HgLogBrowserDialog.__mergeActTriggered</h4> +<b>__mergeActTriggered</b>(<i></i>) +<p> + Private slot to merge the working directory with the selected + changeset. </p><a NAME="HgLogBrowserDialog.__modifyForLargeFiles" ID="HgLogBrowserDialog.__modifyForLargeFiles"></a> <h4>HgLogBrowserDialog.__modifyForLargeFiles</h4> <b>__modifyForLargeFiles</b>(<i>filename</i>) @@ -694,6 +763,11 @@ Private slot to handle the readyReadStandardOutput signal. </p><p> It reads the output of the process and inserts it into a buffer. +</p><a NAME="HgLogBrowserDialog.__reloadGeometry" ID="HgLogBrowserDialog.__reloadGeometry"></a> +<h4>HgLogBrowserDialog.__reloadGeometry</h4> +<b>__reloadGeometry</b>(<i></i>) +<p> + Private method to restore the geometry. </p><a NAME="HgLogBrowserDialog.__resetUI" ID="HgLogBrowserDialog.__resetUI"></a> <h4>HgLogBrowserDialog.__resetUI</h4> <b>__resetUI</b>(<i></i>) @@ -714,6 +788,11 @@ <b>__resortFiles</b>(<i></i>) <p> Private method to resort the changed files tree. +</p><a NAME="HgLogBrowserDialog.__restoreSplitterStates" ID="HgLogBrowserDialog.__restoreSplitterStates"></a> +<h4>HgLogBrowserDialog.__restoreSplitterStates</h4> +<b>__restoreSplitterStates</b>(<i></i>) +<p> + Private method to restore the state of the various splitters. </p><a NAME="HgLogBrowserDialog.__revisionClicked" ID="HgLogBrowserDialog.__revisionClicked"></a> <h4>HgLogBrowserDialog.__revisionClicked</h4> <b>__revisionClicked</b>(<i>url</i>) @@ -725,6 +804,16 @@ <dd> URL that was clicked </dd> +</dl><a NAME="HgLogBrowserDialog.__selectAllActTriggered" ID="HgLogBrowserDialog.__selectAllActTriggered"></a> +<h4>HgLogBrowserDialog.__selectAllActTriggered</h4> +<b>__selectAllActTriggered</b>(<i>select=True</i>) +<p> + Private method to select or unselect all log entries. +</p><dl> +<dt><i>select</i> (bool)</dt> +<dd> +flag indicating to select all entries +</dd> </dl><a NAME="HgLogBrowserDialog.__showError" ID="HgLogBrowserDialog.__showError"></a> <h4>HgLogBrowserDialog.__showError</h4> <b>__showError</b>(<i>out</i>) @@ -751,23 +840,35 @@ <b>__tagActTriggered</b>(<i></i>) <p> Private slot to tag the selected revision. -</p><a NAME="HgLogBrowserDialog.__updateDiffButtons" ID="HgLogBrowserDialog.__updateDiffButtons"></a> -<h4>HgLogBrowserDialog.__updateDiffButtons</h4> -<b>__updateDiffButtons</b>(<i></i>) +</p><a NAME="HgLogBrowserDialog.__unbundleActTriggered" ID="HgLogBrowserDialog.__unbundleActTriggered"></a> +<h4>HgLogBrowserDialog.__unbundleActTriggered</h4> +<b>__unbundleActTriggered</b>(<i></i>) +<p> + Private slot to apply the currently previewed bundle file. +</p><a NAME="HgLogBrowserDialog.__updateDetailsAndFiles" ID="HgLogBrowserDialog.__updateDetailsAndFiles"></a> +<h4>HgLogBrowserDialog.__updateDetailsAndFiles</h4> +<b>__updateDetailsAndFiles</b>(<i></i>) +<p> + Private slot to update the details and file changes panes. +</p><a NAME="HgLogBrowserDialog.__updateFilesTree" ID="HgLogBrowserDialog.__updateFilesTree"></a> +<h4>HgLogBrowserDialog.__updateFilesTree</h4> +<b>__updateFilesTree</b>(<i>parent, itm</i>) +<p> + Private method to update the files tree with changes of the given item. +</p><dl> +<dt><i>parent</i> (QTreeWidget or QTreeWidgetItem)</dt> +<dd> +parent for the items to be added +</dd><dt><i>itm</i> (QTreeWidgetItem)</dt> +<dd> +reference to the item the update should be based on +</dd> +</dl><a NAME="HgLogBrowserDialog.__updateSbsSelectLabel" ID="HgLogBrowserDialog.__updateSbsSelectLabel"></a> +<h4>HgLogBrowserDialog.__updateSbsSelectLabel</h4> +<b>__updateSbsSelectLabel</b>(<i></i>) <p> Private slot to update the enabled status of the diff buttons. -</p><a NAME="HgLogBrowserDialog.__updateGui" ID="HgLogBrowserDialog.__updateGui"></a> -<h4>HgLogBrowserDialog.__updateGui</h4> -<b>__updateGui</b>(<i>itm</i>) -<p> - Private slot to update GUI elements except tool menu actions. -</p><dl> -<dt><i>itm</i></dt> -<dd> -reference to the item the update should be based on - (QTreeWidgetItem) -</dd> -</dl><a NAME="HgLogBrowserDialog.__updateToolMenuActions" ID="HgLogBrowserDialog.__updateToolMenuActions"></a> +</p><a NAME="HgLogBrowserDialog.__updateToolMenuActions" ID="HgLogBrowserDialog.__updateToolMenuActions"></a> <h4>HgLogBrowserDialog.__updateToolMenuActions</h4> <b>__updateToolMenuActions</b>(<i></i>) <p> @@ -826,22 +927,17 @@ <dd> button that was clicked (QAbstractButton) </dd> -</dl><a NAME="HgLogBrowserDialog.on_diffP1Button_clicked" ID="HgLogBrowserDialog.on_diffP1Button_clicked"></a> -<h4>HgLogBrowserDialog.on_diffP1Button_clicked</h4> -<b>on_diffP1Button_clicked</b>(<i></i>) +</dl><a NAME="HgLogBrowserDialog.on_diffSelectLabel_linkActivated" ID="HgLogBrowserDialog.on_diffSelectLabel_linkActivated"></a> +<h4>HgLogBrowserDialog.on_diffSelectLabel_linkActivated</h4> +<b>on_diffSelectLabel_linkActivated</b>(<i>link</i>) <p> - Private slot to handle the Diff to Parent 1 button. -</p><a NAME="HgLogBrowserDialog.on_diffP2Button_clicked" ID="HgLogBrowserDialog.on_diffP2Button_clicked"></a> -<h4>HgLogBrowserDialog.on_diffP2Button_clicked</h4> -<b>on_diffP2Button_clicked</b>(<i></i>) -<p> - Private slot to handle the Diff to Parent 2 button. -</p><a NAME="HgLogBrowserDialog.on_diffRevisionsButton_clicked" ID="HgLogBrowserDialog.on_diffRevisionsButton_clicked"></a> -<h4>HgLogBrowserDialog.on_diffRevisionsButton_clicked</h4> -<b>on_diffRevisionsButton_clicked</b>(<i></i>) -<p> - Private slot to handle the Compare Revisions button. -</p><a NAME="HgLogBrowserDialog.on_downButton_clicked" ID="HgLogBrowserDialog.on_downButton_clicked"></a> + Private slot to handle the selection of a diff target. +</p><dl> +<dt><i>link</i> (str)</dt> +<dd> +activated link +</dd> +</dl><a NAME="HgLogBrowserDialog.on_downButton_clicked" ID="HgLogBrowserDialog.on_downButton_clicked"></a> <h4>HgLogBrowserDialog.on_downButton_clicked</h4> <b>on_downButton_clicked</b>(<i></i>) <p> @@ -856,6 +952,19 @@ <dd> text of the selected field (string) </dd> +</dl><a NAME="HgLogBrowserDialog.on_filesTree_currentItemChanged" ID="HgLogBrowserDialog.on_filesTree_currentItemChanged"></a> +<h4>HgLogBrowserDialog.on_filesTree_currentItemChanged</h4> +<b>on_filesTree_currentItemChanged</b>(<i>current, previous</i>) +<p> + Private slot called, when the current item of the files tree changes. +</p><dl> +<dt><i>current</i></dt> +<dd> +reference to the new current item (QTreeWidgetItem) +</dd><dt><i>previous</i></dt> +<dd> +reference to the old current item (QTreeWidgetItem) +</dd> </dl><a NAME="HgLogBrowserDialog.on_findNextButton_clicked" ID="HgLogBrowserDialog.on_findNextButton_clicked"></a> <h4>HgLogBrowserDialog.on_findNextButton_clicked</h4> <b>on_findNextButton_clicked</b>(<i></i>) @@ -944,6 +1053,26 @@ <dd> filter expression (string) </dd> +</dl><a NAME="HgLogBrowserDialog.on_saveLabel_linkActivated" ID="HgLogBrowserDialog.on_saveLabel_linkActivated"></a> +<h4>HgLogBrowserDialog.on_saveLabel_linkActivated</h4> +<b>on_saveLabel_linkActivated</b>(<i>link</i>) +<p> + Private slot to handle the selection of the save link. +</p><dl> +<dt><i>link</i> (str)</dt> +<dd> +activated link +</dd> +</dl><a NAME="HgLogBrowserDialog.on_sbsSelectLabel_linkActivated" ID="HgLogBrowserDialog.on_sbsSelectLabel_linkActivated"></a> +<h4>HgLogBrowserDialog.on_sbsSelectLabel_linkActivated</h4> +<b>on_sbsSelectLabel_linkActivated</b>(<i>link</i>) +<p> + Private slot to handle selection of a side-by-side link. +</p><dl> +<dt><i>link</i> (str)</dt> +<dd> +text of the selected link +</dd> </dl><a NAME="HgLogBrowserDialog.on_sendButton_clicked" ID="HgLogBrowserDialog.on_sendButton_clicked"></a> <h4>HgLogBrowserDialog.on_sendButton_clicked</h4> <b>on_sendButton_clicked</b>(<i></i>)
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html Sun Feb 12 18:06:07 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html Sun Feb 12 18:07:05 2017 +0100 @@ -124,13 +124,24 @@ Private slot to update the OK button. </p><a NAME="HgRevisionSelectionDialog.getRevision" ID="HgRevisionSelectionDialog.getRevision"></a> <h4>HgRevisionSelectionDialog.getRevision</h4> -<b>getRevision</b>(<i></i>) +<b>getRevision</b>(<i>revset=True</i>) <p> Public method to retrieve the selected revision. </p><dl> +<dt><i>revset</i> (bool)</dt> +<dd> +flag indicating to get the revision or ID as a + revset +</dd> +</dl><dl> <dt>Returns:</dt> <dd> -selected revision (string) +selected revision +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str </dd> </dl><a NAME="HgRevisionSelectionDialog.on_bookmarkButton_toggled" ID="HgRevisionSelectionDialog.on_bookmarkButton_toggled"></a> <h4>HgRevisionSelectionDialog.on_bookmarkButton_toggled</h4>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Sun Feb 12 18:06:07 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Sun Feb 12 18:07:05 2017 +0100 @@ -820,13 +820,16 @@ </dd> </dl><a NAME="Hg.hgBundle" ID="Hg.hgBundle"></a> <h4>Hg.hgBundle</h4> -<b>hgBundle</b>(<i>name</i>) +<b>hgBundle</b>(<i>name, bundleData=None</i>) <p> Public method to create a changegroup file. </p><dl> -<dt><i>name</i></dt> +<dt><i>name</i> (str)</dt> <dd> -file/directory name (string) +file/directory name +</dd><dt><i>bundleData</i> (dict)</dt> +<dd> +dictionary containing the bundle creation information </dd> </dl><a NAME="Hg.hgCancelMerge" ID="Hg.hgCancelMerge"></a> <h4>Hg.hgCancelMerge</h4> @@ -1201,19 +1204,27 @@ </dd> </dl><a NAME="Hg.hgPull" ID="Hg.hgPull"></a> <h4>Hg.hgPull</h4> -<b>hgPull</b>(<i>name</i>) +<b>hgPull</b>(<i>name, revisions=None</i>) <p> Public method used to pull changes from a remote Mercurial repository. </p><dl> -<dt><i>name</i></dt> +<dt><i>name</i> (str)</dt> <dd> -directory name of the project to be pulled to (string) +directory name of the project to be pulled to +</dd><dt><i>revisions</i> (list of str)</dt> +<dd> +list of revisions to be pulled </dd> </dl><dl> <dt>Returns:</dt> <dd> flag indicating, that the update contained an add - or delete (boolean) + or delete +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool </dd> </dl><a NAME="Hg.hgPush" ID="Hg.hgPush"></a> <h4>Hg.hgPush</h4> @@ -1378,19 +1389,27 @@ </dd> </dl><a NAME="Hg.hgUnbundle" ID="Hg.hgUnbundle"></a> <h4>Hg.hgUnbundle</h4> -<b>hgUnbundle</b>(<i>name</i>) +<b>hgUnbundle</b>(<i>name, files=None</i>) <p> Public method to apply changegroup files. </p><dl> -<dt><i>name</i></dt> +<dt><i>name</i> (str)</dt> <dd> -directory name (string) +directory name +</dd><dt><i>files</i> (list of str)</dt> +<dd> +list of bundle files to be applied </dd> </dl><dl> <dt>Returns:</dt> <dd> flag indicating, that the update contained an add - or delete (boolean) + or delete +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool </dd> </dl><a NAME="Hg.hgVerify" ID="Hg.hgVerify"></a> <h4>Hg.hgVerify</h4> @@ -1737,13 +1756,16 @@ </dd> </dl><a NAME="Hg.vcsMerge" ID="Hg.vcsMerge"></a> <h4>Hg.vcsMerge</h4> -<b>vcsMerge</b>(<i>name</i>) +<b>vcsMerge</b>(<i>name, rev=""</i>) <p> Public method used to merge a URL/revision into the local project. </p><dl> -<dt><i>name</i></dt> +<dt><i>name</i> (str)</dt> <dd> -file/directory name to be merged (string) +file/directory name to be merged +</dd><dt><i>rev=</i> (str)</dt> +<dd> +revision to merge with </dd> </dl><a NAME="Hg.vcsMove" ID="Hg.vcsMove"></a> <h4>Hg.vcsMove</h4>
--- a/Documentation/Source/eric6.WebBrowser.WebBrowserView.html Sun Feb 12 18:06:07 2017 +0100 +++ b/Documentation/Source/eric6.WebBrowser.WebBrowserView.html Sun Feb 12 18:07:05 2017 +0100 @@ -762,10 +762,15 @@ Private slot to send a link via email. </p><a NAME="WebBrowserView.__showTabCrashPage" ID="WebBrowserView.__showTabCrashPage"></a> <h4>WebBrowserView.__showTabCrashPage</h4> -<b>__showTabCrashPage</b>(<i></i>) +<b>__showTabCrashPage</b>(<i>status</i>) <p> Private slot to show the tab crash page. -</p><a NAME="WebBrowserView.__urlChanged" ID="WebBrowserView.__urlChanged"></a> +</p><dl> +<dt><i>status</i> (QWebEnginePage.RenderProcessTerminationStatus)</dt> +<dd> +termination status +</dd> +</dl><a NAME="WebBrowserView.__urlChanged" ID="WebBrowserView.__urlChanged"></a> <h4>WebBrowserView.__urlChanged</h4> <b>__urlChanged</b>(<i>url</i>) <p>