From f9587f1e1608593d5c4806db7df40879ae7b7d4b Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Tue, 18 Aug 2020 17:40:36 +0100
Subject: [PATCH] #22: H'mmm, clj-git API has changed considerably.

This isn't working, but does compile. More work needed.
---
 src/smeagol/history.clj     |  4 ++--
 src/smeagol/routes/wiki.clj |  2 +-
 src/smeagol/util.clj        | 10 ++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/smeagol/history.clj b/src/smeagol/history.clj
index 42eaa49..3e38e3c 100644
--- a/src/smeagol/history.clj
+++ b/src/smeagol/history.clj
@@ -61,9 +61,9 @@
     (git/load-repo git-directory-path)
     (catch java.io.FileNotFoundException fnf
       (log/info "Initialising Git repository at" git-directory-path)
-      (git/git-init git-directory-path)
+      (git/git-init :dir git-directory-path)
       (let [repo (git/load-repo git-directory-path)]
-        (git/git-add-and-commit repo "Initial commit")
+        (git/git-commit repo "Initial commit")
         repo))))
 
 
diff --git a/src/smeagol/routes/wiki.clj b/src/smeagol/routes/wiki.clj
index e5ae10a..876fe87 100644
--- a/src/smeagol/routes/wiki.clj
+++ b/src/smeagol/routes/wiki.clj
@@ -75,7 +75,7 @@
     (log/info (format "Saving %s's changes ('%s') to %s in file '%s'" user summary page file-path))
     (spit file-path source-text)
     (git/git-add git-repo file-name)
-    (git/git-commit git-repo summary {:name user :email email})
+    (git/git-commit git-repo summary :name user :email email)
     (response/redirect
       (str
         "/wiki?page="
diff --git a/src/smeagol/util.clj b/src/smeagol/util.clj
index ec37e06..1587f5b 100644
--- a/src/smeagol/util.clj
+++ b/src/smeagol/util.clj
@@ -79,15 +79,15 @@
                (cjio/file local-url-base file-path))]
     (cond
       (cs/includes? file-path "..")
-      (cs/join " " file-path
-               "Attempts to ascend the file hierarchy are disallowed.")
+      (cs/join " " [file-path
+                    "Attempts to ascend the file hierarchy are disallowed."])
       (not (cs/starts-with? path local-url-base))
       (cs/join " " [path "is not servable"])
       (not (fs/exists? path))
       (cs/join " " [path "does not exist"])
       (not (fs/readable? path))
       (cs/join " " [path "is not readable"])))
-    (catch Exception any (cs/join " " file-path "is not servable because" (.getMessage any)))))
+    (catch Exception any (cs/join " " [file-path "is not servable because" (.getMessage any)]))))
 
 
 ;; (not-servable-reason "/home/simon/workspace/smeagol/resources/public/content/vendor/node_modules/photoswipe/dist/photoswipe.min.js")
@@ -157,8 +157,10 @@
 
 
 (defn get-servlet-context-path
+  "Return the servlet context path, if we're running as a servlet; if
+   not, return `nil`."
   [request]
-  (if-let [context (:servlet-context request)]
+  (when-let [context (:servlet-context request)]
     ;; If we're not inside a serlvet environment (for
     ;; example when using mock requests), then
     ;; .getContextPath might not exist