incremental reindexing, import charset fixes, other thingies

1 files changed, 17 insertions, 3 deletions

diff --git a/tekuti/git.scm b/tekuti/git.scm
index aede954..355d3b1 100644
--- a/tekuti/git.scm
+++ b/tekuti/git.scm
@@ -39,7 +39,7 @@
             git git* ensure-git-repo git-ls-tree git-ls-subdirs
             parse-metadata parse-commit commit-utc-timestamp
             commit-parents make-tree git-rev-parse make-tree-full
-            create-blob
+            create-blob git-update-ref
 
             write-indices read-indices))
 
@@ -63,7 +63,7 @@
 		(string->list str))
       (display #\'))))
       
-(define *debug* #t)
+(define *debug* #f)
 (define (trc . args)
   (if *debug*
       (apply pk args)
@@ -88,7 +88,8 @@
          (ret (close-pipe pipe)))
     (case (status:exit-val ret)
       ((0) (if (eof-object? output) "" output))
-      (else (raise (condition (&git-condition
+      (else (trc 'git-error output ret real-args)
+            (raise (condition (&git-condition
                                (argv real-args)
                                (output output)
                                (status ret))))))))
@@ -211,6 +212,19 @@
                        alist)
                   "\n" 'suffix))))
 
+(define (git-update-ref refname proc count)
+  (let* ((ref (git-rev-parse refname))
+         (commit (proc ref)))
+    (cond
+     ((zero? count)
+      (error "my god, we looped 5 times" commit))
+     ((false-if-git-error
+       (git "update-ref" refname commit ref))
+      commit)
+     (else
+      (pk "failed to update the ref, trying again..." refname)
+      (git-update-ref (git-rev-parse refname) (1- count))))))
+
 ;; fixme: map-pairs
 
 (define (assoc-list-ref alist key n default)