merge master

Author: puredanger

CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 ===========
 
+* 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
+  * Config read from most to least preferred: Java system property / env var / default:
+    * gitlibs dir: `clojure.gitlibs.dir` / `GITLIBS` / `nil`
+    * git command: `clojure.gitlibs.command` / `GITLIBS_COMMAND` / `"git"`
+  * Fix reflection error
+* 2.0.109 on Mar 3, 2021
+  * TDEPS-91 Replace jgit implementation by shelling out to git
 * 1.0.100 on Aug 20, 2020
   * Fetch all tags on procure
 * 1.0.96 on Aug 7, 2020

README.md

@@ -27,7 +27,7 @@ The following git url types are supported:
 
 ### SSH authentication for private repositories
 
-ssh authentication works by connecting to the local ssh agent (ssh-agent on *nix or Pageant via PuTTY on Windows).
+ssh authentication works by connecting to the local ssh agent (ssh-agent on \*nix or Pageant via PuTTY on Windows).
 The ssh-agent must have a registered identity for the key being used to access the Git repository.
 To check whether you have registered identities, use:
 
@@ -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: 1.0.100
+Latest release: 2.0.119
 
 * [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 "1.0.100"}`
+* Coordinates: `org.clojure/tools.gitlibs {:mvn/version "2.0.119"}`
 
 # Developer Information
 
@@ -99,7 +99,7 @@ Latest release: 1.0.100
 
 # Copyright and License
 
-Copyright © 2018-2020 Rich Hickey, Alex Miller, and contributors
+Copyright © 2018-2021 Rich Hickey, Alex Miller, and contributors
 
 All rights reserved. The use and
 distribution terms for this software are covered by the

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.110-SNAPSHOT</version>
+  <version>2.0.120-SNAPSHOT</version>
   <name>tools.gitlibs</name>
 
   <parent>

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

@@ -111,5 +111,10 @@
     @(future (procure "https://github.com/clojure/tools.gitlibs.git" 'org.clojure/tools.gitlibs "11fc77496f013871c8af3514bbba03de0af28061"))
     @(future (procure "https://github.com/clojure/tools.gitlibs.git" 'org.clojure/tools.gitlibs "11fc77496f013871c8af3514bbba03de0af28061")))
 
+  (println
+    @(future (procure "https://github.com/cognitect-labs/test-runner.git" 'cognitect-labs/test-runner "b6b3193fcc42659d7e46ecd1884a228993441182"))
+    @(future (procure "https://github.com/cognitect-labs/test-runner.git" 'cognitect-labs/test-runner "cb96e80f6f3d3b307c59cbeb49bb0dcb3a2a780b"))
+    @(future (procure "https://github.com/cognitect-labs/test-runner.git" 'cognitect-labs/test-runner "9e1098965f2089c8cf492d23c0b7520f8690440a")))
+
   (tags "https://github.com/clojure/tools.gitlibs.git" {:print-commands true})
-  )
+  )

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

@@ -12,9 +12,7 @@
     [clojure.java.io :as jio]
     [clojure.string :as str])
   (:import
-    [java.io File FilenameFilter IOException]
-    [java.nio.file Files CopyOption StandardCopyOption AtomicMoveNotSupportedException]
-    [java.nio.file.attribute FileAttribute]))
+    [java.io File FilenameFilter IOException]))
 
 (set! *warn-on-reflection* true)
 
@@ -65,7 +63,7 @@
   @CACHE)
 
 (def ^:private COMMAND_CACHE
-  (delay (read-config "clojure.gitlibs.command" "GITLIBS_CMD" "git")))
+  (delay (read-config "clojure.gitlibs.command" "GITLIBS_COMMAND" "git")))
 
 (defn git-command
   "Path to git command to run"
@@ -89,14 +87,12 @@
   ^File [url]
   (jio/file (cache-dir) "_repos" (clean-url url)))
 
-;; git clone --bare --quiet URL PATH
-;; git --git-dir <> fetch
-;; git --git-dir <> --work-tree <dst> checkout <rev>
-
 (defn git-fetch
   [^File git-dir opts]
   (let [git-path (.getCanonicalPath git-dir)
-        {:keys [exit err] :as ret} (runproc opts (git-command) "--git-dir" git-path "fetch" "--tags")]
+        {:keys [exit err] :as ret} (runproc opts (git-command)
+                                     "--git-dir" git-path
+                                     "fetch" "--quiet" "--tags")]
     (when-not (zero? exit)
       (throw (ex-info (format "Unable to fetch %s%n%s" git-path err) ret)))))
 
@@ -105,7 +101,8 @@
   [url ^File git-dir opts]
   (printerrln "Cloning:" url)
   (let [git-path (.getCanonicalPath git-dir)
-        {:keys [exit err] :as ret} (runproc opts (git-command) "clone" "--bare" url git-path)]
+        {:keys [exit err] :as ret} (runproc opts (git-command)
+                                     "clone" "--quiet" "--bare" url git-path)]
     (when-not (zero? exit)
       (throw (ex-info (format "Unable to clone %s%n%s" git-path err) ret)))
     git-dir))
@@ -119,55 +116,20 @@
       (git-clone-bare url git-dir-file opts))
     (.getCanonicalPath git-dir-file)))
 
-(defonce ^:private no-file-attrs
-  (into-array FileAttribute []))
-
-(defonce ^:private no-copy-opts
-  (into-array CopyOption []))
-
-(defonce ^:private atomic-move-opts
-  (into-array CopyOption [StandardCopyOption/ATOMIC_MOVE]))
-
-(defn- delete-recursive
-  [^File file]
-  (when (.isDirectory file)
-    (run! delete-recursive (.listFiles file)))
-  (.delete file))
-
-(defn- write-with-temp
-  [^File parent-dir target write-fn]
-  (let [target-dir (jio/file parent-dir target)]
-    (when-not (.exists target-dir)
-      (when-not (.exists parent-dir)
-        (.mkdirs parent-dir))
-      (let [parent-path (.toPath parent-dir)
-            temp-path (Files/createTempDirectory parent-path (str target "-") no-file-attrs)]
-        (write-fn (.toString temp-path))
-        (let [target-path (.toPath target-dir)]
-          (try
-            (try
-              (Files/move temp-path target-path atomic-move-opts)
-              (catch AtomicMoveNotSupportedException _
-                (Files/move temp-path target-path no-copy-opts)))
-            (catch IOException _
-              (try
-                (delete-recursive (.toFile temp-path))
-                (catch Throwable t)))))))))
-
 (defn git-checkout
   [git-dir-path ^File lib-dir ^String rev opts]
   (let [rev-file (jio/file lib-dir rev)]
     (when-not (.exists rev-file)
-      (write-with-temp lib-dir rev
-        #(runproc opts
-           (git-command)
-           "--git-dir" git-dir-path
-           "--work-tree" %
-           "checkout" rev)))))
+      (runproc opts (git-command)
+        "--git-dir" git-dir-path
+        "worktree" "add" "--force" "--detach" "--quiet"
+        (.getCanonicalPath rev-file) rev))))
 
 (defn git-rev-parse
   [git-dir rev opts]
-  (let [{:keys [exit out]} (runproc opts (git-command) "--git-dir" git-dir "rev-parse" rev)]
+  (let [{:keys [exit out]} (runproc opts (git-command)
+                             "--git-dir" git-dir
+                             "rev-parse" rev)]
     (when (zero? exit)
       (str/trimr out))))
 

src/test/clojure/clojure/tools/test_gitlibs.clj

@@ -20,9 +20,11 @@
         "739c1af56dae621aedf1bb282025a0d676eff713")))
 
 (deftest test-procure
-  (let [wt (gl/procure repo-url 'org.clojure/spec.alpha "739c1af")]
-    (is (= wt (.getAbsolutePath (jio/file (glim/cache-dir) "libs" "org.clojure" "spec.alpha" "739c1af56dae621aedf1bb282025a0d676eff713"))))
-    (is (.exists (jio/file (glim/cache-dir) "_repos" "github.com" "clojure" "spec.alpha")))))
+  (let [wt1 (gl/procure repo-url 'org.clojure/spec.alpha "739c1af")
+        wt2 (gl/procure repo-url 'org.clojure/spec.alpha "6a56327")]
+    (is (.exists (jio/file (glim/cache-dir) "_repos" "github.com" "clojure" "spec.alpha")))
+    (is (= wt1 (.getAbsolutePath (jio/file (glim/cache-dir) "libs" "org.clojure" "spec.alpha" "739c1af56dae621aedf1bb282025a0d676eff713"))))
+    (is (= wt2 (.getAbsolutePath (jio/file (glim/cache-dir) "libs" "org.clojure" "spec.alpha" "6a56327446c909db0d11ecf93a3c3d659b739be9"))))))
 
 (deftest test-descendant-fixed
   (is (= (gl/descendant repo-url ["607aef0" "739c1af"])