Merge branch 'master' into add-tags

Author: puredanger

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 ===========
 
+* 2.1.129 on Mar 10, 2021
+  * Change git options during checkout to work with more git versions
+  * Check exit code on checkout and throw if failed
+  * Overhaul config and debug settings
+  * Change min Clojure dep to 1.9
 * 2.0.119 on Mar 10, 2021
   * Fix issues with checkouts of multiple commits per repo
   * resolve now only fetches if it can't resolve a ref

README.md

@@ -83,10 +83,10 @@ The cache location can also be set with the environment variable GITLIBS.
 
 This project follows the version scheme MAJOR.MINOR.COMMITS where MAJOR and MINOR provide some relative indication of the size of the change, but do not follow semantic versioning. In general, all changes endeavor to be non-breaking (by moving to new names rather than by breaking existing names). COMMITS is an ever-increasing counter of commits since the beginning of this repository.
 
-Latest release: 2.0.119
+Latest release: 2.1.129
 
 * [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22tools.gitlibs%22)
-* Coordinates: `org.clojure/tools.gitlibs {:mvn/version "2.0.119"}`
+* Coordinates: `org.clojure/tools.gitlibs {:mvn/version "2.1.129"}`
 
 # Developer Information
 

VERSION_TEMPLATE

@@ -1 +1 @@
-2.0.GENERATED_VERSION
+2.1.GENERATED_VERSION

deps.edn

@@ -1,2 +1,2 @@
 {:paths ["src/main/clojure"]
- :deps {org.clojure/clojure {:mvn/version "1.8.0"}}}
+ :deps {org.clojure/clojure {:mvn/version "1.9.0"}}}

pom.xml

@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tools.gitlibs</artifactId>
-  <version>2.0.120-SNAPSHOT</version>
+  <version>2.1.130-SNAPSHOT</version>
   <name>tools.gitlibs</name>
 
   <parent>
@@ -19,7 +19,7 @@
 
   <properties>
     <clojure.warnOnReflection>true</clojure.warnOnReflection>
-    <clojure.version>1.8.0</clojure.version>
+    <clojure.version>1.9.0</clojure.version>
   </properties>
 
   <dependencies>

src/main/clojure/clojure/tools/gitlibs.clj

@@ -14,6 +14,7 @@
   (:refer-clojure :exclude [resolve])
   (:require
     [clojure.java.io :as jio]
+    [clojure.tools.gitlibs.config :as config]
     [clojure.tools.gitlibs.impl :as impl]))
 
 (set! *warn-on-reflection* true)
@@ -22,79 +23,55 @@
   "Return the root gitlibs cache directory. By default ~/.gitlibs or
   override by setting the environment variable GITLIBS."
   []
