fix(commands/commit): check cz commit msg

Author: saygox

commitizen/commands/commit.py

@@ -5,6 +5,7 @@
 import shutil
 import subprocess
 import tempfile
+from os.path import exists
 
 import questionary
 
@@ -93,6 +94,17 @@ def manual_edit(self, message: str) -> str:
         file.unlink()
         return message
 
+    def is_blank_commit_file(self, filename) -> bool:
+        if not exists(filename):
+            return True
+        with open(filename, "tr") as f:
+            for x in f:
+                if len(x) == 0 or x[0] == "#":
+                    continue
+                elif x[0] != "\r" and x[0] != "\n":
+                    return False
+        return True
+
     def __call__(self):
         extra_args: str = self.arguments.get("extra_cli_args", "")
 
@@ -108,6 +120,8 @@ def __call__(self):
 
         commit_msg_file: str = self.arguments.get("commit_msg_file")
         if commit_msg_file:
+            if not self.is_blank_commit_file(commit_msg_file):
+                return
             wrap_stdio()
 
         if git.is_staging_clean() and not (dry_run or allow_empty):

commitizen/wrap_stdio.py

@@ -0,0 +1,16 @@
+import sys
+
+if sys.platform == "win32":  # pragma: no cover
+    from .windows import _unwrap_stdio, _wrap_stdio
+elif sys.platform == "linux":
+    from .linux import _unwrap_stdio, _wrap_stdio  # pragma: no cover
+else:
+    from .unix import _unwrap_stdio, _wrap_stdio  # pragma: no cover
+
+
+def wrap_stdio():
+    _wrap_stdio()
+
+
+def unwrap_stdio():
+    _unwrap_stdio()

commitizen/wrap_stdio/__init__.py

@@ -15,7 +15,7 @@ def __init__(self, stdx: IOBase):
             self._fileno = stdx.fileno()
             if self._fileno == 0:
                 fd = os.open("CONIN$", os.O_RDWR | os.O_BINARY)
-                tty = open(fd, "r")
+                tty = open(fd)
                 handle = HANDLE(msvcrt.get_osfhandle(fd))  # noqa
                 windll.kernel32.SetStdHandle(STD_INPUT_HANDLE, handle)
             elif self._fileno == 1:

commitizen/wrap_stdio_linux.py renamed to commitizen/wrap_stdio/linux.py

@@ -1,21 +1,19 @@
 import sys
 
-from commitizen import wrap_stdio, wrap_stdio_linux, wrap_stdio_unix, wrap_stdio_windows
+from commitizen import wrap_stdio
 
-
-def test_warp_stdio_exists():
-    assert hasattr(wrap_stdio_windows, "sys")
-    assert hasattr(wrap_stdio_linux, "sys")
-    assert hasattr(wrap_stdio_unix, "sys")
+# def test_warp_stdio_exists():
+#     assert hasattr(wrap_stdio_windows, "sys")
+#     assert hasattr(wrap_stdio_linux, "sys")
+#     assert hasattr(wrap_stdio_unix, "sys")
 
 
 if sys.platform == "win32":  # pragma: no cover
     pass
 elif sys.platform == "linux":
-    from commitizen.wrap_stdio_linux import WrapStdinLinux, WrapStdoutLinux
+    from commitizen.wrap_stdio.linux import WrapStdinLinux, WrapStdoutLinux
 
     def test_wrap_stdin_linux(mocker):
-
         tmp_stdin = sys.stdin
 
         mocker.patch("os.open")
@@ -36,7 +34,6 @@ def test_wrap_stdin_linux(mocker):
         assert sys.stdin == tmp_stdin
 
     def test_wrap_stdout_linux(mocker):
-
         tmp_stdout = sys.stdout
         tmp_stderr = sys.stderr