git-fastclone 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a85f561194735fe055a64ba237dce16864164353
-  data.tar.gz: 65e1d6e97ccca28959f2cef272731906d2e0025d
+  metadata.gz: 153c297d291e6ad8edcb66333438e70a4babfcfe
+  data.tar.gz: a3df048e6e1ab5e900e341513cb20248d996896d
 SHA512:
-  metadata.gz: 1f8df5fcfdad9d2b81106ea838ee36db56685b7e6bddd5964760711805151be514cbfa1129f4efe21f2ea2fe2edd1eec6bc681b9ea36bbff4c1ae25226ccee6e
-  data.tar.gz: b16efd9892062ea5ca88daac81d92b46f97689a951b31354c92f39fde6db35f0fd675df58ed9b92967089256458b415cfb8d17f295eb181ff21a6b5428145446
+  metadata.gz: 1f31a2cdd9cb886b3af613a639dc5992eb5653c69b116e506e701053a037a0e25223cee0a6d7241220d9138c71b4351db54afc91215b5dce3ad3a9f364bb1acf
+  data.tar.gz: bf0c7a716e84db621438ee3b5ef58df7f46349a92c7a1d875d8aa3b32b5f0e2239c63220d3df8bed84b8ba03d7c2b26c2882496effc71006315be0e5ae8673aa

data/lib/git-fastclone.rb

@@ -26,26 +26,26 @@ class GitFastClone
     # One option --branch=<branch>  We're not as brittle as clone. That branch can be a sha or tag and we're still okay.
     @options = {}
     OptionParser.new do |opts|
+      opts.banner = "Usage: git fastclone [options] <git-url> [path]"
       @options[:branch] = nil
       opts.on("-b", "--branch BRANCH", "Checkout this branch rather than the default") do |branch|
         @options[:branch] = branch
       end
-      # TODO: Add help text.
     end.parse!
 
-    puts ARGV
-
     # Remaining two positional args are url and optional path
     url = ARGV[0]
     path = ARGV[1] || path_from_git_url(url)
 
+    puts "Cloning #{url} to #{path}"
+
     # Do a checkout with reference repositories for main and submodules
-    clone(url, @options[:branch], File.join(Dir.pwd, path))
+    clone(url, @options[:branch], path)
   end
 
   def path_from_git_url(url)
     # Get the checkout path from tail-end of the url.
-    File.join(Dir.pwd, url.match(/([^\/]*)\.git$/)[1])
+    url.match(/([^\/]*)\.git$/)[1]
   end
 
   # Checkout to SOURCE_DIR. Update all submodules recursively. Use reference repos everywhere for speed.
@@ -53,12 +53,12 @@ class GitFastClone
     initial_time = Time.now()
 
     with_git_mirror(url) do |mirror|
-      fail_on_error("git", "clone", "--reference", mirror, url, src_dir)
+      fail_on_error("git", "clone", "--quiet", "--reference", mirror, url, src_dir)
     end
 
     # Only checkout if we're changing branches to a non-default branch
     unless rev.nil? then
-      fail_on_error("git", "checkout", rev, :chdir=>src_dir)
+      fail_on_error("git", "checkout", "--quiet", rev, :chdir=>src_dir)
     end
 
     update_submodules(src_dir, url)
@@ -82,7 +82,7 @@ class GitFastClone
       # Parse its output directly to save time.
       fail_on_error("git", "submodule", "init", :chdir=>pwd).split("\n").each do |line|
         # Submodule path (not name) is in between single quotes '' at the end of the line
-        submodule_path = File.join(pwd, line.strip.match(/'([^']*)'$/)[1])
+        submodule_path = line.strip.match(/'([^']*)'$/)[1]
         # URL is in between parentheses ()
         submodule_url = line.strip.match(/\(([^)]*)\)/)[1]
         submodule_url_list << submodule_url
@@ -90,10 +90,10 @@ class GitFastClone
         # Each update happens on a separate thread for speed.
         threads << Thread.new do
           with_git_mirror(submodule_url) do |mirror|
-            fail_on_error("git", "submodule", "update", "--reference", mirror, submodule_path, :chdir=>pwd)
+            fail_on_error("git", "submodule", "update", "--quiet", "--reference", mirror, submodule_path, :chdir=>pwd)
           end
           # Recurse into the submodule directory
-          update_submodules(submodule_path, submodule_url)
+          update_submodules(File.join(pwd,submodule_path), submodule_url)
         end
       end
       update_submodule_reference(url, submodule_url_list)
@@ -174,7 +174,11 @@ class GitFastClone
   def with_git_mirror(url)
     update_reference_repo(url)
 
-    # May want to lock the reference repo for this, but don't need to for how we use this.
-    yield reference_repo_dir(url)
+    # Sometimes remote updates involve re-packing objects on a different thread
+    # We grab the reference repo lock here just to make sure whatever thread
+    # ended up doing the update is done with its housekeeping.
+    with_reference_repo_lock(url) do
+      yield reference_repo_dir(url)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-fastclone
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Michael Tauraso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies: []
 description: A git command that uses reference repositories and threading to quickly
   and recursively clone repositories with many nested submodules