Merge pull request #222 from GEOS-ESM/develop

Merge develop into main for release
GEOS-ESM · Mar 29, 2022 · fbc77d4 · fbc77d4
2 parents d8d2abc + d38188a
commit fbc77d4
Show file tree

Hide file tree

Showing 3 changed files with 12 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.42.0] - 2022-03-29
+
+### Added
+
+- Added `-b/--ignore-space-change` option to `mepo diff`
+
 ## [1.41.0] - 2022-03-25
 
 ### Changed

diff --git a/mepo.d/cmdline/parser.py b/mepo.d/cmdline/parser.py
@@ -150,6 +150,10 @@ def __diff(self):
             '--staged',
             action = 'store_true',
             help = 'Show diff of staged changes')
+        diff.add_argument(
+            '-b','--ignore-space-change',
+            action = 'store_true',
+            help = 'Ignore changes in amount of whitespace')
         diff.add_argument(
             'comp_name',
             metavar = 'comp-name',

diff --git a/mepo.d/repository/git.py b/mepo.d/repository/git.py
@@ -128,6 +128,8 @@ def run_diff(self, args=None):
             cmd += ' --name-status'
         if args.staged:
             cmd += ' --staged'
+        if args.ignore_space_change:
+            cmd += ' --ignore-space-change'
         output = shellcmd.run(shlex.split(cmd),output=True)
         return output.rstrip()