git.py: minor refactoring.

314e9a61 · Tristan Gingold · a2c8a6df · 314e9a61 · 314e9a61
Commit 314e9a61 authored Oct 28, 2019 by Tristan Gingold
Show whitespace changes
Inline Side-by-side

Showing with 56 additions and 60 deletions

git.py hdlmake/fetch/git.py +53 -57

module.py hdlmake/module/module.py +3 -3

No files found.
--- a/hdlmake/fetch/git.py
+++ b/hdlmake/fetch/git.py
@@ -38,20 +38,7 @@ class Git(Fetcher):
    def __init__(self):
        self.submodule = False
-    @staticmethod
+    def get_submodule_commit(self, submodule_dir):
-    def get_git_toplevel(module):
-        """Get the top level for the Git repository"""
-        cur_dir = os.getcwd()
-        try:
-            os.chdir(path_utils.rel2abs(module.path))
-            if not os.path.exists(".gitmodules"):
-                return None
-            return shell.run("git rev-parse --show-toplevel")
-        finally:
-            os.chdir(cur_dir)
-    @staticmethod
-    def get_submodule_commit(submodule_dir):
        """Get the commit for a repository if defined in Git submodules"""
        status_line = shell.run("git submodule status %s" % submodule_dir)
        status_line = status_line.split()
@@ -99,8 +86,24 @@ class Git(Fetcher):
        module.path = mod_path
        return True
-    @staticmethod
-    def get_git_submodules(module):
+class GitSM(Git):
+    def __init__(self):
+        self.submodule = True
+def get_git_toplevel(module):
+    """Get the top level for the Git repository"""
+    cur_dir = os.getcwd()
+    try:
+        os.chdir(path_utils.rel2abs(module.path))
+        if not os.path.exists(".gitmodules"):
+            return None
+        return shell.run("git rev-parse --show-toplevel")
+    finally:
+        os.chdir(cur_dir)
+def get_git_submodules(module):
    """Get a dictionary containing the git submodules
    that are listed in the module's path"""
    submodule_dir = path_utils.rel2abs(module.path)
@@ -112,7 +115,6 @@ class Git(Fetcher):
    cur_dir = os.getcwd()
    try:
        os.chdir(submodule_dir)
        if not os.path.exists(".gitmodules"):
            return {}
        config_submodules = {}
@@ -134,7 +136,6 @@ class Git(Fetcher):
            if module_name not in config_submodules:
                config_submodules[module_name] = {}
            config_submodules[module_name][lhs_split[-1]] = rhs
        if len(list(config_submodules)) > 0:
            logging.info("Found git submodules in %s: %s",
                module.path, str(config_submodules))
@@ -142,8 +143,3 @@ class Git(Fetcher):
        os.chdir(cur_dir)
    return config_submodules
-class GitSM(Git):
-    def __init__(self):
-        self.submodule = True
--- a/hdlmake/module/module.py
+++ b/hdlmake/module/module.py
@@ -34,7 +34,7 @@ import logging
 from ..util import path as path_mod
 from ..util import shell
-from ..fetch.git import Git
+from ..fetch import git
 from ..manifest_parser.manifestparser import ManifestParser
 import six
@@ -264,8 +264,8 @@ class Module(object):
        """Get the submodules if found in the Manifest path"""
        if not self.source == 'gitsm':
            return
-        git_submodule_dict = Git.get_git_submodules(self)
+        git_submodule_dict = git.get_git_submodules(self)
-        git_toplevel = Git.get_git_toplevel(self)
+        git_toplevel = git.get_git_toplevel(self)
        for submodule_key in git_submodule_dict.keys():
            url = git_submodule_dict[submodule_key]["url"]
            path = git_submodule_dict[submodule_key]["path"]