Mercurial Repositories > eric / changeset

--- a/Globals/__init__.py	Mon May 21 22:16:21 2018 +0200
+++ b/Globals/__init__.py	Wed May 23 19:36:11 2018 +0200
@@ -164,11 +164,15 @@
     if configDir is not None and os.path.exists(configDir):
         hp = configDir
     else:
+        cdn = ".eric6"
         if isWindowsPlatform():
-            cdn = "_eric6"
-        else:
-            cdn = ".eric6"
-            
+            # migrate the old config directory (< v18.06)
+            cdnOld = "_eric6"
+            hpOld = os.path.join(os.path.expanduser("~"), cdnOld)
+            if os.path.exists(hpOld):
+                hpNew = os.path.join(os.path.expanduser("~"), cdn)
+                os.rename(hpOld, hpNew)
+        
         hp = os.path.join(os.path.expanduser("~"), cdn)
         if not os.path.exists(hp):
             os.mkdir(hp)

--- a/Plugins/VcsPlugins/vcsGit/git.py	Mon May 21 22:16:21 2018 +0200
+++ b/Plugins/VcsPlugins/vcsGit/git.py	Wed May 23 19:36:11 2018 +0200
@@ -1357,13 +1357,7 @@
         status = False
         ignorePatterns = [
             ".eric6project/",
-            "_eric6project/",
-            ".eric5project/",
-            "_eric5project/",
-            ".eric4project/",
-            "_eric4project/",
             ".ropeproject/",
-            "_ropeproject/",
             ".directory/",
             "*.pyc",
             "*.pyo",

--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Mon May 21 22:16:21 2018 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Wed May 23 19:36:11 2018 +0200
@@ -2447,13 +2447,7 @@
         status = False
         ignorePatterns = [
             "glob:.eric6project",
-            "glob:_eric6project",
-            "glob:.eric5project",
-            "glob:_eric5project",
-            "glob:.eric4project",
-            "glob:_eric4project",
             "glob:.ropeproject",
-            "glob:_ropeproject",
             "glob:.directory",
             "glob:**.pyc",
             "glob:**.pyo",

--- a/Plugins/VcsPlugins/vcsPySvn/Config.py	Mon May 21 22:16:21 2018 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/Config.py	Wed May 23 19:36:11 2018 +0200
@@ -119,8 +119,7 @@
     "global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc",
     "  *.pyo .*.rej *.rej .*~ *~ #*# .#* .*.swp .DS_Store",
     "  *.orig *.bak cur tmp __pycache__ .directory",
-    "  .ropeproject .eric4project .eric5project .eric6project",
-    "  _ropeproject _eric4project _eric5project _eric6project",
+    "  .ropeproject .eric6project",
     "### Set log-encoding to the default encoding for log messages",
     "# log-encoding = latin1",
     "### Set use-commit-times to make checkout/update/switch/revert",
@@ -182,11 +181,5 @@
     "__pycache__",
     ".directory",
     ".ropeproject",
-    ".eric4project",
-    ".eric5project",
     ".eric6project",
-    "_ropeproject",
-    "_eric4project",
-    "_eric5project",
-    "_eric6project",
 ]

--- a/Plugins/VcsPlugins/vcsSubversion/Config.py	Mon May 21 22:16:21 2018 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/Config.py	Wed May 23 19:36:11 2018 +0200
@@ -119,8 +119,7 @@
     "global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc",
     "  *.pyo .*.rej *.rej .*~ *~ #*# .#* .*.swp .DS_Store",
     "  *.orig *.bak cur tmp __pycache__ .directory",
-    "  .ropeproject .eric4project .eric5project .eric6project",
-    "  _ropeproject _eric4project _eric5project _eric5project",
+    "  .ropeproject .eric6project",
     "### Set log-encoding to the default encoding for log messages",
     "# log-encoding = latin1",
     "### Set use-commit-times to make checkout/update/switch/revert",
@@ -182,11 +181,5 @@
     "__pycache__",
     ".directory",
     ".ropeproject",
-    ".eric4project",
-    ".eric5project",
     ".eric6project",
-    "_ropeproject",
-    "_eric4project",
-    "_eric5project",
-    "_eric6project",
 ]

