@@ -56,7 +56,7 @@

     (list (cons :type (object-type->sym type))

           (cons :decompressed-size size)

           (cons :object-data object-data)

-          (cons :raw-data object-data))))

+          (cons :raw-data decompressed))))

 (defun extract-object-of-type (type s repository pos)

   (with-simple-restart (continue "Skip object of type ~s" type)

@@ -98,15 +98,16 @@

 (defun pack (index pack repository)

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

-(defun pack-files (repo)

-  (mapcar (serapeum:op

-            (pack _1

-                  (merge-pathnames

-                   (make-pathname :type "pack") _1)

-                  (repository repo)))

-          (uiop:directory*

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

-                            repo))))

+(defgeneric pack-files (repo)

+  (:method ((repo git-repository))

+    (mapcar (serapeum:op

+              (pack _1

+                    (merge-pathnames

+                     (make-pathname :type "pack") _1)

+                    repo))

+            (uiop:directory*

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

+                              (root-of repo))))))

 (defgeneric loose-object (repository id)

   (:method ((repository string) id)

@@ -138,6 +139,8 @@

   (print-unreadable-object (obj s :type t)

     (format s "~a of ~a"

             (subseq (ref-hash obj) 0 7)

+            (ref-repo obj)

+            #+(or)

             (serapeum:string-replace (namestring (user-homedir-pathname))

                                      (root-of (ref-repo obj))

                                      "~/"))))

@@ -6,6 +6,15 @@

     ((or pathname string) (namestring

                            (truename repo)))))

+(defun packed-ref (repo id)

+  (multiple-value-bind (pack offset) (find-object-in-pack-files repo id)

+    (when pack

+      (make-instance 'packed-ref

+                     :hash id

+                     :repo repo

+                     :offset offset

+                     :pack pack))))

+

 (defgeneric ref (repo id)

   (:documentation "Given a REPOsitory and a ref ID return the ref-id object.")

   (:method ((repo git-repository) (id string))

@@ -15,13 +24,7 @@

                            :repo repo-root

                            :hash id

                            :file object-file))

-          (multiple-value-bind (pack offset) (find-object-in-pack-files repo-root id)

-            (when pack

-              (make-instance 'packed-ref

-                             :hash id

-                             :repo repo-root

-                             :offset offset

-                             :pack pack)))))))

