Mercurial Repositories > eric / file diff

--- a/eric7/APIs/Python3/eric7.api	Wed Sep 22 18:20:06 2021 +0200
+++ b/eric7/APIs/Python3/eric7.api	Wed Sep 22 19:52:28 2021 +0200
@@ -4895,8 +4895,6 @@
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.gitReflogBrowser?4(projectDir)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.gitRemoveRemote?4(projectDir, remoteName)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.gitRenameRemote?4(projectDir, remoteName)
-eric7.Plugins.VcsPlugins.vcsGit.git.Git.gitRevert?4(name)
-eric7.Plugins.VcsPlugins.vcsGit.git.Git.gitSbsDiff?4(name, extended=False, revisions=None)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.gitShortlog?4(projectDir, commit)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.gitShowBranch?4(name)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.gitShowConfig?4(projectDir)
@@ -4937,6 +4935,7 @@
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.vcsDiff?4(name)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.vcsExists?4()
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.vcsExport?4(vcsDataDict, projectDir)
+eric7.Plugins.VcsPlugins.vcsGit.git.Git.vcsForget?4(name)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.vcsGetProjectBrowserHelper?4(browser, project, isTranslationsBrowser=False)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.vcsGetProjectHelper?4(project)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.vcsImport?4(vcsDataDict, projectDir, noDialog=False, addAll=True)
@@ -4951,6 +4950,8 @@
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.vcsRegisteredState?4(name)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.vcsRemove?4(name, project=False, noDialog=False, stageOnly=False)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.vcsRepositoryInfos?4(ppath)
+eric7.Plugins.VcsPlugins.vcsGit.git.Git.vcsRevert?4(name)
+eric7.Plugins.VcsPlugins.vcsGit.git.Git.vcsSbsDiff?4(name, extended=False, revisions=None)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.vcsShutdown?4()
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.vcsStatus?4(name)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.vcsSupportCommandOptions?4()
@@ -5621,7 +5622,6 @@
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgEditUserConfig?4()
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgExport?4()
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgExtendedDiff?4(name)
-eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgForget?4(name)
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetBookmarksList?4()
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetBranchesList?4()
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetCurrentBranch?4()
@@ -5645,10 +5645,7 @@
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgReMerge?4(name)
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRecover?4()
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRemoveSubrepositories?4()
-eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgResolved?4(name, unresolve=False)
-eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRevert?4(name)
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRollback?4()
-eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgSbsDiff?4(name, extended=False, revisions=None)
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgServe?4(repoPath)
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgShowBranch?4()
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgShowConfig?4()
@@ -5672,6 +5669,7 @@
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsDiff?4(name)
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsExists?4()
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsExport?4(vcsDataDict, projectDir)
+eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsForget?4(name)
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsGetProjectBrowserHelper?4(browser, project, isTranslationsBrowser=False)
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsGetProjectHelper?4(project)
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsImport?4(vcsDataDict, projectDir, noDialog=False, addAll=True)
@@ -5686,6 +5684,9 @@
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsRegisteredState?4(name)
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsRemove?4(name, project=False, noDialog=False)
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsRepositoryInfos?4(ppath)
+eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsResolved?4(name, unresolve=False)
+eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsRevert?4(name)
+eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsSbsDiff?4(name, extended=False, revisions=None)
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsShutdown?4()
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsStatus?4(name)
 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsSupportCommandOptions?4()
@@ -5877,8 +5878,6 @@
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnRelocate?4(projectPath)
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnRemoveFromChangelist?4(names)
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnRepoBrowser?4(projectPath=None)
-eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnResolve?4(name)
-eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnSbsDiff?4(name, extended=False, revisions=None)
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnSetProp?4(name, recursive=False)
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnShowChangelists?4(path)
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnUnlock?4(name, breakIt=False, parent=None)
@@ -5896,6 +5895,7 @@
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsDiff?4(name)
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsExists?4()
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsExport?4(vcsDataDict, projectDir)
+eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsForget?4(name)
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsGetProjectBrowserHelper?4(browser, project, isTranslationsBrowser=False)
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsGetProjectHelper?4(project)
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsImport?4(vcsDataDict, projectDir, noDialog=False, addAll=True)
@@ -5910,7 +5910,9 @@
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsRegisteredState?4(name)
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsRemove?4(name, project=False, noDialog=False)
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsRepositoryInfos?4(ppath)
+eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsResolved?4(name)
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsRevert?4(name)
+eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsSbsDiff?4(name, extended=False, revisions=None)
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsShutdown?4()
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsStatus?4(name)
 eric7.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsSwitch?4(name)
@@ -6115,8 +6117,6 @@
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnRelocate?4(projectPath)
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnRemoveFromChangelist?4(names)
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnRepoBrowser?4(projectPath=None)
-eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnResolve?4(name)
-eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnSbsDiff?4(name, extended=False, revisions=None)
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnSetProp?4(name, recursive=False)
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnShowChangelists?4(path)
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnUnlock?4(name, breakIt=False, parent=None)
@@ -6134,6 +6134,7 @@
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsDiff?4(name)
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsExists?4()
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsExport?4(vcsDataDict, projectDir)
+eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsForget?4(name)
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsGetProjectBrowserHelper?4(browser, project, isTranslationsBrowser=False)
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsGetProjectHelper?4(project)
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsImport?4(vcsDataDict, projectDir, noDialog=False, addAll=True)
@@ -6148,7 +6149,9 @@
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsRegisteredState?4(name)
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsRemove?4(name, project=False, noDialog=False)
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsRepositoryInfos?4(ppath)
+eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsResolved?4(name)
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsRevert?4(name)
+eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsSbsDiff?4(name, extended=False, revisions=None)
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsShutdown?4()
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsStatus?4(name)
 eric7.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsSwitch?4(name)