--- a/Project/Project.py	Mon May 21 22:16:21 2018 +0200
+++ b/Project/Project.py	Wed May 23 19:36:11 2018 +0200
@@ -3452,9 +3452,15 @@
         @return path of the management directory (string)
         """
         if Utilities.isWindowsPlatform():
-            return os.path.join(self.ppath, "_eric6project")
-        else:
-            return os.path.join(self.ppath, ".eric6project")
+            # migrate the old project management directory ( < v18.06)
+            oldDir = os.path.join(self.ppath, "_eric6project")
+            if os.path.exists(oldDir):
+                os.rename(
+                    oldDir,
+                    os.path.join(self.ppath, ".eric6project")
+                )
+        
+        return os.path.join(self.ppath, ".eric6project")
         
     def createProjectManagementDir(self):
         """

--- a/Utilities/__init__.py	Mon May 21 22:16:21 2018 +0200
+++ b/Utilities/__init__.py	Wed May 23 19:36:11 2018 +0200
@@ -1217,12 +1217,11 @@
             if checkStop and checkStop():
                 break
             
-            if entry in ['CVS', 'cvs',
-                         '.svn', '_svn',
-                         '.hg', '_hg',
-                         '.ropeproject', '_ropeproject',
-                         '.eric6project', '_eric6project',
-                         '.issues', '_issues']:
+            if entry in ['.svn',
+                         '.hg',
+                         '.git',
+                         '.ropeproject',
+                         '.eric6project']:
                 continue
             
             fentry = os.path.join(path, entry)

--- a/VCS/__init__.py	Mon May 21 22:16:21 2018 +0200
+++ b/VCS/__init__.py	Wed May 23 19:36:11 2018 +0200
@@ -10,7 +10,7 @@
 The general part of the VCS interface defines classes to implement common
 dialogs. These are a dialog to enter command options, a dialog to display
 some repository information and an abstract base class. The individual
-interfaces (i.e. CVS) have to be subclasses of this base class.
+interfaces have to be subclasses of this base class.
 """
 
 from __future__ import unicode_literals

--- a/eric6_api.py	Mon May 21 22:16:21 2018 +0200
+++ b/eric6_api.py	Wed May 23 19:36:11 2018 +0200
@@ -132,12 +132,8 @@
     except getopt.error:
         usage()
 
-    excludeDirs = ["CVS", ".svn", "_svn",
-                   ".ropeproject", "_ropeproject",
-                   ".eric5project", "_eric5project",
-                   ".eric6project", "_eric6project",
-                   "dist", "build", "doc", "docs"
-                   ]
+    excludeDirs = [".svn", ".hg", ".git", ".ropeproject", ".eric6project",
+                   "dist", "build", "doc", "docs"]
     excludePatterns = []
     outputFileName = ""
     recursive = False

--- a/eric6_doc.py	Mon May 21 22:16:21 2018 +0200
+++ b/eric6_doc.py	Wed May 23 19:36:11 2018 +0200
@@ -170,9 +170,8 @@
     except getopt.error:
         usage()
 
-    excludeDirs = ["CVS", ".svn", "_svn", ".ropeproject", "_ropeproject",
-                   ".eric6project", "_eric6project", "dist", "build", "doc",
-                   "docs"]
+    excludeDirs = [".svn", ".hg", ".git", ".ropeproject", ".eric6project",
+                   "dist", "build", "doc", "docs"]
     excludePatterns = []
     outputDir = "doc"
     recursive = False

--- a/install-i18n.py	Mon May 21 22:16:21 2018 +0200
+++ b/install-i18n.py	Wed May 23 19:36:11 2018 +0200
@@ -29,11 +29,8 @@
     
     @return directory name of the config dir (string)
     """
-    if sys.platform.startswith("win"):
-        cdn = "_eric6"
-    else:
-        cdn = ".eric6"
-        
+    cdn = ".eric6"
+    
     hp = os.path.join(os.path.expanduser("~"), cdn)
     if not os.path.exists(hp):
         os.mkdir(hp)

--- a/uninstall.py	Mon May 21 22:16:21 2018 +0200
+++ b/uninstall.py	Wed May 23 19:36:11 2018 +0200
@@ -345,10 +345,7 @@
     
     @return directory name of the config dir (string)
     """
-    if sys.platform.startswith("win"):
-        cdn = "_eric6"
-    else:
-        cdn = ".eric6"
+    cdn = ".eric6"
     return os.path.join(os.path.expanduser("~"), cdn)