Merge pull request codecov#255 from codecov/thiago/b/fix-command-no-hg

drazisil · web-flow · commit 94ae0a2b528d · 2020-05-18T13:04:27.000-04:00
Fixing command for when neither hg or git are available
diff --git a/codecov/__init__.py b/codecov/__init__.py
@@ -229,17 +229,15 @@ def _add_env_if_not_empty(lst, value):
 
 
 def generate_toc(root):
-    return (
-        str(
-            (
-                try_to_run(["git", "ls-files"], cwd=root)
-                or try_to_run(["git", "ls-files"])
-                or try_to_run(["hg", "locate"], cwd=root)
-                or try_to_run(["hg", "locate"])
-            )
-        ).strip()
-        or ""
+    res = (
+        try_to_run(["git", "ls-files"], cwd=root)
+        or try_to_run(["git", "ls-files"])
+        or try_to_run(["hg", "locate"], cwd=root)
+        or try_to_run(["hg", "locate"])
     )
+    if res is None:
+        return ""
+    return str(res).strip() or ""
 
 
 def main(*argv, **kwargs):
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-version = "2.1.0"
+version = "2.1.1"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Plugins",
