@@ -1,8 +1,7 @@

 (in-package :fwoar.cl-git)

-(defclass git-commit ()

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

-   (%metadata :initarg :metadata :reader metadata)

+(defclass git-commit (git-object)

+  ((%metadata :initarg :metadata :reader metadata)

    (%data :initarg :data :reader data)))

 (defmethod print-object ((o git-commit) s)

@@ -35,9 +34,6 @@

                hash))

-(defmethod component ((component (eql :hash)) (object git-commit))

-  (hash object))

-

 (defmethod component ((component (eql :tree)) (object git-commit))

   (ensure-ref

    (cadr

@@ -1,6 +1,6 @@

 (in-package :fwoar.cl-git)

-(defclass delta ()

+(defclass delta (git-object)

   ((%repository :initarg :repository :reader repository)

    (%base :initarg :base :reader base)

    (%commands :initarg :commands :reader commands)))

@@ -14,7 +14,7 @@

   ())

 (defclass git-object ()

-  ())

+  ((%hash :initarg :hash :accessor hash)))

 (defgeneric object-type->sym (object-type)

   (:documentation "Canonicalizes different representations of an

@@ -146,3 +146,6 @@

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

                                      (root-of (ref-repo obj))

                                      "~/"))))

+

+(defmethod component ((component (eql :hash)) (object git-object))

+  (hash object))

@@ -1,9 +1,15 @@

 (in-package :fwoar.cl-git)

-(defclass+ blob ()

+(defclass+ blob (git-object)

   ((%data :reader data :initarg :data)))

-(defgeneric -extract-object-of-type (type s repository &key &allow-other-keys)

+(defgeneric -extract-object-of-type (type s repository &key  &allow-other-keys)

+  (:method :around (type s repository &key hash)

+    (let ((result (call-next-method)))

+      (prog1 result

+        (when (typep result 'git-object)

+          (setf (hash result) hash)))))

+

   (:method ((type (eql :blob)) s repository &key)

     (blob s))

@@ -27,10 +27,16 @@

                          :file object-file))

         (packed-ref repo id))))

+(defvar *ref-intern-table*

+  (make-hash-table :test 'equal #+sbcl :weakness #+sbcl :key-and-value))

+

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

   (typecase thing

     (git-ref thing)

-    (t (ref repo thing))))

+    (t (alexandria:when-let ((maybe-result (ref repo thing)))

+         (alexandria:ensure-gethash (component :hash maybe-result)

+                                    *ref-intern-table*

+                                    maybe-result)))))

 (defun ensure-repository (thing)

   (repository thing))

@@ -6,11 +6,10 @@

 (defun git-tree (entries)

   (fw.lu:new 'git-tree entries))

-(defclass tree-entry ()

+(defclass tree-entry (git-object)

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

    (%mode :initarg :mode :reader te-mode)

-   (%name :initarg :name :reader te-name)

-   (%hash :initarg :hash :reader te-hash)))

+   (%name :initarg :name :reader te-name)))

 (defun tree-entry (repo name mode hash)

   (fw.lu:new 'tree-entry repo name mode hash))

@@ -65,8 +64,6 @@

   (te-name object))

 (defmethod component ((component (eql :mode)) (object tree-entry))

   (te-mode object))

-(defmethod component ((component (eql :hash)) (object tree-entry))

-  (te-hash object))

 (defmethod component ((component (eql :ref)) (object tree-entry))

   (ref (repository object)

        (te-hash object)))