improve handling of tag not found

Author: jedwards4b

git_fleximod/submodule.py

@@ -119,27 +119,26 @@ def status(self):
                                 atag = atag[:-1]
                             if atag == self.fxtag:
                                 break
-
 
-                #print(f"line is {line} ahash is {ahash} atag is {atag} {parts}")
-                #                atag = git.git_operation("describe", "--tags", "--always")
-                # ahash =  git.git_operation("rev-list", "HEAD").partition("\n")[0]
-                    
                 recurse = False
                 if rurl != self.url:
                     remote = self._add_remote(git)
                     git.git_operation("fetch", remote)
+                # Asked for a tag and found that tag
                 if self.fxtag and atag == self.fxtag:
                     result = f"  {self.name:>20} at tag {self.fxtag}"
                     recurse = True
                     testfails = False
+                # Asked for and found a hash
                 elif self.fxtag and (ahash[: len(self.fxtag)] == self.fxtag or (self.fxtag.find(ahash)==0)):
                     result = f"  {self.name:>20} at hash {ahash}"
                     recurse = True
                     testfails = False
+                # Asked for and found a hash
                 elif atag == ahash:
                     result = f"  {self.name:>20} at hash {ahash}"
                     recurse = True
+                # Did not find requested tag or hash
                 elif self.fxtag:
                     result = f"s {self.name:>20} {atag} {ahash} is out of sync with .gitmodules {self.fxtag}"
                     testfails = True
@@ -396,13 +395,19 @@ async def update(self):
                 smgit = GitInterface(repodir, self.logger)
                 newremote = self._add_remote(smgit)
                 # Trying to distingush a tag from a hash
-                allowed = set(string.digits + 'abcdef') 
+                allowed = set(string.digits + 'abcdef')
+                status = 0
                 if not set(self.fxtag) <= allowed:
                     # This is a tag
                     tag = f"refs/tags/{self.fxtag}:refs/tags/{self.fxtag}"
-                    smgit.git_operation("fetch", newremote, tag)
-                smgit.git_operation("checkout", self.fxtag)
-
+                    status,_ = smgit.git_operation("fetch", newremote, tag)
+                if status == 0:
+                    status,_ = smgit.git_operation("checkout", self.fxtag)
+                if status:
+                    utils.fatal_error(
+                        f"Failed to checkout {self.name} at tag or hash {self.fxtag} from {repodir}"
+                    )
+                    
             if not os.path.exists(os.path.join(repodir, ".git")):
                 utils.fatal_error(
                     f"Failed to checkout {self.name} {repo_exists} {repodir} {self.path}"

tests/test_c_required.py

@@ -1,4 +1,5 @@
 import pytest
+import re
 from pathlib import Path
 
 def test_required(git_fleximod, test_repo, shared_repos):
@@ -28,3 +29,15 @@ def test_required(git_fleximod, test_repo, shared_repos):
     assert result.returncode == 0
     status = git_fleximod(test_repo, f"status {repo_name}")
     assert shared_repos["status4"] in status.stdout
+
+    text = file_path.read_text()
+    new_value = "somethingelse"
+    pattern = r"(^\s*fxtag\s*=\s*).*$"
+    replacement = r"\1" + new_value
+    new_text = re.sub(pattern, replacement, text, flags=re.MULTILINE)
+
+    # Write updated content back to file
+    file_path.write_text(new_text)
+
+    result = git_fleximod(test_repo, f"update {repo_name}")
+    assert f'fatal: couldn\'t find remote ref' in result.stderr or 'error: pathspec \'somethingelse\' did not match any file(s) known to git' in result.stderr