@@ -7403,7 +7406,10 @@
 eric7.Project.Project.Project.unregisterProjectType?4(type_)
 eric7.Project.Project.Project.updateFileTypes?4()
 eric7.Project.Project.Project.useSystemEol?4()
+eric7.Project.Project.Project.vcsCommitted?7
 eric7.Project.Project.Project.vcsSoftwareAvailable?4()
+eric7.Project.Project.Project.vcsStatusMonitorAllData?7
+eric7.Project.Project.Project.vcsStatusMonitorData?7
 eric7.Project.Project.Project.vcsStatusMonitorInfo?7
 eric7.Project.Project.Project.vcsStatusMonitorStatus?7
 eric7.Project.Project.Project.writeTasks?4()
@@ -10022,10 +10028,13 @@
 eric7.VCS.StatusMonitorThread.VcsStatusMonitorThread.setAutoUpdate?4(auto)
 eric7.VCS.StatusMonitorThread.VcsStatusMonitorThread.setInterval?4(interval)
 eric7.VCS.StatusMonitorThread.VcsStatusMonitorThread.stop?4()
+eric7.VCS.StatusMonitorThread.VcsStatusMonitorThread.vcsStatusMonitorAllData?7
 eric7.VCS.StatusMonitorThread.VcsStatusMonitorThread.vcsStatusMonitorData?7
 eric7.VCS.StatusMonitorThread.VcsStatusMonitorThread.vcsStatusMonitorInfo?7
 eric7.VCS.StatusMonitorThread.VcsStatusMonitorThread.vcsStatusMonitorStatus?7
 eric7.VCS.StatusMonitorThread.VcsStatusMonitorThread?1(interval, project, vcs, parent=None)
+eric7.VCS.StatusWidget.StatusWidget.StatusDataRole?7
+eric7.VCS.StatusWidget.StatusWidget?1(project, viewmanager, parent=None)
 eric7.VCS.VcsBasicHelperSingleton?7
 eric7.VCS.VersionControl.VersionControl._createStatusMonitorThread?5(interval, project)
 eric7.VCS.VersionControl.VersionControl.addArguments?4(args, argslist)
@@ -10034,6 +10043,7 @@
 eric7.VCS.VersionControl.VersionControl.checkVCSStatus?4()
 eric7.VCS.VersionControl.VersionControl.clearStatusCache?4()
 eric7.VCS.VersionControl.VersionControl.clearStatusMonitorCachedState?4(name)
+eric7.VCS.VersionControl.VersionControl.committed?7
 eric7.VCS.VersionControl.VersionControl.getStatusMonitorAutoUpdate?4()
 eric7.VCS.VersionControl.VersionControl.getStatusMonitorInterval?4()
 eric7.VCS.VersionControl.VersionControl.setStatusMonitorAutoUpdate?4(auto)
@@ -10055,6 +10065,7 @@
 eric7.VCS.VersionControl.VersionControl.vcsDiff?4(name)
 eric7.VCS.VersionControl.VersionControl.vcsExists?4()
 eric7.VCS.VersionControl.VersionControl.vcsExport?4(vcsDataDict, projectDir)
+eric7.VCS.VersionControl.VersionControl.vcsForget?4(name)
 eric7.VCS.VersionControl.VersionControl.vcsGetOptions?4()
 eric7.VCS.VersionControl.VersionControl.vcsGetOtherData?4()
 eric7.VCS.VersionControl.VersionControl.vcsGetProjectBrowserHelper?4(browser, project, isTranslationsBrowser=False)
@@ -10071,7 +10082,9 @@
 eric7.VCS.VersionControl.VersionControl.vcsRegisteredState?4(name)
 eric7.VCS.VersionControl.VersionControl.vcsRemove?4(name, project=False, noDialog=False)
 eric7.VCS.VersionControl.VersionControl.vcsRepositoryInfos?4(ppath)
+eric7.VCS.VersionControl.VersionControl.vcsResolved?4(name)
 eric7.VCS.VersionControl.VersionControl.vcsRevert?4(name)
+eric7.VCS.VersionControl.VersionControl.vcsSbsDiff?4(name, extended=False, revisions=None)
 eric7.VCS.VersionControl.VersionControl.vcsSetData?4(key, value)
 eric7.VCS.VersionControl.VersionControl.vcsSetDataFromDict?4(dictionary)
 eric7.VCS.VersionControl.VersionControl.vcsSetOptions?4(options)
@@ -10079,6 +10092,7 @@
 eric7.VCS.VersionControl.VersionControl.vcsShutdown?4()
 eric7.VCS.VersionControl.VersionControl.vcsStatus?4(name)
 eric7.VCS.VersionControl.VersionControl.vcsStatusChanged?7
+eric7.VCS.VersionControl.VersionControl.vcsStatusMonitorAllData?7
 eric7.VCS.VersionControl.VersionControl.vcsStatusMonitorData?7
 eric7.VCS.VersionControl.VersionControl.vcsStatusMonitorInfo?7
 eric7.VCS.VersionControl.VersionControl.vcsStatusMonitorStatus?7