@@ -35,7 +35,7 @@

     #+END_SRC

     #+RESULTS:

-    : #<LOOSE-REF 9d3dfa0 of ~/git_repos/cl-git/>

+    : #<LOOSE-REF 3df0b6f of ~/git_repos/cl-git/>

 *** Show the commit message

@@ -47,7 +47,7 @@

     #+END_SRC

     #+RESULTS:

-    : feat: start moving to ref objects instead of strings

+    : Merge commit 'e24e23183435b58a7d6176d848ee0f6c6b3e815a'

 *** Show the messages of the commit's parent

@@ -58,7 +58,8 @@

     #+END_SRC

     #+RESULTS:

-    : (#<PACKED-REF 2af7b67 of ~/git_repos/cl-git/>)

+    : (#<LOOSE-REF f4040ce of ~/git_repos/cl-git/>

+    :  #<LOOSE-REF e24e231 of ~/git_repos/cl-git/>)

 *** Show the files in a commit

@@ -77,7 +78,7 @@

     | .gitignore      | 100644 | 8a9fe9f77149f74fed5c05388be8e5ffd4a31678 |

     | .projectile     | 100644 | e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 |

     | LICENSE         | 100644 | 0306819e780fa57dc3bf6b99a0a059670b605ae0 |

-    | README.org      | 100644 | 62af1bf37cb1d91a426251ee5b09029833efe18c |

+    | README.org      | 100644 | 2703b3dae5a5f8bee662bcc88820b348b41a9ca5 |

     | branch.lisp     | 100644 | e06b66967fa4fa005ccf00dcbc7d839b22259593 |

     | cl-git.asd      | 100644 | 265a98fb79595e0067e53d8cf222dec4283f8525 |

     | commit.lisp     | 100644 | 197e10755343900cfbcb7fc6d863d4b3231e74d4 |

@@ -85,11 +86,11 @@

     | extract.lisp    | 100644 | 4707eca4ee0c70520ccdc57c0e831187b21271e7 |

     | git.lisp        | 100644 | c516dfc248544509c3ae58e3a8c2ab81c225aa9c |

     | graph.lisp      | 100644 | 31576396aff0fff28f69e0ef84571c0dc8cc43ec |

-    | model.lisp      | 100644 | a339f9dfc57b461e09d94c176fe90d90c13daf42 |

+    | model.lisp      | 100644 | 508861152a0ad7ebfafedd12cee7f4c0a170785c |

     | package.lisp    | 100644 | a9d12e807ab4cdf923de2b0479507910054da0d4 |

-    | porcelain.lisp  | 100644 | 7247e63da9cd823e5ee1e480c2863d87679ec0a3 |

+    | porcelain.lisp  | 100644 | d2bf143d76f597409fa729ea6095e89fe2fb9d79 |

     | protocol.lisp   | 100644 | 7e24a6a7a4349497fce06830fa132e9a8ef6fd06 |

-    | repository.lisp | 100644 | 9567a5825bf65b7e90d6f9a02574a00b53af9171 |

+    | repository.lisp | 100644 | d9fd84a83d400f416097571ae378302e4cce289b |

     | tree.lisp       | 100644 | b757bb704b4c7a54622b7bd197ad5c1ea51ef2cc |

     | undelta.lisp    | 100644 | ae0a070133d1a14d6e940a0f790f40b37e885b22 |

     | util.lisp       | 100644 | 66279b2fa08c9d0872e888b85fe14d9950e27326 |

@@ -41,9 +41,11 @@

 (defgeneric repository (root)

   (:method ((root string))

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

+    (let ((root (parse-namestring root)))

+      (repository root)))

   (:method ((root pathname))

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

+    (let ((root (truename root)))

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

 (defun get-local-branches (root)

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

@@ -2,7 +2,8 @@

 (defpackage :fwoar.cl-git

   (:use :cl )

-  (:export ))

+  (:export

+   #:ensure-ref))

 (defpackage :cl-git-user

   (:use :cl :fwoar.cl-git))

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

 (defun git:in-repository (root)

   (setf *git-repository*

-        (truename root)))

+        (ensure-repository

+         (truename root))))

 (defmacro git:with-repository ((root) &body body)

-  `(let ((*git-repository* (truename ,root)))

+  `(let ((*git-repository* (ensure-repository ,root)))

      ,@body))

 (defun git:show-repository ()

@@ -120,8 +121,8 @@

 (defun git:branch (&optional (branch :master))

   #+lispworks

   (declare (notinline serapeum:assocadr))

-  (let ((branches (branches (repository *git-repository*))))

-    (ref (repository *git-repository*)

+  (let ((branches (branches *git-repository*)))

+    (ref *git-repository*

          (serapeum:assocadr (etypecase branch

                               (string branch)

                               (keyword (string-downcase branch)))

@@ -129,7 +130,7 @@

                             :test 'equal))))

 (defun git:branches ()

-  (branches (repository *git-repository*)))

+  (branches *git-repository*))

 (defun git::parents (commit)

   (alexandria:mappend (data-lens:<>1 (data-lens:over 'ensure-ref)

@@ -21,3 +21,14 @@

                            :repo repo-root

                            :offset offset

                            :pack pack))))))

+

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

+  (typecase thing

+    (git-ref thing)

+    (t (ref repo thing))))

+

+(defun ensure-repository (thing)

+  (etypecase thing

+    (repository thing)

+    (string (repository thing))

+    (pathname (repository thing))))

@@ -7,12 +7,13 @@

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

 (defclass tree-entry ()

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

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

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

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

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

-(defun tree-entry (name mode hash)

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

+(defun tree-entry (repo name mode hash)

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

 (defmethod print-object ((o tree-entry) s)

   (if *print-readably*

@@ -29,29 +30,30 @@

 (defun parse-tree-entry (data)

   (values-list (partition 0 data :with-offset 20)))

-(defun format-tree-entry (entry)

+(defun format-tree-entry (repo entry)

   (destructuring-bind (info sha) (partition 0 entry)

-    (destructuring-bind (mode name) (partition #\space

-                                               (babel:octets-to-string info :encoding *git-encoding*))

-      (tree-entry name mode (elt (->sha-string sha) 0)))))

+    (destructuring-bind (mode name)

+        (partition #\space

+                   (babel:octets-to-string info :encoding *git-encoding*))

+      (tree-entry repo name mode (elt (->sha-string sha) 0)))))

-(defun tree-entries (data &optional accum)

+(defun tree-entries (repo data &optional accum)

   (if (<= (length data) 0)

       (nreverse accum)

       (multiple-value-bind (next rest) (parse-tree-entry data)

         (tree-entries rest

-                      (list* (format-tree-entry next)

+                      (list* (format-tree-entry repo next)

                              accum)))))

 (defmethod -extract-object-of-type ((type (eql :tree)) s repository &key)

-  (git-tree (tree-entries s)))

+  (git-tree (tree-entries repository s)))

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

   (entries object))

 (defmethod component ((component string) (object git-tree))

-  (remove component (entries object)

-          :test-not #'equal

-          :key 'te-name))

+  (car (remove component (entries object)

+               :test-not #'equal

+               :key 'te-name)))

 (defmethod component ((component pathname) (object git-tree))

   (remove-if-not (lambda (it)

                    (pathname-match-p it component))

@@ -64,3 +66,6 @@

   (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)))