dev: move modify of version.txt from post-commit to pre-push

to avoid conflicts on frequent rebases of feature branches

Author: McShelby

.githooks/post-commit.py

@@ -1,22 +1,70 @@
 #!/usr/bin/env python3
 
-# This script avoids to push branches starting with a "#". This is the way
-# how I store ticket related feature branches that are work in progress.
-
-# Once a feature branch is finished, it will be rebased to mains HEAD,
-# its commits squashed, merged into main and the branch deleted afterwards.
-
+# Purpose:
+#
+# - avoids to push branches starting with a "#". This is the way
+#   how I store ticket related feature branches that are work in progress
+#
+# - updates the version file "layouts/partials/version.txt" with the latest
+#   available commit hash before pushing
+#
+# Installation:
+#
 # Call this script from your ".git/hooks/pre-push" file like this (supporting
 # Linux, Windows and MacOS)
-
+#
+# ```sh
 # #!/bin/sh
 # python3 .githooks/pre-push.py
+# ```
 
 from datetime import datetime
 import os
 import re
 import subprocess
 
+def check_wip_branch(script_name, log_file, time, repo_name):
+    local_branch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], universal_newlines=True).strip()
+    wip_prefix = '^#\\d+(?:\\b.*)$'
+    if re.match(wip_prefix, local_branch):
+        print(f'{time}: {repo_name} - {script_name} - Branch "{local_branch}" was not pushed because its name starts with a "#" which marks it as work in progress', file=open(log_file, "a"))
+        print(f'{script_name} - Branch "{local_branch}" was not pushed because its name starts with a "#" which marks it as work in progress')
+        exit(1)
+
+def update_version(script_name, log_file, time, repo_name):
+    file_path = 'layouts/partials/version.txt'
+    try:
+        f = open(file_path, 'r+')
+    except OSError as e:
+        print(f'{time}: {repo_name} - {script_name} - Could not open {file_path}: [{e.errno}] {e.strerror}', file=open(log_file, "a"))
+        print(f'{script_name} - Could not open {file_path}: [{e.errno}] {e.strerror}')
+        exit(1)
+    with f:
+        version = f.read().strip()
+        new_version = ''
+        match = re.match(r'(\d+\.\d+\.\d+)(?:\+([^+]+))?', version)
+        if match:
+            semver = match.group(1)
+            old_hash = match.group(2)
+            new_hash = subprocess.check_output(['git', 'rev-parse', 'HEAD~1']).decode('utf-8').strip()
+            print(f'{time}: {repo_name} - {script_name} - old hash {old_hash} - new hash {new_hash}', file=open(log_file, "a"))
+            print(f'{script_name} - old hash {old_hash} - new hash {new_hash}')
+            if old_hash != new_hash:
+                new_version = f'{semver}+{new_hash}'
+                f.seek(0)
+                f.write(new_version)
+                f.truncate()
+                f.close()
+                subprocess.check_call(['git', 'add', file_path])
+                subprocess.check_call(['git', 'commit', '--amend', '--no-edit'])
+                print(f'{time}: {repo_name} - {script_name} - New version {new_version} was written to {file_path}', file=open(log_file, "a"))
+            else:
+                print(f'{time}: {repo_name} - {script_name} - No change in hash, file {file_path} not updated', file=open(log_file, "a"))
+        else:
+            print(f'{time}: {repo_name} - {script_name} - Invalid version format in {file_path}', file=open(log_file, "a"))
+            print(f'{script_name} - Invalid version format in {file_path}')
+            exit(1)
+
 # This hook is called with the following parameters:
 # $1 -- Name of the remote to which the push is being done
 # $2 -- URL to which the push is being done
@@ -25,8 +73,6 @@
 # Information about the commits being pushed is supplied as lines to
 # the standard input in the form:
 # <local ref> <local sha1> <remote ref> <remote sha1>
-# This hook prevents the push of commits that belong to branches starting with
-# an "#" (which are work in progress).
 
 def main():
     script_name = "PRE-PUSH"
@@ -36,13 +82,8 @@ def main():
     repo_root = subprocess.check_output(['git', 'rev-parse', '--show-toplevel'], universal_newlines=True).strip()
     repo_name = os.path.basename(repo_root)
 
-    local_branch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], universal_newlines=True).strip()
-    wip_prefix = '^#\\d+(?:\\b.*)$'
-    if re.match(wip_prefix, local_branch):
-        print(f'{time}: {repo_name} - {script_name} - Branch "{local_branch}" was not pushed because its name starts with a "#" which marks it as work in progress', file=open(log_file, "a"))
-        print(f'{script_name} - Branch "{local_branch}" was not pushed because its name starts with a "#" which marks it as work in progress')
-        exit(1)
-    print(f'{time}: {repo_name} - {script_name} - Branch "{local_branch}" was pushed', file=open(log_file, "a"))
+    check_wip_branch(script_name, log_file, time, repo_name)
+    update_version(script_name, log_file, time, repo_name)
     exit(0)
 
 if __name__ == "__main__":

.githooks/pre-push.py

@@ -166,7 +166,6 @@ Example: `search: improve Orama integration for multilingual sites`
 ### Git Hooks
 
 Python-based git hooks in `.githooks/`:
-- `post-commit.py` - Post-commit processing
 - `pre-push.py` - Pre-push validation
 
 ## Important Files

CLAUDE.md

@@ -1 +1 @@
-9.0.3+6ce76522e50393128730839d3ffa3deb12863262
+9.0.3+57de3e1982fe4f34061610fa61c80ccf16148fd5