Merge pull request #230 from GEOS-ESM/develop

Merge Develop into Main for release
GEOS-ESM · Apr 28, 2022 · 1310b69 · 1310b69
2 parents 63496f7 + 6d8769d
commit 1310b69
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+## [1.44.0] - 2022-04-28
+
+### Fixed
+
+- Add support for typechange in `mepo status`
+
 ## [1.43.0] - 2022-04-18
 
 ### Fixed

diff --git a/mepo.d/repository/git.py b/mepo.d/repository/git.py
@@ -222,13 +222,17 @@ def check_status(self, ignore_permissions=False):
                     verbose_status = colors.RED   + "modified, not staged" + colors.RESET
                 elif short_status == ".A":
                     verbose_status = colors.RED   + "added, not staged" + colors.RESET
+                elif short_status == ".T":
+                    verbose_status = colors.RED   + "typechange, not staged" + colors.RESET
 
                 elif short_status == "D.":
                     verbose_status = colors.GREEN + "deleted, staged" + colors.RESET
                 elif short_status == "M.":
                     verbose_status = colors.GREEN + "modified, staged" + colors.RESET
                 elif short_status == "A.":
                     verbose_status = colors.GREEN + "added, staged" + colors.RESET
+                elif short_status == "T.":
+                    verbose_status = colors.GREEN + "typechange, staged" + colors.RESET
 
                 elif short_status == "MM":
                     verbose_status = colors.GREEN + "modified, staged" + colors.RESET + " with " + colors.RED + "unstaged changes" + colors.RESET
@@ -240,6 +244,11 @@ def check_status(self, ignore_permissions=False):
                 elif short_status == "AD":
                     verbose_status = colors.GREEN + "added, staged" + colors.RESET + " but " + colors.RED + "deleted, not staged" + colors.RESET
 
+                elif short_status == "TM":
+                    verbose_status = colors.GREEN + "typechange, staged" + colors.RESET + " with " + colors.RED + "unstaged changes" + colors.RESET
+                elif short_status == "TD":
+                    verbose_status = colors.GREEN + "typechange, staged" + colors.RESET + " but " + colors.RED + "deleted, not staged" + colors.RESET
+
                 elif short_status == "R.":
                     verbose_status = colors.GREEN + "renamed" + colors.RESET + " as " + colors.YELLOW + new_file_name + colors.RESET
                 elif short_status == "RM":