-  (impl/cache-dir))
+  (:gitlibs/dir @config/CONFIG))
 
 ;; Possible new API, internal for now
 (defn- resolve-all
   "Takes a git url and a coll of revs, and returns the full commit shas.
   Each rev may be a partial sha, full sha, or tag name. Returns nil for
-  unresolveable revs.
-
-  Optional opts map may include:
-    :interactive (default false) - set true to allow stdin prompts (example: unknown host)
-    :print-commands (default false) - set true to write git executions to stderr"
-  ([url revs]
-   (resolve-all url revs nil))
-  ([url revs opts]
-   (let [git-dir (impl/ensure-git-dir url opts)]
-     (reduce
-       (fn [rs r]
-         (if-let [res (impl/git-rev-parse git-dir r opts)]
-           (conj rs res)
-           (do ;; could not resolve - fetch and try again
-             (impl/git-fetch (jio/file git-dir) opts)
-             (conj rs (impl/git-rev-parse git-dir r opts)))))
-       [] revs))))
+  unresolveable revs."
+  [url revs]
+  (let [git-dir (impl/ensure-git-dir url)]
+    (reduce
+      (fn [rs r]
+        (if-let [res (impl/git-rev-parse git-dir r)]
+          (conj rs res)
+          (do ;; could not resolve - fetch and try again
+            (impl/git-fetch (jio/file git-dir))
+            (conj rs (impl/git-rev-parse git-dir r)))))
+      [] revs)))
 
 (defn resolve
   "Takes a git url and a rev, and returns the full commit sha or nil if can't
-  resolve. rev may be a partial sha, full sha, or tag name.
-
-  Optional opts map may include:
-    :interactive (default false) - set true to allow stdin prompts (example: unknown host)
-    :print-commands (default false) - set true to write git executions to stderr"
-  ([url rev]
-   (resolve url rev nil))
-  ([url rev opts]
-   (first (resolve-all url [rev] opts))))
+  resolve. rev may be a partial sha, full sha, or tag name."
+  [url rev]
+  (first (resolve-all url [rev])))
 
 (defn procure
   "Procure a working tree at rev for the git url representing the library lib,
   returns the directory path. lib is a qualified symbol where the qualifier is a
-  controlled or conveyed identity, or nil if rev is unknown.
-
-  Optional opts map may include:
-    :interactive (default false) - set true to allow stdin prompts (example: unknown host)
-    :print-commands (default false) - set true to write git commands to stderr"
-  ([url lib rev]
-   (procure url lib rev nil))
-  ([url lib rev opts]
-   (let [lib-dir (impl/lib-dir lib)
-         git-dir-path (impl/ensure-git-dir url opts)
-         sha (or (impl/match-exact lib-dir rev) (impl/match-prefix lib-dir rev) (resolve url rev))]
-     (when sha
-       (let [sha-dir (jio/file lib-dir sha)]
-         (when-not (.exists sha-dir)
-           (impl/printerrln "Checking out:" url "at" rev)
-           (impl/git-checkout git-dir-path lib-dir sha opts))
-         (.getCanonicalPath sha-dir))))))
+  controlled or conveyed identity, or nil if rev is unknown."
+  [url lib rev]
+  (let [lib-dir (impl/lib-dir lib)
+        git-dir-path (impl/ensure-git-dir url)
+        sha (or (impl/match-exact lib-dir rev) (impl/match-prefix lib-dir rev) (resolve url rev))]
+    (when sha
+      (let [sha-dir (jio/file lib-dir sha)]
+        (when-not (.exists sha-dir)
+          (impl/printerrln "Checking out:" url "at" rev)
+          (impl/git-checkout git-dir-path lib-dir sha))
+        (.getCanonicalPath sha-dir)))))
 
 (defn descendant
   "Returns rev in git url which is a descendant of all other revs,
-  or nil if no such relationship can be established.
-
-  Optional opts map may include:
-    :interactive (default false) - set true to allow stdin prompts (example: unknown host)
-    :print-commands (default false) - set true to write git commands to stderr"
-  ([url rev]
-   (descendant url rev nil))
-  ([url revs opts]
-   (when (seq revs)
-     (let [shas (resolve-all url revs opts)]
-       (if (seq (filter nil? shas))
-         nil ;; can't resolve all shas in this repo
-         (let [git-dir (impl/ensure-git-dir url opts)]
-           (->> shas (sort (partial impl/commit-comparator git-dir opts)) first)))))))
+  or nil if no such relationship can be established."
+  [url revs]
+  (when (seq revs)
+    (let [shas (resolve-all url revs)]
+      (if (seq (filter nil? shas))
+        nil ;; can't resolve all shas in this repo
+        (let [git-dir (impl/ensure-git-dir url)]
+          (->> shas (sort (partial impl/commit-comparator git-dir)) first))))))
 
 (defn tags
   "Returns coll of tags in git url"
@@ -104,8 +81,9 @@
    (impl/tags (impl/ensure-git-dir url opts) opts)))
 
 (comment
-  (resolve "[email protected]:clojure/tools.gitlibs.git" "11fc774" {:print-commands true :interactive true})
-  (descendant "https://github.com/clojure/tools.gitlibs.git" ["5e2797a487c" "11fc774" "d82adc29" "815e312310"] {:print-commands true})
+  (System/setProperty "clojure.gitlibs.debug" "true")
+  (resolve "[email protected]:clojure/tools.gitlibs.git" "11fc774")
+  (descendant "https://github.com/clojure/tools.gitlibs.git" ["5e2797a487c" "11fc774" "d82adc29" "815e312310"])
 
   (println
     @(future (procure "https://github.com/clojure/tools.gitlibs.git" 'org.clojure/tools.gitlibs "11fc77496f013871c8af3514bbba03de0af28061"))

src/main/clojure/clojure/tools/gitlibs/config.clj

@@ -0,0 +1,48 @@
+;   Copyright (c) Rich Hickey. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
+(ns clojure.tools.gitlibs.config
+  "Implementation, use at your own risk"
+  (:require
+    [clojure.java.io :as jio]
+    [clojure.string :as str]))
+
+(set! *warn-on-reflection* true)
+
+(defn- read-config-value
+  "Read a config value from each of these in order, taking the first value found:
+   * Java system property
+   * env variable
+   * default value"
+  [property env default]
+  (or
+    (System/getProperty property)
+    (System/getenv env)
+    default))
+
+(defn- init-config
+  []
+  {:gitlibs/dir
+   (.getCanonicalPath
+     (let [lib-dir (or (System/getProperty "clojure.gitlibs.dir") (System/getenv "GITLIBS"))]
+       (if (str/blank? lib-dir)
+         (jio/file (System/getProperty "user.home") ".gitlibs")
+         (jio/file lib-dir))))
+
+   :gitlibs/command
+   (or (System/getProperty "clojure.gitlibs.command") (System/getenv "GITLIBS_COMMAND") "git")
+
+   :gitlibs/debug
+   (Boolean/parseBoolean (or (System/getProperty "clojure.gitlibs.debug") (System/getenv "GITLIBS_DEBUG") "false"))
+
+   :gitlibs/terminal
+   (Boolean/parseBoolean (or (System/getProperty "clojure.gitlibs.terminal") (System/getenv "GITLIBS_TERMINAL") "false"))})
+
+(def CONFIG
+  "Config map - deref to access"
+  (delay (init-config)))