+          (packed-ref repo id)))))

 (defun ensure-ref (thing &optional (repo *git-repository*))

   (typecase thing

@@ -3,6 +3,7 @@

   (:export ))

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

+(defparameter *fake-repo* :fwoar.cl-git.git-objects)

 (fiveam:def-suite :fwoar.cl-git.git-objects

   :description "testing branch resolution"

   :in :fwoar.cl-git)

@@ -11,12 +12,12 @@

 (fw.lu:defclass+ fake-ref ()

   ((%repo :initarg :repo :reader repo)

    (%hash :initarg :hash :reader hash)))

-(defmethod fwoar.cl-git::ref ((repo (eql :the-repo)) hash)

+(defmethod fwoar.cl-git::ref ((repo (eql *fake-repo*)) hash)

   (fake-ref repo hash))

 (fiveam:def-test basic-commit ()

-  (let ((fwoar.cl-git::*git-repository* :the-repo)

+  (let ((fwoar.cl-git::*git-repository* *fake-repo*)

         (object (fwoar.cl-git::extract-loose-object

                  nil

                  (asdf:system-relative-pathname

@@ -36,7 +37,7 @@

                    (fwoar.cl-git:component :parents object)))

     (5am:is (equal "1da546ab4697b719efb62f11fd785d6ad3b226d2"

                    (hash (fwoar.cl-git:component :tree object))))

-    (5am:is (equal :the-repo

+    (5am:is (equal *fake-repo*

                    (repo (fwoar.cl-git:component :tree object))))

     (5am:is (equal '(("author" "L Edgley <foo@bar.com> 1605513585 -0800")

                      ("committer" "Ed L <el-github@elangley.org> 1605513585 -0800")

@@ -62,3 +63,90 @@

                      (fwoar.cl-git:component :name entry)))

       (5am:is (equal "100644"

                      (fwoar.cl-git:component :mode entry))))))

+

+(defparameter *fake-repo* :fwoar.cl-git.git-objects.pack)

+(defmethod fwoar.cl-git::ref ((repo (eql *fake-repo*)) hash)

+  (fake-ref repo hash))

+(defmethod fwoar.cl-git::pack-files ((repo (eql *fake-repo*)))

+  (list

+   (fwoar.cl-git::pack (asdf:system-relative-pathname

+                        :cl-git

+                        "tests/sample-git-objects/hello-world-pack.idx")

+                       (asdf:system-relative-pathname

+                        :cl-git

+                        "tests/sample-git-objects/hello-world-pack.pack")

+                       repo)))

+

+(fiveam:def-test pack-files-commit ()

+  (let* ((hash "7d7b56a6a64e090041f55293511f48aba6699f1a")

+         (ref (fwoar.cl-git::packed-ref-for-object

+               :fwoar.cl-git.git-objects.pack

+               hash))

+         (object (progn (fiveam:is (not (null ref)))

+                        (fiveam:is (equal hash (fwoar.cl-git::ref-hash ref)))

+                        (fiveam:is (equal *fake-repo* (fwoar.cl-git::ref-repo ref)))

+                        (fwoar.cl-git::extract-object ref))))

+

+    (5am:is (typep object 'fwoar.cl-git::git-commit))

+    (5am:is (equal "hello, git!

+"

+                   (fwoar.cl-git:component :message object)))

+    (5am:is (equal ()

+                   (fwoar.cl-git:component :parents object)))

+    (5am:is (equal "L Edgley <foo@bar.com> 1605513585 -0800"

+                   (fwoar.cl-git:component :author object)))

+    (5am:is (equal "Ed L <el-github@elangley.org> 1605513585 -0800"

+                   (fwoar.cl-git:component :committer object)))

+    (5am:is (equal ()

+                   (fwoar.cl-git:component :parents object)))

+    (let ((fwoar.cl-git::*git-repository* *fake-repo*))

+      (5am:is (equal "1da546ab4697b719efb62f11fd785d6ad3b226d2"

+                     (hash (fwoar.cl-git:component :tree object))))

+      (5am:is (equal *fake-repo*

+                     (repo (fwoar.cl-git:component :tree object)))))

+    (5am:is (equal '(("author" "L Edgley <foo@bar.com> 1605513585 -0800")

+                     ("committer" "Ed L <el-github@elangley.org> 1605513585 -0800")

+                     ("tree" "1da546ab4697b719efb62f11fd785d6ad3b226d2"))

+                   (coerce (sort (copy-seq (fwoar.cl-git::metadata object))

+                                 'string-lessp

+                                 :key 'car)

+                           'list)))))

+

+(fiveam:def-test pack-files-tree ()

+  (let* ((hash "1da546ab4697b719efb62f11fd785d6ad3b226d2")

+         (ref (fwoar.cl-git::packed-ref-for-object

+               :fwoar.cl-git.git-objects.pack

+               hash))

+         (object (progn (fiveam:is (not (null ref)))

+                        (fiveam:is (equal hash (fwoar.cl-git::ref-hash ref)))

+                        (fiveam:is (equal *fake-repo* (fwoar.cl-git::ref-repo ref)))

+                        (fwoar.cl-git::extract-object ref))))

+    (5am:is (typep object 'fwoar.cl-git::git-tree))

+    (let* ((entries (fwoar.cl-git::entries object))

+           (entry (progn (5am:is (= (length entries) 1))

+                         (car entries))))

+      (5am:is (equal "4b5fa63702dd96796042e92787f464e28f09f17d"

+                     (fwoar.cl-git:component :hash entry)))

+      (5am:is (equal "a"

+                     (fwoar.cl-git:component :name entry)))

+      (5am:is (equal "100644"

+                     (fwoar.cl-git:component :mode entry))))))

+

+(fiveam:def-test pack-files-blob ()

+  (let* ((hash "4b5fa63702dd96796042e92787f464e28f09f17d")

+         (ref (fwoar.cl-git::packed-ref-for-object

+               :fwoar.cl-git.git-objects.pack

+               hash))

+         (object (progn (fiveam:is (not (null ref)))

+                        (fiveam:is (equal hash (fwoar.cl-git::ref-hash ref)))

+                        (fiveam:is (equal *fake-repo* (fwoar.cl-git::ref-repo ref)))

+                        (fwoar.cl-git::extract-object ref))))

+    (5am:is (typep object '(vector (unsigned-byte 8))))

+    (5am:is (equal "hello, world

+"

+                   (babel:octets-to-string

+                    (fwoar.cl-git::extract-object

+                     (fwoar.cl-git::packed-ref-for-object

+                      :fwoar.cl-git.git-objects.pack

+                      "4b5fa63702dd96796042e92787f464e28f09f17d"))

+                    :encoding :utf-8)))))

new file mode 100644

Binary files /dev/null and b/tests/sample-git-objects/hello-world-pack.idx differ

new file mode 100644

Binary files /dev/null and b/tests/sample-git-objects/hello-world-pack.pack differ

new file mode 100644

@@ -0,0 +1,5 @@

+7d7b56a6a64e090041f55293511f48aba6699f1a commit 163 137 12

+4b5fa63702dd96796042e92787f464e28f09f17d blob   13 22 149

+1da546ab4697b719efb62f11fd785d6ad3b226d2 tree   29 40 171

+non delta: 3 objects

+.git/objects/pack/pack-9560f994ee4405c39b0eb9857c81c764aa96323a.pack: ok