diff --git a/.gitfield/.radicle-push-state b/.gitfield/.radicle-push-state index 89f087d..6440a2e 100644 --- a/.gitfield/.radicle-push-state +++ b/.gitfield/.radicle-push-state @@ -1 +1 @@ -a747e077717e7862a8742d77a0872dd619d9560d +8302ba3ccd61a4aeb76064d3bfc94114c7d31cc4 diff --git a/.gitfield/bitbucket.sigil.md b/.gitfield/bitbucket.sigil.md index cb83ca4..43b1cbb 100644 --- a/.gitfield/bitbucket.sigil.md +++ b/.gitfield/bitbucket.sigil.md @@ -71,7 +71,7 @@ - **Running in Docker**: `No` - **Running in WSL**: `Yes` - **Virtual Machine**: `wsl` -- **System Uptime**: `up 23 hours, 34 minutes` +- **System Uptime**: `up 22 hours, 22 minutes` --- diff --git a/.gitfield/github.sigil.md b/.gitfield/github.sigil.md index eb3bb63..1aa069c 100644 --- a/.gitfield/github.sigil.md +++ b/.gitfield/github.sigil.md @@ -6,25 +6,25 @@ - **Local Repo Path**: `/mnt/c/Downloads/git-sigil` - **Remote Label**: `github` - **Default Branch**: `master` -- **This Commit Date**: `2025-06-07 01:26:22` +- **This Commit Date**: `2025-06-07 00:20:54` --- ## πŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-07 01:26:22` -- **Last Commit SHA**: `5873a18e9882a3815f4bb39a21bac9f6f2eebe43` -- **Last Commit Message**: `Post-Bitbucket sync at 2025-06-07 01:18:36` +- **This Commit Timestamp**: `2025-06-07 00:20:54` +- **Last Commit SHA**: `231eee68616d3394d349c3cc982608617297caaa` +- **Last Commit Message**: `Local metadata link commit at 2025-06-07 00:18:57 β€” file:///home/mrhavens/git-local-repos/git-sigil.git` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Sat Jun 7 01:26:10 2025 -0500` -- **This Commit URL**: [https://github.com/mrhavens/git-sigil/commit/5873a18e9882a3815f4bb39a21bac9f6f2eebe43](https://github.com/mrhavens/git-sigil/commit/5873a18e9882a3815f4bb39a21bac9f6f2eebe43) +- **Last Commit Date**: `Sat Jun 7 00:19:01 2025 -0500` +- **This Commit URL**: [https://github.com/mrhavens/git-sigil/commit/231eee68616d3394d349c3cc982608617297caaa](https://github.com/mrhavens/git-sigil/commit/231eee68616d3394d349c3cc982608617297caaa) --- ## πŸ“Š Repo Status -- **Total Commits**: `859` -- **Tracked Files**: `115` +- **Total Commits**: `789` +- **Tracked Files**: `113` - **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` @@ -48,7 +48,7 @@ - **Running in Docker**: `No` - **Running in WSL**: `Yes` - **Virtual Machine**: `wsl` -- **System Uptime**: `up 23 hours, 34 minutes` +- **System Uptime**: `up 22 hours, 28 minutes` - **MAC Address**: `00:15:5d:86:d8:cc` - **Local IP**: `172.18.207.124` - **CPU Model**: `AMD A6-3420M APU with Radeon(tm) HD Graphics` diff --git a/.gitfield/gitlab.sigil.md b/.gitfield/gitlab.sigil.md index 3a32099..66a99ac 100644 --- a/.gitfield/gitlab.sigil.md +++ b/.gitfield/gitlab.sigil.md @@ -67,7 +67,7 @@ - **Running in Docker**: `No` - **Running in WSL**: `Yes` - **Virtual Machine**: `wsl` -- **System Uptime**: `up 23 hours, 33 minutes` +- **System Uptime**: `up 22 hours, 22 minutes` - **MAC Address**: `00:15:5d:86:d8:cc` - **Local IP**: `172.18.207.124` - **CPU Model**: `AMD A6-3420M APU with Radeon(tm) HD Graphics` diff --git a/.gitfield/last_resolution.log b/.gitfield/last_resolution.log deleted file mode 100644 index fc52d5b..0000000 --- a/.gitfield/last_resolution.log +++ /dev/null @@ -1,43 +0,0 @@ -πŸ› οΈ [GITFIELD] Beginning auto-resolution ritual... -βœ… No changes to commit. -πŸ” Checking bitbucket for divergence... -From bitbucket.org:thefoldwithin/git-sigil - * branch master -> FETCH_HEAD -βœ… bitbucket is already in sync. -πŸ” Checking github for divergence... -From github.com:mrhavens/git-sigil - * branch master -> FETCH_HEAD -⚠️ Divergence with github. Attempting merge... -From github.com:mrhavens/git-sigil - * branch master -> FETCH_HEAD -Already up to date. -βœ… No changes to commit. -To github.com:mrhavens/git-sigil.git - ! [rejected] master -> master (non-fast-forward) -error: failed to push some refs to 'github.com:mrhavens/git-sigil.git' -hint: Updates were rejected because a pushed branch tip is behind its remote -hint: counterpart. If you want to integrate the remote changes, use 'git pull' -hint: before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. -⚠️ Final push failed to github -πŸ” Checking gitlab for divergence... -From gitlab.com:mrhavens/git-sigil - * branch master -> FETCH_HEAD -βœ… gitlab is already in sync. -πŸ” Checking local for divergence... -From file:///home/mrhavens/git-local-repos/git-sigil - * branch master -> FETCH_HEAD -βœ… local is already in sync. -πŸ” Checking origin for divergence... -From ssh://remember.thefoldwithin.earth/mrhavens/git-sigil - * branch master -> FETCH_HEAD -βœ… origin is already in sync. -πŸ” Checking remember for divergence... -From remember.thefoldwithin.earth:mrhavens/git-sigil - * branch master -> FETCH_HEAD -βœ… remember is already in sync. -πŸ§™ Final override: Forcing sync to GitHub... -To github.com:mrhavens/git-sigil.git - + 4b323cb...f57c893 master -> master (forced update) -βœ… GitHub forcibly realigned with local truth. -βœ… GitField resolution ritual complete. diff --git a/.gitfield/local.sigil.md b/.gitfield/local.sigil.md index 40ed492..0c049c3 100644 --- a/.gitfield/local.sigil.md +++ b/.gitfield/local.sigil.md @@ -6,26 +6,26 @@ - **Local Repo Path**: `/mnt/c/Downloads/git-sigil` - **Remote Label**: `local` - **Default Branch**: `master` -- **Repo Created**: `2025-06-07 01:33:39` +- **Repo Created**: `2025-06-07 00:18:57` --- ## πŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-07 01:33:39` -- **Last Commit SHA**: `5c5ba832e3dd3be3e1ec38fdd6cc3bdc555a0f11` -- **Last Commit Message**: `Merge branch 'master' of bitbucket.org:thefoldwithin/git-sigil` +- **This Commit Timestamp**: `2025-06-07 00:18:57` +- **Last Commit SHA**: `4467ce03add4752ee46b5f27dc66929f8e53c509` +- **Last Commit Message**: `Post-GitHub sync at 2025-06-07 00:07:23` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Sat Jun 7 01:27:40 2025 -0500` +- **Last Commit Date**: `Sat Jun 7 00:15:44 2025 -0500` - **This Commit URL**: `file:///home/mrhavens/git-local-repos/git-sigil.git` --- ## πŸ“Š Repo Status -- **Total Commits**: `864` -- **Tracked Files**: `115` -- **Uncommitted Changes**: `No` +- **Total Commits**: `788` +- **Tracked Files**: `113` +- **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` --- @@ -48,7 +48,7 @@ - **Running in Docker**: `No` - **Running in WSL**: `Yes` - **Virtual Machine**: `wsl` -- **System Uptime**: `up 23 hours, 41 minutes` +- **System Uptime**: `up 22 hours, 26 minutes` - **MAC Address**: `00:15:5d:86:d8:cc` - **Local IP**: `172.18.207.124` - **CPU Model**: `AMD A6-3420M APU with Radeon(tm) HD Graphics` diff --git a/.gitfield/push_log.json b/.gitfield/push_log.json index 3951cc0..36e6721 100644 --- a/.gitfield/push_log.json +++ b/.gitfield/push_log.json @@ -122,48 +122,6 @@ "branch": "master", "commit": "4467ce03add4752ee46b5f27dc66929f8e53c509", "message": "Post-GitHub sync at 2025-06-07 00:07:23" - }, - { - "timestamp": "2025-06-07 00:42:50", - "branch": "Unknown", - "commit": "38bfa138c36b5afb09001a81d1df873ee7732eb8", - "message": "πŸ”€ Merge: resolved conflicts with github master" - }, - { - "timestamp": "2025-06-07 00:44:12", - "branch": "Unknown", - "commit": "4b490f68ccee394e66dde9253a7d4fe5448c2bb8", - "message": "Generated GITFIELD.md at 2025-06-07 00:42:50" - }, - { - "timestamp": "2025-06-07 00:45:26", - "branch": "Unknown", - "commit": "49cc6d871738f84198590c372c1beda26ed1c889", - "message": "Post-GitHub sync at 2025-06-07 00:42:50" - }, - { - "timestamp": "2025-06-07 01:18:38", - "branch": "master", - "commit": "a091f204544eaf8b5b0bb5cddf8be02728ef54a2", - "message": "πŸ”„ Auto-resolve commit from gitfield-resolve.sh" - }, - { - "timestamp": "2025-06-07 01:22:31", - "branch": "master", - "commit": "e6165ea7b01fa5a50adad73fef518c5a253be79a", - "message": "Generated GITFIELD.md at 2025-06-07 01:18:36" - }, - { - "timestamp": "2025-06-07 01:24:29", - "branch": "master", - "commit": "e6b597de8fab6528295f18eb0f16f212193e7996", - "message": "Post-GitHub sync at 2025-06-07 01:18:36" - }, - { - "timestamp": "2025-06-07 01:33:39", - "branch": "master", - "commit": "5c5ba832e3dd3be3e1ec38fdd6cc3bdc555a0f11", - "message": "Merge branch 'master' of bitbucket.org:thefoldwithin/git-sigil" } ] } diff --git a/.gitfield/pushed.log b/.gitfield/pushed.log index 4220e36..6463365 100644 --- a/.gitfield/pushed.log +++ b/.gitfield/pushed.log @@ -140,7 +140,3 @@ [2025-06-06 12:25:42] Forgejo: https://remember.thefoldwithin.earth/mrhavens/git-sigil [2025-06-06 12:25:55] GitLab: https://gitlab.com/mrhavens/git-sigil >>>>>>> be7726405b6412ae5af5144f9e2cf4d13bd32aeb -[2025-06-07 01:33:59] Local: -[2025-06-07 01:34:19] Radicle: RID=rad:z3FEj7rF8gZw9eFksCuiN43qjzrex, Peer ID=z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz - CLI: rad inspect rad:z3FEj7rF8gZw9eFksCuiN43qjzrex # View project details - CLI: git ls-tree -r --name-only HEAD # View file structure diff --git a/.gitfield/radicle.sigil.md b/.gitfield/radicle.sigil.md index 4255d2a..62a69d5 100644 --- a/.gitfield/radicle.sigil.md +++ b/.gitfield/radicle.sigil.md @@ -1,29 +1,29 @@ # πŸ”— Radicle Repository Link - **Project Name**: `git-sigil` -- **Radicle URN**: `rad://z25YEyUuiew3Nv7yCyAkaQznFuzA2` -- **Public Gateway**: [https://app.radicle.xyz/nodes/ash.radicle.garden/rad:z25YEyUuiew3Nv7yCyAkaQznFuzA2/tree/a747e077717e7862a8742d77a0872dd619d9560d](https://app.radicle.xyz/nodes/ash.radicle.garden/rad:z25YEyUuiew3Nv7yCyAkaQznFuzA2/tree/a747e077717e7862a8742d77a0872dd619d9560d) -- **Local Repo Path**: `/mnt/c/Downloads/git-sigil` +- **Radicle URN**: `rad://z3FEj7rF8gZw9eFksCuiN43qjzrex` +- **Public Gateway**: [https://app.radicle.xyz/nodes/ash.radicle.garden/rad:z3FEj7rF8gZw9eFksCuiN43qjzrex/tree/8302ba3ccd61a4aeb76064d3bfc94114c7d31cc4](https://app.radicle.xyz/nodes/ash.radicle.garden/rad:z3FEj7rF8gZw9eFksCuiN43qjzrex/tree/8302ba3ccd61a4aeb76064d3bfc94114c7d31cc4) +- **Local Repo Path**: `/home/mrhavens/tmpwork/git-sigil` - **Default Branch**: `master` -- **Repo Created**: `2025-06-07 01:34:11` +- **Repo Created**: `2025-06-06 12:25:35` --- ## πŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-07 01:34:11` -- **Last Commit SHA**: `a747e077717e7862a8742d77a0872dd619d9560d` -- **Last Commit Message**: `Post-Local sync at 2025-06-07 01:33:38` +- **This Commit Timestamp**: `2025-06-06 12:25:35` +- **Last Commit SHA**: `8302ba3ccd61a4aeb76064d3bfc94114c7d31cc4` +- **Last Commit Message**: `Post-Local sync at 2025-06-06 12:19:09` - **Commit Author**: `Mark Randall Havens ` -- **Commit Date**: `Sat Jun 7 01:34:02 2025 -0500` -- **This Commit URL**: [https://app.radicle.xyz/nodes/ash.radicle.garden/rad:z25YEyUuiew3Nv7yCyAkaQznFuzA2/tree/a747e077717e7862a8742d77a0872dd619d9560d](https://app.radicle.xyz/nodes/ash.radicle.garden/rad:z25YEyUuiew3Nv7yCyAkaQznFuzA2/tree/a747e077717e7862a8742d77a0872dd619d9560d) +- **Commit Date**: `Fri Jun 6 12:25:33 2025 -0500` +- **This Commit URL**: [https://app.radicle.xyz/nodes/ash.radicle.garden/rad:z3FEj7rF8gZw9eFksCuiN43qjzrex/tree/8302ba3ccd61a4aeb76064d3bfc94114c7d31cc4](https://app.radicle.xyz/nodes/ash.radicle.garden/rad:z3FEj7rF8gZw9eFksCuiN43qjzrex/tree/8302ba3ccd61a4aeb76064d3bfc94114c7d31cc4) --- ## πŸ“Š Repo Status -- **Total Commits**: `866` -- **Tracked Files**: `115` +- **Total Commits**: `750` +- **Tracked Files**: `81` - **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` @@ -47,7 +47,7 @@ - **Running in Docker**: `No` - **Running in WSL**: `Yes` - **Virtual Machine**: `wsl` -- **System Uptime**: `up 23 hours, 42 minutes` +- **System Uptime**: `up 11 hours, 9 minutes` - **MAC Address**: `00:15:5d:86:d8:cc` - **Local IP**: `172.18.207.124` - **CPU Model**: `AMD A6-3420M APU with Radeon(tm) HD Graphics` @@ -57,7 +57,7 @@ ## 🌱 Radicle-Specific Metadata -- **Project ID**: `z25YEyUuiew3Nv7yCyAkaQznFuzA2` +- **Project ID**: `z3FEj7rF8gZw9eFksCuiN43qjzrex` - **Peer ID**: `z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz` - **Public Gateway Base**: `https://app.radicle.xyz/nodes/ash.radicle.garden` diff --git a/.gitfield/remember.sigil.md b/.gitfield/remember.sigil.md index d85e26e..87e201c 100644 --- a/.gitfield/remember.sigil.md +++ b/.gitfield/remember.sigil.md @@ -6,26 +6,26 @@ - **Local Repo Path**: `/mnt/c/Downloads/git-sigil` - **Remote Label**: `remember` - **Default Branch**: `master` -- **Repo Created**: `2025-06-07 01:34:25` +- **Repo Created**: `2025-06-07 00:14:26` --- ## πŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-07 01:34:25` -- **Last Commit SHA**: `54ec3c68583ea4a44536d3969d9a39ba4d7bdbea` -- **Last Commit Message**: `Post-Radicle sync at 2025-06-07 01:33:38` +- **This Commit Timestamp**: `2025-06-07 00:14:26` +- **Last Commit SHA**: `73366f36141d7d788d9477cd18f888f99bd44037` +- **Last Commit Message**: `Post-Radicle sync at 2025-06-07 00:07:23` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Sat Jun 7 01:34:22 2025 -0500` -- **This Commit URL**: [https://remember.thefoldwithin.earth/mrhavens/git-sigil/commit/54ec3c68583ea4a44536d3969d9a39ba4d7bdbea](https://remember.thefoldwithin.earth/mrhavens/git-sigil/commit/54ec3c68583ea4a44536d3969d9a39ba4d7bdbea) +- **Last Commit Date**: `Sat Jun 7 00:14:23 2025 -0500` +- **This Commit URL**: [https://remember.thefoldwithin.earth/mrhavens/git-sigil/commit/73366f36141d7d788d9477cd18f888f99bd44037](https://remember.thefoldwithin.earth/mrhavens/git-sigil/commit/73366f36141d7d788d9477cd18f888f99bd44037) --- ## πŸ“Š Repo Status -- **Total Commits**: `868` -- **Tracked Files**: `115` -- **Uncommitted Changes**: `No` +- **Total Commits**: `780` +- **Tracked Files**: `113` +- **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` --- @@ -48,7 +48,7 @@ - **Running in Docker**: `No` - **Running in WSL**: `Yes` - **Virtual Machine**: `wsl` -- **System Uptime**: `up 23 hours, 42 minutes` +- **System Uptime**: `up 22 hours, 22 minutes` - **MAC Address**: `00:15:5d:86:d8:cc` - **Local IP**: `172.18.207.124` - **CPU Model**: `AMD A6-3420M APU with Radeon(tm) HD Graphics` diff --git a/GITFIELD.md b/GITFIELD.md index 345d8d8..bada5df 100644 --- a/GITFIELD.md +++ b/GITFIELD.md @@ -76,4 +76,4 @@ This multi-repository approach, bolstered by Forgejo’s sovereign hosting, refl --- -_Auto-generated by `gitfield-sync` at 2025-06-07 01:18:36 (v1.0)._ +_Auto-generated by `gitfield-sync` at 2025-06-07 00:07:23 (v1.0)._ diff --git a/bin/gitfield-resolve.sh b/bin/gitfield-resolve.sh deleted file mode 100644 index c5fe70e..0000000 --- a/bin/gitfield-resolve.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash - -echo "πŸ› οΈ [GITFIELD] Beginning auto-resolution ritual..." - -# Ensure we’re in a Git repo -if ! git rev-parse --git-dir > /dev/null 2>&1; then - echo "❌ Not a Git repository. Aborting." - exit 1 -fi - -# Ensure at least one commit exists -if ! git log > /dev/null 2>&1; then - echo "πŸŒ€ No commits found. Creating seed commit..." - git add . - git commit --allow-empty -m "🌱 Seed commit for Radicle and GitField rituals" -fi - -# GPG sign commit if enabled -GPG_KEY=$(git config user.signingkey) -if [ -n "$GPG_KEY" ]; then - echo "πŸ” GPG commit signing enabled with key: $GPG_KEY" - git commit -S --allow-empty -m "πŸ” Ritual signed commit [auto]" -fi - -# Stage and commit any local changes -if ! git diff --quiet || ! git diff --cached --quiet; then - git add . - git commit -m "πŸ”„ Auto-resolve commit from gitfield-resolve.sh" - echo "βœ… Local changes committed." -else - echo "βœ… No changes to commit." -fi - -# Loop through remotes -remotes=$(git remote) -for remote in $remotes; do - echo "πŸ” Checking $remote for divergence..." - git fetch $remote - if git merge-base --is-ancestor $remote/master master; then - echo "βœ… $remote is already in sync." - else - echo "⚠️ Divergence with $remote. Attempting merge..." - git pull --no-rebase $remote master --strategy-option=theirs --allow-unrelated-histories - git push $remote master || echo "⚠️ Final push failed to $remote" - fi -done - -# ==== RADICLE SECTION ==== - -echo "🌱 [RADICLE] Verifying Radicle status..." - -# Check if Radicle is initialized -if ! rad inspect > /dev/null 2>&1; then - echo "🌿 No Radicle project detected. Attempting init..." - RAD_INIT_OUTPUT=$(rad init --name git-sigil --description "GitField Ritual Repo") - echo "$RAD_INIT_OUTPUT" -fi - -# Push to Radicle and announce -echo "πŸ“‘ Announcing to Radicle network..." -rad push --announce - -# Get project ID -PROJECT_ID=$(rad inspect | grep "Project ID" | awk '{print $NF}') -if [ -n "$PROJECT_ID" ]; then - echo "πŸ“œ Logging Radicle project ID to .gitfield/radicle.sigil.md" - mkdir -p .gitfield - echo "# Radicle Sigil" > .gitfield/radicle.sigil.md - echo "**Project ID:** \`$PROJECT_ID\`" >> .gitfield/radicle.sigil.md -fi - -echo "βœ… GitField resolution ritual complete."