git.fiddlerwoaroof.com
Browse code

rename OBJECT to LOOSE-OBJECT and LOOSE-OBJECT-P

Ed Langley authored on 12/07/2019 08:12:10
Showing 3 changed files
... ...
@@ -116,7 +116,7 @@
116 116
           (read-object-from-pack p (repository pack)))))))
117 117
 
118 118
 (defun extract-loose-object (repo id)
119
-  (with-open-file (s (object repo id)
119
+  (with-open-file (s (loose-object repo id)
120 120
                      :element-type '(unsigned-byte 8))
121 121
     (alexandria:when-let ((result (chipz:decompress nil (chipz:make-dstate 'chipz:zlib)
122 122
                                                     s)))
... ...
@@ -128,7 +128,7 @@
128 128
                                 repo)))))
129 129
 
130 130
 (defun extract-object (repo id)
131
-  (if (object repo id)
131
+  (if (loose-object-p repo id)
132 132
       (extract-loose-object repo id)
133 133
       (data-lens.lenses:view *object-data-lens*
134 134
                              (multiple-value-call 'extract-object-from-pack 
... ...
@@ -16,19 +16,23 @@
16 16
 (defun turn-read-object-to-string (object)
17 17
   (data-lens.lenses:over *object-data-lens* 'babel:octets-to-string object))
18 18
 
19
-(defgeneric object (repository id)
19
+(defgeneric loose-object (repository id)
20 20
   (:method ((repository string) id)
21 21
     (when (probe-file (merge-pathnames ".git" repository))
22
-      (object (repository repository) id)))
22
+      (loose-object (repository repository) id)))
23 23
   (:method ((repository pathname) id)
24 24
     (when (probe-file (merge-pathnames ".git" repository))
25
-      (object (repository repository) id)))
25
+      (loose-object (repository repository) id)))
26 26
   (:method ((repository repository) id)
27 27
     (car
28 28
      (uiop:directory*
29 29
       (merge-pathnames (loose-object-path (serapeum:concat id "*"))
30 30
                        (root repository))))))
31 31
 
32
+(defun loose-object-p (repository id)
33
+  "Is ID an ID of a loose object?"
34
+  (loose-object repository id))
35
+
32 36
 (defun fanout-table (s)
33 37
   (coerce (alexandria:assoc-value
34 38
            (fwoar.bin-parser:extract '((head 4)
... ...
@@ -30,8 +30,8 @@
30 30
                       (nth-value 1 (parse-commit
31 31
                                     (split-object
32 32
                                      (chipz:decompress nil (chipz:make-dstate 'chipz:zlib)
33
-                                                       (object repository
34
-                                                               commit))))))))
33
+                                                       (loose-object repository
34
+                                                                     commit))))))))
35 35
 
36 36
 (defmethod cl-dot:graph-object-node ((graph git-graph) (commit string))
37 37
   (alexandria:ensure-gethash commit