add optional to status output

ekluzek · Jun 8, 2024 · 2ede182 · 2ede182
1 parent 87640ad
commit 2ede182
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/git_fleximod/git_fleximod.py b/git_fleximod/git_fleximod.py
@@ -304,6 +304,7 @@ def submodules_status(gitmodules, root_dir, toplevel=False):
                 ahash = result[0][1:]
             hhash = None
             atag = None
+
             needsupdate += 1
             if not toplevel and level:
                 continue
@@ -316,22 +317,23 @@ def submodules_status(gitmodules, root_dir, toplevel=False):
                     hhash = htag.split()[0]
                 if hhash and atag:
                     break
+            optional = " (optional)" if required and "Optional" in required else ""
             if tag and (ahash == hhash or atag == tag):
-                print(f"e {name:>20} not checked out, aligned at tag {tag}")
+                print(f"e {name:>20} not checked out, aligned at tag {tag}{optional}")
             elif tag:
                 ahash = rootgit.git_operation(
                     "submodule", "status", "{}".format(path)
                 ).rstrip()
                 ahash = ahash[1 : len(tag) + 1]
                 if tag == ahash:
-                    print(f"e {name:>20} not checked out, aligned at hash {ahash}")
+                    print(f"e {name:>20} not checked out, aligned at hash {ahash}{optional}")
                 else:
                     print(
-                        f"e {name:>20} not checked out, out of sync at tag {atag}, expected tag is {tag}"
+                        f"e {name:>20} not checked out, out of sync at tag {atag}, expected tag is {tag}{optional}"
                     )
                     testfails += 1
             else:
-                print(f"e {name:>20} has no fxtag defined in .gitmodules")
+                print(f"e {name:>20} has no fxtag defined in .gitmodules{optional}")
                 testfails += 1
         else:
             with utils.pushd(newpath):

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -32,7 +32,7 @@ def logger():
      "submodule_name": "test_optional",
      "status1" : "test_optional MPIserial_2.5.0-3-gd82ce7c is out of sync with .gitmodules MPIserial_2.4.0",
      "status2" : "test_optional at tag MPIserial_2.4.0",
-     "status3" : "test_optional not checked out, out of sync at tag None, expected tag is MPIserial_2.4.0",
+     "status3" : "test_optional not checked out, out of sync at tag None, expected tag is MPIserial_2.4.0 (optional)",
      "status4" : "test_optional at tag MPIserial_2.4.0",
      "gitmodules_content": """
      [submodule "test_optional"]