Mercurial Repositories > eric / file diff

--- a/eric6/VCS/VersionControl.py	Sat Aug 31 12:29:57 2019 +0200
+++ b/eric6/VCS/VersionControl.py	Sat Aug 31 12:58:11 2019 +0200
@@ -97,6 +97,8 @@
         """
         raise RuntimeError('Not implemented')
         
+        return (False, "")
+        
     def vcsInit(self, vcsDir, noDialog=False):
         """
         Public method used to initialize the vcs.
@@ -109,6 +111,8 @@
         """
         raise RuntimeError('Not implemented')
         
+        return False
+        
     def vcsConvertProject(self, vcsDataDict, project, addAll=True):
         """
         Public method to convert an uncontrolled project to a version
@@ -138,13 +142,15 @@
         @param addAll flag indicating to add all files to the repository
         @type bool
         @return tuple containing a flag indicating an execution without errors
-            and a flag indicating the version controll status
+            and a flag indicating the version control status
         @rtype tuple of (bool, bool)
         @exception RuntimeError to indicate that this method must be
             implemented by a subclass
         """
         raise RuntimeError('Not implemented')
         
+        return (False, False)
+        
     def vcsCheckout(self, vcsDataDict, projectDir, noDialog=False):
         """
         Public method used to check the project out of the vcs.
@@ -158,6 +164,8 @@
         """
         raise RuntimeError('Not implemented')
         
+        return False
+        
     def vcsExport(self, vcsDataDict, projectDir):
         """
         Public method used to export a directory from the vcs.
@@ -170,6 +178,8 @@
         """
         raise RuntimeError('Not implemented')
         
+        return False
+        
     def vcsCommit(self, name, message, noDialog=False):
         """
         Public method used to make the change of a file/directory permanent in
@@ -184,6 +194,8 @@
         """
         raise RuntimeError('Not implemented')
         
+        return False
+        
     def vcsUpdate(self, name, noDialog=False):
         """
         Public method used to update a file/directory in the vcs.
@@ -197,6 +209,8 @@
         """
         raise RuntimeError('Not implemented')
         
+        return False
+        
     def vcsAdd(self, name, isDir=False, noDialog=False):
         """
         Public method used to add a file/directory in the vcs.
@@ -243,6 +257,8 @@
         """
         raise RuntimeError('Not implemented')
         
+        return False
+        
     def vcsMove(self, name, project, target=None, noDialog=False):
         """
         Public method used to move a file/directory.
@@ -257,6 +273,8 @@
         """
         raise RuntimeError('Not implemented')
         
+        return False
+        
     def vcsLogBrowser(self, name, isFile=False):
         """
         Public method used to view the log of a file/directory in the vcs
@@ -322,6 +340,8 @@
         """
         raise RuntimeError('Not implemented')
         
+        return False
+        
     def vcsMerge(self, name):
         """
         Public method used to merge a tag/branch into the local project.
@@ -344,6 +364,8 @@
         """
         raise RuntimeError('Not implemented')
         
+        return 0
+        
     def vcsAllRegisteredStates(self, names, dname):
         """
         Public method used to get the registered states of a number of files
@@ -358,6 +380,8 @@
         """
         raise RuntimeError('Not implemented')
         
+        return {}
+        
     def vcsName(self):
         """
         Public method returning the name of the vcs.
@@ -368,6 +392,8 @@
         """
         raise RuntimeError('Not implemented')
         
+        return ""
+        
     def vcsCleanup(self, name):
         """
         Public method used to cleanup the local copy.
@@ -424,6 +450,8 @@
         """
         raise RuntimeError('Not implemented')
         
+        return ""
+        
     def vcsGetProjectBrowserHelper(self, browser, project,
                                    isTranslationsBrowser=False):
         """
@@ -440,6 +468,8 @@
         """
         raise RuntimeError('Not implemented')
         
+        return None                         # __IGNORE_WARNING_M831__
+        
     def vcsGetProjectHelper(self, project):
         """
         Public method to instanciate a helper object for the project.
@@ -450,6 +480,8 @@
             implemented by a subclass
         """
         raise RuntimeError('Not implemented')
+        
+        return None                         # __IGNORE_WARNING_M831__
     
     #####################################################################
     ## methods above need to be implemented by a subclass