workflow test

Author: schiele

.github/workflows/test.yml

@@ -0,0 +1,20 @@
+name: Test
+on: [push]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Prerequisits
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y asciidoc python3-pygit2
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Test
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "Test User"
+          gpg --batch --gen-key .github/workflows/testkey.conf
+          make KEY:=$(gpg --list-keys --with-colons | awk -F: '/^pub/ {print $5; exit}') test

.github/workflows/testkey.conf

@@ -0,0 +1,9 @@
+%no-protection
+Key-Type: RSA
+Key-Length: 2048
+Subkey-Type: RSA
+Subkey-Length: 2048
+Name-Real: Test User
+Name-Email: [email protected]
+Expire-Date: 0
+%commit

Makefile

@@ -1,4 +1,4 @@
-export PATH := $(CURDIR):$(PATH)
+export GIT_EXEC_PATH := $(CURDIR):$(shell git --exec-path)
 export MANPATH := $(CURDIR):$(MANPATH)
 VERBOSE :=
 TESTREPO := $(CURDIR)
@@ -25,14 +25,14 @@ test: man
 	git ls-remote $(TESTREPO)
 	git incrypt init $(REPO) $(KEY)
 	git -C $(TESTREPO) fetch $(REPO) || git -C $(TESTREPO) incrypt trust $(REPO)
-	git -C $(TESTREPO) push $(VERBOSE) $(REPO) master~2:refs/heads/master
+	git -C $(TESTREPO) push $(VERBOSE) $(REPO) HEAD~2:refs/heads/master
 	git clone $(VERBOSE) $(REPO) tst
 	git -C $(TESTREPO) push $(VERBOSE) $(REPO) v0.9.0
 	git -C tst pull $(VERBOSE)
-	git -C $(TESTREPO) push $(VERBOSE) $(REPO) master
-	git -C tst pull $(VERBOSE)
-	git -C $(TESTREPO) push $(VERBOSE) --all $(REPO)
+	git -C $(TESTREPO) push $(VERBOSE) $(REPO) HEAD:master
 	git -C tst pull $(VERBOSE)
+	git -C $(TESTREPO) push $(VERBOSE) -f --all $(REPO)
+	git -C tst pull --no-rebase -X theirs --no-edit $(VERBOSE)
 	git ls-remote crypt
 	git -C tst ls-remote $(REPO)
 	git ls-remote tst

git-incrypt

@@ -303,8 +303,10 @@ class CryptRepo:
             collector.insert('0', cryptobjs[obj.id],
                              pygit2.enums.FileMode.BLOB)
             colid = collector.write()
+            sys.stderr.write(f'||| {cryptmap}\n')
+            sys.stderr.flush()
             cryptmap[str(obj.id)] = self.meta.secretcommit(
-                colid, [cryptmap[c] for c in obj.parent_ids]
+                colid, [cryptmap[str(c)] for c in obj.parent_ids]
                 if obj.type == pygit2.enums.ObjectType.COMMIT
                 else [cryptmap[obj.target]])
 
@@ -317,6 +319,14 @@ class CryptRepo:
         colobjs = CryptRepo._revlist(
             CryptRepo.RevMode.PARENT, [r[4].id for r in xrefs if r[4]],
             cryptmap)
+        sys.stderr.write('vvv\n')
+        for i in CryptRepo._revlist(CryptRepo.RevMode.ALL, colobjs):
+            sys.stderr.write(f'<<< {i}\n')
+        sys.stderr.write('===\n')
+        for i in colobjs:
+            sys.stderr.write(f'>>> {i}\n')
+        sys.stderr.write('^^^\n')
+        sys.stderr.flush()
         cryptobjs = {}
         self._progress_for('Encrypting objects',
                            CryptRepo._revlist(CryptRepo.RevMode.ALL, colobjs),
@@ -325,7 +335,7 @@ class CryptRepo:
         self.meta.write(cryptmap)
         for r in xrefs:
             if r[4]:
-                self.repo.create_reference(r[2], cryptmap[r[4].id],
+                self.repo.create_reference(r[2], cryptmap[str(r[4].id)],
                                            force=True)
             else:
                 try: