Updates on files

Author: Alexander Rogalskiy

package.json

@@ -252,6 +252,7 @@
     "script:name": "test -f ./scripts/package_app_name.js && node --experimental-modules --no-warnings --no-deprecation ./scripts/package_app_name.js || echo '✔ Node package name script is missing'",
     "script:notes": "test -f ./scripts/git_release_notes.sh && . ./scripts/git_release_notes.sh > NOTES.md || echo '✔ Git release notes script is missing'",
     "script:size": "test -f ./scripts/git_size.sh && . ./scripts/git_size.sh || echo '✔ Git size script is missing'",
+    "script:conflict": "test -f ./scripts/pre-commit.sh && /bin/bash ./scripts/pre-commit.sh || echo '✔ Git pre-commit script is missing'",
     "setheapsize": "export NODE_OPTIONS=--max_old_space_size=2048",
     "solidarity": "solidarity",
     "solidarity:update": "solidarity snapshot cli node",

scripts/check_merge_conflict.py

@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+# from https://github.com/pre-commit/pre-commit-hooks
+# and made more blunt
+from __future__ import print_function
+
+import argparse
+import os.path
+import sys
+
+CONFLICT_PATTERNS = [
+    '<<<<<<< ',
+    '======= ',
+    '=======\n',
+    '>>>>>>> '
+]
+WARNING_MSG = 'Merge conflict string "{0}" found in {1}:{2}'
+
+
+def detect_merge_conflict(argv=None):
+    parser = argparse.ArgumentParser()
+    parser.add_argument('filenames', nargs='*')
+    args = parser.parse_args(argv)
+
+    retcode = 0
+    for filename in args.filenames:
+        with open(filename) as inputfile:
+            for i, line in enumerate(inputfile):
+                for pattern in CONFLICT_PATTERNS:
+                    if line.startswith(pattern):
+                        print(WARNING_MSG.format(pattern, filename, i + 1))
+                        retcode = 1
+
+    return retcode
+
+if __name__ == '__main__':
+    sys.exit(detect_merge_conflict())

scripts/hook.sh

@@ -15,6 +15,10 @@
 
 # Usage example: /bin/sh ./scripts/hook.sh
 
+set -o errexit
+set -o nounset
+set -o pipefail
+
 cat << EOF
 Build specification:
     DefaultRepo:    $SKAFFOLD_DEFAULT_REPO

scripts/pre-commit.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Copyright (C) 2022 SensibleMetrics, Inc. (http://sensiblemetrics.io/)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Usage example: /bin/bash ./scripts/pre-commit.sh
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# probably a dumb way to detect changed files which are not deleted
+scripts/check_merge_conflict.py $(comm -12 <(git diff --name-only --cached) <(git ls-files))