@@ -9,10 +9,10 @@

   (:documentation

    "The base type for deltified git objects"))

-(fwoar.cl-git::defclass+ ofs-delta (delta)

+(fwoar.cl-git.utils:defclass+ ofs-delta (delta)

   ())

-(fwoar.cl-git::defclass+ ref-delta (delta)

+(fwoar.cl-git.utils:defclass+ ref-delta (delta)

   ()

   (:documentation "TODO: mostly unimplemented/untested"))

@@ -125,7 +125,7 @@

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

   (hash object))

-(fw.lu:defclass+ blob (fwoar.cl-git::git-object)

+(fwoar.cl-git.utils:defclass+ blob (fwoar.cl-git::git-object)

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

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

   (blob s))

@@ -21,25 +21,20 @@

   (:export #:pack #:pack-file #:index-file #:idx-toc

            #:with-pack-streams #:seek-to-object-in-pack #:packed-ref

            #:packed-ref-pack #:packed-ref-offset #:extract-object #:git-ref

-           #:loose-ref

-           #:extract-object-at-pos))

+           #:loose-ref #:extract-object-at-pos #:raw-object-for-ref))

 (defpackage :fwoar.cl-git.ref

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

-  (:export #:git-ref #:loose-ref

-           #:ref-repo

-           #:ref-hash

-           #:loose-ref-file))

+  (:export #:git-ref #:loose-ref #:ref-repo #:ref-hash #:loose-ref-file))

 (defpackage :fwoar.cl-git

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

   (:import-from :fwoar.cl-git.commit #:git-commit)

   (:import-from :fwoar.cl-git.pack #:packed-ref)

   (:import-from :fwoar.cl-git.ref #:git-ref #:loose-ref #:ref-hash #:ref-repo)

-  (:export #:ensure-ref #:repository #:*want-delta* #:git-object

-           #:hash #:*git-encoding* #:git-commit #:ref #:component

-           #:*git-repository* #:git-ref #:extract-object #:git-tree

-           #:blob))

+  (:export #:ensure-ref #:repository #:*want-delta* #:git-object #:hash

+           #:*git-encoding* #:git-commit #:ref #:component #:*git-repository*

+           #:git-ref #:extract-object #:git-tree #:blob))

 (defpackage :fwoar.cl-git.types

   (:use :cl )

@@ -272,7 +272,7 @@

                 "cab7cafae3b61c5b101ee914cd4f5c8357e77fad"

                 "f03a8d1b4cea085ee9555037d09bca2dbfb990cb")))

     (loop for commit in shas

-          for obj = (fwoar.cl-git.pack::raw-object-for-ref

+          for obj = (fwoar.cl-git.pack:raw-object-for-ref

                      (fwoar.cl-git:ref :fwoar.cl-git.git-objects.pack-2 commit))

           do (5am:is (equal (crypto:byte-array-to-hex-string

                              (crypto:digest-sequence :sha1 obj))

@@ -96,5 +96,6 @@

 (defpackage :fwoar.cl-git.utils

   (:use :cl)

-  (:import-from :fwoar.cl-git #:partition-subseq #:sym->plist #:read-bytes)

-  (:export #:partition-subseq #:sym->plist #:read-bytes))

+  (:import-from :fwoar.cl-git #:partition-subseq #:sym->plist #:read-bytes

+                #:defclass+)

+  (:export #:partition-subseq #:sym->plist #:read-bytes #:defclass+))