@@ -29,11 +29,11 @@

           (get-local-packed-branches root)))

 (defgeneric branches (repository)

-  (:method ((repository repository))

+  (:method ((repository git-repository))

     (get-local-branches (root repository))))

 (defgeneric branch (repository name)

-  (:method ((repository repository) name)

+  (:method ((repository git-repository) name)

     (second

      (find name (get-local-branches (root repository))

            :test 'equal

@@ -34,3 +34,14 @@

                ;; stable programmer interface

                (:file "porcelain" :depends-on ("package" "git" "commit"))))

+(defsystem :cl-git/tests

+  :description ""

+  :author "Ed L <edward@elangley.org>"

+  :license "MIT"

+  :depends-on (#:alexandria

+               #:uiop

+               #:serapeum

+               #:fiveam

+               #:cl-git)

+  :serial t

+  :components ())

@@ -3,7 +3,8 @@

 (defpackage :fwoar.cl-git

   (:use :cl )

   (:export

-   #:ensure-ref))

+   #:ensure-ref

+   #:repository))

 (defpackage :cl-git-user

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

@@ -13,4 +14,4 @@

   (:export #:show #:branch #:branches #:commit-parents #:in-repository

            #:with-repository #:current-repository #:show-repository #:git

            #:tree #:contents #:component

-           #:rev-list))

+           #:rev-list #:repository))

@@ -13,6 +13,9 @@

         (ensure-repository

          (truename root))))

+(defun git:repository ()

+  *git-repository*)

+

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

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

      ,@body))

@@ -29,7 +29,4 @@

     (t (ref repo thing))))

 (defun ensure-repository (thing)

-  (etypecase thing

-    (repository thing)

-    (string (repository thing))

-    (pathname (repository thing))))

+  (repository thing))

new file mode 100644

@@ -0,0 +1,36 @@

+(defpackage :fwoar.cl-git.branch-resolution

+  (:use :cl )

+  (:export ))

+(in-package :fwoar.cl-git.branch-resolution)

+

+(defclass fake-repository (fwoar.cl-git::repository)

+  ())

+(defclass fake-ref ()

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

+   (%id :initarg :id :reader id)))

+

+(defparameter *expected-branches*

+  '(("master" "ref1")

+    ("other" "ref2")))

+

+(defmethod fwoar.cl-git::repository ((object symbol))

+  (fwoar.cl-git::resolve-repository object))

+(defmethod fwoar.cl-git::resolve-repository fwoar.cl-git::alts :branch-resolution

+    ((o (eql :branch-resolution)))

+  (make-instance 'fake-repository :root "the-root"))

+(defmethod fwoar.cl-git::branches ((repository fake-repository))

+  *expected-branches*)

+(defmethod fwoar.cl-git::ref ((repository fake-repository) id)

+  (fw.lu:new 'fake-ref repository id))

+

+(fiveam:def-suite :fwoar.cl-git.branch-resolution

+  :description "testing branch resolution")

+(fiveam:in-suite :fwoar.cl-git.branch-resolution)

+

+(fiveam:def-test simple ()

+  (5am:is (typep (git:with-repository (:branch-resolution)

+                   (git:repository))

+                 'fake-repository))

+  (5am:is (equal (git:with-repository (:branch-resolution)

+                   (git:git (branches)))

+                 *expected-branches*)))