@@ -68,8 +68,9 @@

 (defun extract-loose-object (repo id)

   (with-open-file (s (object repo id)

                      :element-type '(unsigned-byte 8))

-    (chipz:decompress nil (chipz:make-dstate 'chipz:zlib)

-                      s)))

+    (alexandria:when-let ((result (chipz:decompress nil (chipz:make-dstate 'chipz:zlib)

+                                                    s)))

+      (babel:octets-to-string result))))

 (defun extract-object (repo id)

   (if (object repo id)

new file mode 100644

@@ -0,0 +1,73 @@

+(in-package :fwoar.cl-git)

+

+(defparameter *object-data-lens*

+  (data-lens.lenses:make-alist-lens :object-data))

+

+(defclass pack ()

+  ((%pack :initarg :pack :reader pack-file)

+   (%index :initarg :index :reader index-file)))

+

+(defclass repository ()

+  ((%root :initarg :root :reader root)))

+

+(defclass git-object ()

+  ())

+

+(defclass commit (git-object)

+  ())

+

+(defun object-type->sym (object-type)

+  (ecase object-type

+    (1 :commit)

+    (2 :tree)

+    (3 :blob)

+    (4 :tag)

+    (6 :ofs-delta)

+    (7 :ref-delta)))

+

+(defun repository (root)

+  (fw.lu:new 'repository root))

+

+(defun get-local-unpacked-branches (root)

+  (mapcar (data-lens:juxt #'pathname-name

+                          (alexandria:compose #'serapeum:trim-whitespace

+                                              #'alexandria:read-file-into-string))

+          (uiop:directory*

+           (merge-pathnames ".git/refs/heads/*"

+                            root))))

+

+(defun get-local-packed-branches (root)

+  (let* ((packed-ref-file-name (merge-pathnames ".git/packed-refs"

+                                                root)))

+    (when (probe-file packed-ref-file-name)

+      (with-open-file (s packed-ref-file-name)

+        (loop for line = (read-line s nil)

+              for parts = (partition #\space line)

+              for branch-name = (second parts)

+              while line

+              unless (alexandria:starts-with-subseq "#" line)

+              when (alexandria:starts-with-subseq "refs/heads" branch-name)

+              collect (list (subseq branch-name

+                                    (1+ (position #\/ branch-name

+                                                  :from-end t)))

+                            (first parts)))))))

+

+(defun get-local-branches (root)

+  (append (get-local-unpacked-branches root)

+          (get-local-packed-branches root)))

+

+(defun loose-object-path (sha)

+  (let ((obj-path (fwoar.string-utils:insert-at 2 #\/ sha)))

+    (merge-pathnames obj-path ".git/objects/")))

+

+(defun pack (index pack)

+  (fw.lu:new 'pack index pack))

+

+(defun pack-files (repo)

+  (mapcar 'pack

+          (uiop:directory*

+           (merge-pathnames ".git/objects/pack/*.idx"

+                            repo))

+          (uiop:directory*

+           (merge-pathnames ".git/objects/pack/*.pack"

+                            repo))))

@@ -31,25 +31,25 @@

 (defun partition (char string &key from-end)

   (let ((pos (position char string :from-end from-end)))

     (if pos

-	      (list (subseq string 0 pos)

-	            (subseq string (1+ pos)))

-	      (list string

-	            nil))))

+        (list (subseq string 0 pos)

+              (subseq string (1+ pos)))

+      (list string

+            nil))))

 (defun partition-subseq (subseq string &key from-end)

   (let ((pos (search subseq string :from-end from-end)))

     (if pos

-	      (list (subseq string 0 pos)

-	            (subseq string (+ (length subseq) pos)))

-	      (list string

-	            nil))))

+        (list (subseq string 0 pos)

+              (subseq string (+ (length subseq) pos)))

+      (list string

+            nil))))

 (serapeum:defalias ->sha-string

   (data-lens:<>1 (data-lens:over 'fwoar.bin-parser:byte-array-to-hex-string)

                  'batch-20))

 (defun read-bytes (count format stream)

-  (let ((seq (make-array count)))

+  (let ((seq (make-array count :element-type 'serapeum:octet)))

     (read-sequence seq stream)

     (funcall format

              seq)))

@@ -74,4 +74,5 @@

       (partition-subseq #(#\newline #\newline)

                         commit #+(or)(babel:octets-to-string commit :encoding :latin1))

     (values message

-            (fwoar.string-utils:split #\newline metadata))))

+            (map 'vector (serapeum:op (partition #\space _))

+                 (fwoar.string-utils:split #\newline metadata)))))