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

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

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

-(defclass delta (git-object)

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

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

    (%base :initarg :base :reader base)

    (%commands :initarg :commands :reader commands)

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

   (:documentation

    "The base type for deltified git objects"))

-(defclass+ ofs-delta (delta)

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

   ())

-(defclass+ ref-delta (delta)

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

   ()

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

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

 (defun obj-to-type (obj)

   (etypecase obj

-    (git-commit :commit)

-    (git-tree :tree)

-    (blob :blob)))

+    (fwoar.cl-git:git-commit :commit)

+    (fwoar.cl-git:git-tree :tree)

+    (fwoar.cl-git:blob :blob)))

 (defun trace-bases (pack delta)

   (assert (typep delta 'delta))

@@ -51,7 +51,7 @@

          (o (fwoar.cl-git.pack::extract-object-at-pos

              pack

              offset

-             (make-instance 'git-ref

+             (make-instance 'fwoar.cl-git:git-ref

                             :hash "00000000"

                             :repo nil)))

          (obj (serapeum:assocdr :object-data o))

@@ -74,18 +74,19 @@

                                                  maybe-delta)

              (-extract-object-of-type type

                                       raw-data

-                                      (ref-repo ref)

-                                      :hash (ref-hash ref))))

+                                      (fwoar.cl-git::ref-repo ref)

+                                      :hash (fwoar.cl-git::ref-hash ref))))

     (t maybe-delta)))

 (defun get-bases (pack delta)

   (if (typep delta 'delta)

       (let* ((offset (second (base delta)))

-             (o (extract-object-at-pos pack

-                                       offset

-                                       (make-instance 'git-ref

-                                                      :hash "00000000"

-                                                      :repo nil)))

+             (o (fwoar.cl-git.pack:extract-object-at-pos

+                 pack

+                 offset

+                 (make-instance 'fwoar.cl-git:git-ref

+                                :hash "00000000"

+                                :repo nil)))

              (obj (serapeum:assocdr :object-data o)))

         (cons delta (get-bases pack obj)))

       (list delta)))

@@ -182,7 +182,7 @@

          (size (fwoar.cl-git::get-object-size metadata))

          (delta-base (case type

                        (:ref-delta (error ":ref-delta not implemented yet"))

-                       (:ofs-delta (fwoar.cl-git::get-ofs-delta-offset-streaming s))))

+                       (:ofs-delta (fwoar.cl-git.delta::get-ofs-delta-offset-streaming s))))

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

          (object-data (fwoar.cl-git::extract-object-of-type type decompressed repository pos (pathname s) ref delta-base)))

     (list (cons :type (fwoar.cl-git::object-type->sym type))

@@ -208,5 +208,5 @@

                                              object))))

     (if *want-delta*

         maybe-delta

-        (fwoar.cl-git::resolve-delta object

-                                     maybe-delta))))

+        (fwoar.cl-git.delta:resolve-delta object

+                                          maybe-delta))))

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

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

   (:export #:git-commit #:metadata #:data))

+(defpackage :fwoar.cl-git.delta

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

+  (:export #:delta #:repository #:base #:commands #:src-size

+           #:delta-size #:resolve-delta))

+

 (defpackage :fwoar.cl-git.pack

   (:use :cl)

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

+           #:loose-ref

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

 (defpackage :fwoar.cl-git

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

@@ -24,7 +30,9 @@

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

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

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

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

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

+           #:git-tree

+           #:blob))

 (defpackage :fwoar.cl-git.types

   (:use :cl )

@@ -201,7 +201,7 @@

     (loop for (ref . base-offset) in expectations

           do (5am:is (equal base-offset

                             (second

-                             (fwoar.cl-git::base

+                             (fwoar.cl-git.delta:base

                               (fwoar.cl-git:extract-object

                                (fwoar.cl-git.pack:packed-ref *fake-repo-2* ref)))))))

     ))