Merge pull request #143 from GEOS-ESM/hotfix/mathomp4/mom6-fix

Fix for cloning exposed by mom6

mepo.d/command/clone/clone.py

@@ -62,11 +62,13 @@ def run(args):
     for comp in allcomps:
         if not comp.fixture:
             git = GitRepository(comp.remote, comp.local)
+            version = comp.version.name
+            version = version.replace('origin/','')
             recurse = comp.recurse_submodules
-            git.clone(recurse)
+            git.clone(version,recurse)
             if comp.sparse:
                 git.sparsify(comp.sparse)
-            git.checkout(comp.version.name)
+            #git.checkout(comp.version.name)
             print_clone_info(comp, max_namelen)
 
 def print_clone_info(comp, name_width):

mepo.d/command/compare/compare.py

@@ -25,7 +25,8 @@ def print_header(max_namelen, max_origlen):
 
 def print_cmp(name, orig, curr, name_width, orig_width):
     name_blank = ''
-    if orig not in curr:
+    #if orig not in curr:
+    if curr not in orig:
         name = colors.RED + name + colors.RESET
         name_blank = colors.RED + name_blank + colors.RESET
         name_width += len(colors.RED) + len(colors.RESET)

mepo.d/command/status/status.py

@@ -31,7 +31,8 @@ def print_status(allcomps, result):
         time.sleep(0.025)
         current_version, internal_state_branch_name, output = result[index]
         # Check to see if the current tag/branch is the same as the original
-        if comp.version.name not in internal_state_branch_name:
+        #if comp.version.name not in internal_state_branch_name:
+        if internal_state_branch_name not in comp.version.name:
             component_name = colors.RED + comp.name + colors.RESET
             width = orig_width + len(colors.RED) + len(colors.RESET)
         else:

mepo.d/repository/git.py

@@ -37,11 +37,11 @@ def get_full_local_path(self):
     def get_remote_url(self):
         return self.__remote
 
-    def clone(self, recurse):
+    def clone(self, version, recurse):
         cmd = 'git clone '
         if recurse:
             cmd += '--recurse-submodules '
-        cmd += '--quiet {} {}'.format(self.__remote, self.__local)
+        cmd += '--branch {} --quiet {} {}'.format(version, self.__remote, self.__local)
         shellcmd.run(cmd.split())
 
     def checkout(self, version):