git-multirepo 1.0.0.beta31 → 1.0.0.beta32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67e36cbef8314eee8b0d325162acc18c2ce27e64
-  data.tar.gz: e62d11f579f9fce15bc06ea316aabd2aa8e6bfcc
+  metadata.gz: 82162a9cc290a3d97f8db37ee108a82d0a480e29
+  data.tar.gz: f1b49390a52450c77dbed2125fec8e491351f44b
 SHA512:
-  metadata.gz: ec0d4681372e9d30752a11d4cfd68198de1cb3fd474df1113978e724c739c511ef1d045143250c90aecce54fbdbcf1b41823df3875a8a30e108c69175eda9c6a
-  data.tar.gz: 0b891af101c561781915c64a023df4de187ea61106c127f354d8f0d9d56f698107b4ef8e2684018f0323252860876134600c39ef7d2622dcd69952e4345c7add
+  metadata.gz: 01c17b8cd7dfdb152b8e72da33e0442caa61c6245beb58e345342f6da1921fb250d33ac395d52840a4a6b2d010784e1fa2d791cc1b76d5ceec29680626cbc3be
+  data.tar.gz: 1b1a49c8b247330283daf82ed667e04ec436f85ff69d7926b5e1ac850ac61cee290a2663b5d9e79b83fb4c0b2d4b00ab34a5331384489b938fc13b493d749d11

data/.gitattributes

@@ -1 +1,2 @@
 .multirepo.lock merge=ours
+.multirepo.meta merge=ours

data/.multirepo

@@ -3,14 +3,15 @@
   id: e27695e9-e21d-4ad1-81b8-0ed587574c38
   path: ../git-multirepo-dummy/
   url: git@github.com:fortinmike/git-multirepo-dummy.git
-  branch: master
 - !ruby/object:MultiRepo::ConfigEntry
   id: dcb567d6-7456-494a-b7b5-adc208a87f2f
   path: ../git-multirepo-dummy-dep1/
   url: git@github.com:fortinmike/git-multirepo-dummy-dep1.git
-  branch: master
 - !ruby/object:MultiRepo::ConfigEntry
   id: e0dc3ed7-4b6b-4052-8783-668b405e4941
   path: ../git-multirepo-dummy-dep2/
   url: git@github.com:fortinmike/git-multirepo-dummy-dep2.git
-  branch: master
+- !ruby/object:MultiRepo::ConfigEntry
+  id: ad6472a5-7238-447f-a54e-50f50197e21e
+  path: ../git-multirepo-migrations/
+  url: git@github.com:fortinmike/git-multirepo-migrations.git

data/.multirepo.lock

@@ -2,7 +2,7 @@
 - !ruby/object:MultiRepo::LockEntry
   name: git-multirepo-dummy
   id: e27695e9-e21d-4ad1-81b8-0ed587574c38
-  head: 59dbe6a9670f6a5ec5efa331c5fd5cb0348c811e
+  head: 111f680fd0153a35ed97febc48d118c784f0a98f
   branch: master
 - !ruby/object:MultiRepo::LockEntry
   name: git-multirepo-dummy-dep1
@@ -14,3 +14,8 @@
   id: e0dc3ed7-4b6b-4052-8783-668b405e4941
   head: 1b8465fcd4f9e5821640bb45ad8c22c960b64517
   branch: master
+- !ruby/object:MultiRepo::LockEntry
+  name: git-multirepo-migrations
+  id: ad6472a5-7238-447f-a54e-50f50197e21e
+  head: 841223db4851a1de7af8e22205eb7a840cc0ad38
+  branch: master

data/.multirepo.meta

@@ -0,0 +1,2 @@
+--- !ruby/object:MultiRepo::MetaFile
+version: 1.0.0.beta32

data/README.md

@@ -120,23 +120,25 @@ Here is a quick rundown of commands available to you in git-multirepo:
 | add | Track an additional dependency with multirepo. |
 | branch | Create and/or checkout a new branch for all repos. |
 | checkout | Checks out the specified commit or branch of the main repo and checks out matching versions of all dependencies. |
+| clean | Performs a 'git clean -df' on the main repo and all dependencies. |
 | clone | Clones the specified repository in a subfolder, then installs it. |
 | fetch | Performs a git fetch on all dependencies. |
 | install | Clones and checks out dependencies as defined in the version-controlled multirepo metadata files and installs git-multirepo's local git hooks. |
 | open | Opens all dependencies in the current OS's file explorer. |
 | remove | Removes the specified dependency from multirepo. |
-| update | Force-updates the multirepo lock file. |
+| update | Force-updates the multirepo tracking files. |
 | uninit | Removes all traces of multirepo in the current multirepo repository. |
 
 To read more about each command, use the `--help` flag (e.g. `$ multi clone --help`).
 
 ## Metadata
 
-git-multirepo stores all of its metadata in two files:
+git-multirepo stores all of its metadata in three files:
 
-| File | Format | Contents |
-|------|--------|----------|
-| .multirepo | YAML | A collection of your project's dependencies. For each dependency, stores its **local path** relative to the main repo and the **remote URL** your project depends upon.
-| .multirepo.lock | YAML | For each dependency, stores the **commit hash** and **branch** on which the dependency was when the main repo was committed. The dependency's **name** is also included but only serves as a reference to make inspecting the lock file easier. |
+| File | Format | Updated | Contents |
+|------|--------|---------|----------|
+| .multirepo | YAML | at initialization | A collection of your project's dependencies. For each dependency, stores its **local path** relative to the main repo and the **remote URL** your project depends upon.
+| .multirepo.lock | YAML | before each commit | For each dependency, stores the **commit hash** and **branch** on which the dependency was when the main repo was committed. The dependency's **name** is also included but only serves as a reference to make inspecting the lock file easier. |
+| .multirepo.meta | YAML | before each commit | Various git-multirepo metadata, such as the **git-multirepo version** that the last commit was performed with. |
 
 The information contained in .multirepo and .multirepo.lock allow one-step cloning of a project and all its dependencies, and checking out any prior revision of the main project with appropriate revisions of all of its dependencies, respectively.

data/lib/info.rb

@@ -1,5 +1,5 @@
 module MultiRepo
   NAME = "git-multirepo"
-  VERSION = "1.0.0.beta31"
+  VERSION = "1.0.0.beta32"
   DESCRIPTION = "Track multiple Git repositories side-by-side."
 end

data/lib/multirepo/commands/add-command.rb

@@ -22,7 +22,7 @@ module MultiRepo
     
     def run
       super
-      validate_in_work_tree
+      ensure_in_work_tree
       ensure_multirepo_enabled
       ensure_repo_valid
       

data/lib/multirepo/commands/branch-command.rb

@@ -1,6 +1,6 @@
 require "multirepo/utility/console"
 require "multirepo/files/config-file"
-require "multirepo/files/lock-file"
+require "multirepo/files/tracking-files"
 
 module MultiRepo
   class BranchCommand < Command
@@ -29,13 +29,13 @@ module MultiRepo
     
     def run
       super
-      validate_in_work_tree
+      ensure_in_work_tree
       ensure_multirepo_enabled
       
       Console.log_step("Branching...")
 
       main_repo = Repo.new(".")
-      repos = ConfigFile.load.map{ |entry| entry.repo }.push(main_repo)
+      repos = ConfigFile.load_entries.map{ |entry| entry.repo }.push(main_repo)
       
       if !Utils.ensure_working_copies_clean(repos) && !@force
         raise MultiRepoException, "Can't branch because not all repos are clean"
@@ -49,9 +49,9 @@ module MultiRepo
         branch.checkout
       end
 
-      Console.log_substep("Updating and committing lock file")
-      LockFile.update
-      LockFile.commit("[multirepo] Post-branch lock file update")
+      Console.log_substep("Updating and committing tracking files")
+      TrackingFiles.update
+      TrackingFiles.commit("[multirepo] Post-branch tracking files update")
 
       Console.log_step("Done!")
     rescue MultiRepoException => e

data/lib/multirepo/commands/checkout-command.rb

@@ -34,7 +34,7 @@ module MultiRepo
     
     def run
       super
-      validate_in_work_tree
+      ensure_in_work_tree
       ensure_multirepo_enabled
       
       Console.log_step("Checking out #{@ref} and its dependencies...")
@@ -85,15 +85,15 @@ module MultiRepo
     end
     
     def ensure_dependencies_clean_step(main_repo, initial_revision)
-      unless Utils.ensure_dependencies_clean(ConfigFile.load)
+      unless Utils.ensure_dependencies_clean(ConfigFile.load_entries)
         main_repo.checkout(initial_revision)
         raise MultiRepoException, "Checkout reverted."
       end
     end
     
     def dependencies_checkout_step(mode, ref = nil)
-      config_entries = ConfigFile.load # Post-main-repo checkout config entries might be different than pre-checkout
-      LockFile.load.each { |lock_entry| perform_dependency_checkout(config_entries, lock_entry, ref, mode) }
+      config_entries = ConfigFile.load_entries # Post-main-repo checkout config entries might be different than pre-checkout
+      LockFile.load_entries.each { |lock_entry| perform_dependency_checkout(config_entries, lock_entry, ref, mode) }
     end
     
     def proceed_if_merge_commit?(main_repo, ref, mode)

data/lib/multirepo/commands/clean-command.rb

@@ -7,7 +7,7 @@ module MultiRepo
     
     def run
       super
-      validate_in_work_tree
+      ensure_in_work_tree
       ensure_multirepo_enabled
       
       Console.log_step("Fetching dependencies...")
@@ -15,7 +15,7 @@ module MultiRepo
       Console.log_substep("Cleaning main repo...")
       clean(".")
       
-      ConfigFile.load.each do |entry|
+      ConfigFile.load_entries.each do |entry|
         Console.log_substep("Cleaning #{entry.repo.path} ...")
         clean(entry.repo.path)
       end

data/lib/multirepo/commands/command.rb

@@ -29,17 +29,13 @@ module MultiRepo
       help! "Invalid git executable '#{path}'" unless is_git_exe && file_exists
     end
     
-    def validate_in_work_tree
-      raise MultiRepoException, "Not a git repository" unless Git.is_inside_git_repo(".")
-    end
-    
     def install_hooks(path)
       actual_path = path || "."
       Utils.install_hook("pre-commit", actual_path)
     end
     
     def uninstall_hooks
-      File.delete(".git/hooks/pre-commit")
+      FileUtils.rm_f(".git/hooks/pre-commit")
     end
     
     def update_gitconfig(path)
@@ -54,7 +50,13 @@ module MultiRepo
     end
     
     def multirepo_enabled_dependencies
-      ConfigFile.load.select { |e| Utils.is_multirepo_enabled(e.repo.path) }
+      ConfigFile.load_entries.select { |e| Utils.is_multirepo_enabled(e.repo.path) }
+    end
+    
+    def ensure_in_work_tree
+      repo = Repo.new(".")
+      raise MultiRepoException, "Not a git repository" unless repo.exists?
+      raise MultiRepoException, "HEAD is unborn (you must perform at least one commit)" unless repo.head_born?
     end
     
     def ensure_multirepo_enabled

data/lib/multirepo/commands/fetch-command.rb

@@ -7,12 +7,12 @@ module MultiRepo
     
     def run
       super
-      validate_in_work_tree
+      ensure_in_work_tree
       ensure_multirepo_enabled
       
       Console.log_step("Fetching dependencies...")
       
-      ConfigFile.load.each do |entry|
+      ConfigFile.load_entries.each do |entry|
         Console.log_substep("Fetching from #{entry.repo.remote('origin').url}...")
         entry.repo.fetch
       end

data/lib/multirepo/commands/init-command.rb

@@ -2,6 +2,7 @@ require "multirepo/utility/console"
 require "multirepo/utility/utils"
 require "multirepo/files/config-file"
 require "multirepo/files/lock-file"
+require "multirepo/files/tracking-files"
 require "multirepo/commands/command"
 
 module MultiRepo
@@ -20,9 +21,10 @@ module MultiRepo
     
     def run
       super
-      validate_in_work_tree
+      ensure_in_work_tree
       
       if @only_extras
+        ensure_multirepo_enabled
         Console.log_step("Initializing extras...")
         initialize_extras_step
       else
@@ -41,30 +43,26 @@ module MultiRepo
         raise MultiRepoException, "Initialization aborted" unless reinitialize
       end
       
-      Console.log_substep("Creating new multirepo config...")
-      
-      add_sibling_repos_step
+      unless add_sibling_repos_step
+        raise MultiRepoException, "There are no sibling repositories to track as dependencies. Initialization aborted."
+      end
+
       initialize_extras_step
     end
     
     def add_sibling_repos_step
       sibling_repos = Utils.sibling_repos
+      return false unless sibling_repos.any?
+
+      Console.log_substep("Creating new multirepo config...")
       
-      if sibling_repos.any?
-        entries = []
-        sibling_repos.each do |repo|
-          origin_desc = repo.remote('origin').url || "[none]"
-          current_branch = repo.current_branch
-          if Console.ask_yes_no("Do you want to add '#{repo.path}' as a dependency?\n  [origin: '#{origin_desc}', branch: #{current_branch}]")
-            entries.push(ConfigEntry.new(repo))
-            Console.log_substep("Added the repository '#{repo.path}' to the .multirepo file")
-          end
-        end
-        
-        ConfigFile.save(entries)
-      else
-        Console.log_info("There are no sibling repositories to add")
-      end
+      valid_repos = find_valid_repos(sibling_repos)
+      entries = create_entries(valid_repos)
+      
+      raise MultiRepoException, "No sibling repositories were added as dependencies; aborting." unless entries.any?
+      
+      ConfigFile.save_entries(entries)
+      return true
     end
     
     def initialize_extras_step
@@ -79,7 +77,11 @@ module MultiRepo
     end
     
     def update_gitattributes_step
-      Utils.append_if_missing("./.gitattributes", /^.multirepo.lock .*/, ".multirepo.lock merge=ours")
+      TrackingFiles::FILE_CLASSES.each do |c|
+        filename = c::FILENAME
+        regex_escaped_filename = Regexp.quote(filename)
+        Utils.append_if_missing("./.gitattributes", /^#{regex_escaped_filename} .*/, "#{filename} merge=ours")
+      end
       Console.log_substep("Updated .gitattributes file")
     end
     
@@ -88,6 +90,28 @@ module MultiRepo
       Console.log_substep("Updated .git/config file")
     end
     
+    def find_valid_repos(repos)
+      repos.select do |repo|
+        next true if repo.head_born?
+        Console.log_warning("Ignoring repo '#{repo.path}' because its HEAD is unborn. You must perform at least one commit.")
+      end
+    end
+    
+    def create_entries(repos)
+      entries = []
+      repos.each do |repo|
+        origin_url = repo.remote('origin').url
+        current_branch = repo.current_branch
+        
+        if Console.ask_yes_no("Do you want to add '#{repo.path}' as a dependency?\n  [origin: #{origin_url || "NONE"}, branch: #{current_branch}]")
+          raise MultiRepoException, "Repo 'origin' remote url is not set; aborting." unless origin_url
+          entries.push(ConfigEntry.new(repo))
+          Console.log_substep("Added the repository '#{repo.path}' to the .multirepo file")
+        end
+      end
+      return entries
+    end
+    
     def check_repo_exists
       if !Dir.exists?(@repo.path) then raise MultiRepoException, "There is no folder at path '#{@repo.path}'" end
       if !@repo.exists? then raise MultiRepoException, "'#{@repo.path}' is not a repository" end

data/lib/multirepo/commands/install-command.rb

@@ -19,7 +19,7 @@ module MultiRepo
         
     def run
       super
-      validate_in_work_tree
+      ensure_in_work_tree
       ensure_multirepo_tracked
       
       if @hooks
@@ -43,7 +43,7 @@ module MultiRepo
     
     def install_dependencies_step
       # Read config entries as-is on disk, without prior checkout
-      config_entries = ConfigFile.load
+      config_entries = ConfigFile.load_entries
       Console.log_substep("Installing #{config_entries.count} dependencies...");
       
       # Clone or fetch all configured dependencies to make sure nothing is missing locally

data/lib/multirepo/commands/open-command.rb

@@ -10,10 +10,10 @@ module MultiRepo
     
     def run
       super
-      validate_in_work_tree
+      ensure_in_work_tree
       ensure_multirepo_enabled
       
-      ConfigFile.load.each do |entry|
+      ConfigFile.load_entries.each do |entry|
         if OS.osx?
           `open "#{entry.repo.path}"`
         elsif OS.windows?

data/lib/multirepo/commands/remove-command.rb

@@ -26,7 +26,7 @@ module MultiRepo
     
     def run
       super
-      validate_in_work_tree
+      ensure_in_work_tree
       ensure_multirepo_enabled
       
       repo = Repo.new(@path)

data/lib/multirepo/commands/uninit-command.rb

@@ -7,10 +7,10 @@ module MultiRepo
     
     def run
       super
-      validate_in_work_tree
+      ensure_in_work_tree
       
-      File.delete(".multirepo")
-      File.delete(".multirepo.lock")
+      FileUtils.rm_f(".multirepo")
+      TrackingFiles.delete
       uninstall_hooks
       
       Console.log_step("All traces of multirepo have been removed from this repository")

data/lib/multirepo/commands/update-command.rb

@@ -1,14 +1,15 @@
 require "multirepo/utility/console"
+require "multirepo/files/tracking-files"
 
 module MultiRepo
   class UpdateCommand < Command
     self.command = "update"
-    self.summary = "Force-updates the multirepo lock file."
+    self.summary = "Force-updates the multirepo tracking files."
     
     def self.options
       [
-        ['[--force]', 'Update the lock file even if dependencies contain uncommitted changes.'],
-        ['[--commit]', 'Commit the lock file after updating it.']
+        ['[--force]', 'Update the tracking files even if dependencies contain uncommitted changes.'],
+        ['[--commit]', 'Commit the tracking files after updating them.']
       ].concat(super)
     end
     
@@ -20,16 +21,16 @@ module MultiRepo
 
     def run
       super
-      validate_in_work_tree
+      ensure_in_work_tree
       ensure_multirepo_enabled
       
       Console.log_step("Updating...")
       
-      dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.load)
+      dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.load_entries)
       if dependencies_clean
-        update_lock_file_step("Updated lock file with latest dependency commits")
+        update_lock_file_step("Updated tracking files")
       elsif !dependencies_clean && @force
-        update_lock_file_step("Force-updated lock file with latest dependency commits (ignoring uncommitted changes)")
+        update_lock_file_step("Force-updated tracking files (ignoring uncommitted changes)")
       else
         raise MultiRepoException, "Can't update because not all dependencies are clean"
       end
@@ -40,15 +41,19 @@ module MultiRepo
     end
     
     def update_lock_file_step(log_message)
-      changed = LockFile.update
+      changed = TrackingFiles.update
       
-      if changed && @commit
-        Console.log_substep("Committing updated lock file")
-        LockFile.commit("[multirepo] Manually updated lock file")
+      if changed
+        Console.log_substep("Updated tracking files")
+      else
+        Console.log_substep("Tracking files are already up-to-date")
+      end
+      
+      if @commit
+        committed = TrackingFiles.commit("[multirepo] Updated tracking files manually")
+        Console.log_substep("Committed tracking files") if committed
       elsif changed
         Console.log_substep(log_message)
-      else
-        Console.log_info("Lock file is already up-to-date")
       end
     end
   end

data/lib/multirepo/files/config-file.rb

@@ -6,17 +6,18 @@ require_relative "config-entry"
 module MultiRepo
   class ConfigFile
     FILE = Pathname.new(".multirepo")
+    FILENAME = FILE.to_s
     
     def self.exists?
       FILE.exist?
     end
     
-    def self.load
+    def self.load_entries
       Psych.load(FILE.read)
     end
     
-    def self.save(entries)
-      File.write(FILE.to_s, Psych.dump(entries))
+    def self.save_entries(entries)
+      File.write(FILENAME, Psych.dump(entries))
     end
     
     def self.entry_exists?(entry)

data/lib/multirepo/files/lock-file.rb

@@ -2,44 +2,28 @@ require "pathname"
 require "psych"
 
 require "multirepo/git/git"
+require_relative "tracking-file"
 require_relative "lock-entry"
 require_relative "config-file"
 
 module MultiRepo
-  class LockFile
+  class LockFile < TrackingFile
     FILE = Pathname.new(".multirepo.lock")
+    FILENAME = FILE.to_s
     
     def self.exists?
       FILE.exist?
     end
     
-    def self.load
+    def self.load_entries
       Psych.load(FILE.read)
     end
     
     def self.update
-      config_entries = ConfigFile.load
+      config_entries = ConfigFile.load_entries
       lock_entries = config_entries.map { |c| LockEntry.new(c) }
-      
-      old_content = File.read(FILE.to_s)
-      new_content = Psych.dump(lock_entries)
-      File.write(FILE.to_s, new_content)
-      
-      return new_content != old_content
-    end
-    
-    def self.stage
-      Git.run_in_current_dir("add -A #{FILE.to_s}", Runner::Verbosity::OUTPUT_ON_ERROR)
-    end
-
-    def self.commit(message)
-      Git.run_in_current_dir("commit -m \"#{message}\" -o -- #{FILE.to_s}", Runner::Verbosity::OUTPUT_ON_ERROR)
-    end
-    
-    def self.validate_components(line, components)
-      unless components.count == 2
-        raise MultiRepoException, "Wrong entry format in .multirepo.lock file: #{line}"
-      end
+      content = Psych.dump(lock_entries)
+      return update_internal(FILENAME, content)
     end
   end
 end

data/lib/multirepo/files/meta-file.rb

@@ -0,0 +1,34 @@
+require "pathname"
+require "psych"
+
+require "info"
+require "multirepo/git/git"
+require_relative "tracking-file"
+require_relative "lock-entry"
+require_relative "config-file"
+
+module MultiRepo
+  class MetaFile < TrackingFile
+    FILE = Pathname.new(".multirepo.meta")
+    FILENAME = FILE.to_s
+    
+    attr_accessor :version
+    
+    def initialize
+      @version = MultiRepo::VERSION
+    end
+    
+    def encode_with(coder)
+      coder["version"] = @version
+    end
+        
+    def self.load
+      Psych.load(FILE.read)
+    end
+    
+    def self.update
+      content = Psych.dump(MetaFile.new)
+      return update_internal(FILENAME, content)
+    end
+  end
+end

data/lib/multirepo/files/tracking-file.rb

@@ -0,0 +1,9 @@
+module MultiRepo
+  class TrackingFile
+    def self.update_internal(file, new_content)
+      old_content = File.exists?(file) ? File.read(file) : nil
+      File.write(file, new_content)
+      return new_content != old_content
+    end
+  end
+end

data/lib/multirepo/files/tracking-files.rb

@@ -0,0 +1,44 @@
+require "multirepo/git/git"
+require_relative "meta-file"
+require_relative "lock-file"
+
+module MultiRepo
+  class TrackingFiles
+    FILE_CLASSES = [MetaFile, LockFile]
+    
+    def self.update
+      updated = false
+      FILE_CLASSES.each do |file_class|
+        updated |= file_class.update
+      end
+      return updated
+    end
+    
+    def self.stage
+      Git.run_in_current_dir("add --force -- #{files_pathspec}", Runner::Verbosity::OUTPUT_ON_ERROR)
+    end
+    
+    def self.commit(message)
+      stage
+      
+      output = Git.run_in_current_dir("ls-files --modified --others -- #{files_pathspec}", Runner::Verbosity::NEVER_OUTPUT)
+      files_are_untracked_or_modified = output.strip != ""
+      
+      output = Git.run_in_current_dir("diff --name-only --cached -- #{files_pathspec}", Runner::Verbosity::NEVER_OUTPUT)
+      files_are_staged = output.strip != ""
+      
+      must_commit = files_are_untracked_or_modified || files_are_staged
+      Git.run_in_current_dir("commit -m \"#{message}\" --only -- #{files_pathspec}", Runner::Verbosity::OUTPUT_ON_ERROR) if must_commit
+            
+      return must_commit
+    end
+    
+    def self.delete
+      FILE_CLASSES.each { |c| FileUtils.rm_f(c::FILENAME) }
+    end
+    
+    def self.files_pathspec
+      FILE_CLASSES.map{ |c| c::FILENAME }.join(" ")
+    end
+  end
+end

data/lib/multirepo/git/git.rb

@@ -8,11 +8,6 @@ module MultiRepo
       attr_accessor :last_command_succeeded
     end
     
-    def self.is_inside_git_repo(path)
-      return false unless Dir.exist?("#{path}/.git")
-      return Git.run_in_working_dir(path, "rev-parse --is-inside-work-tree", Runner::Verbosity::NEVER_OUTPUT).strip == "true"
-    end
-    
     def self.run_in_current_dir(git_command, verbosity)
       full_command = "#{git_executable} #{git_command}"
       run(full_command, verbosity)
@@ -30,7 +25,6 @@ module MultiRepo
     end
     
     def self.run(full_command, verbosity)
-      Console.log_info(full_command) if Config.instance.verbose
       result = Runner.run(full_command, verbosity)
       @last_command_succeeded = Runner.last_command_succeeded
       return result

data/lib/multirepo/git/remote.rb

@@ -10,7 +10,8 @@ module MultiRepo
     end
     
     def url
-      Git.run_in_working_dir(@repo.path, "config --get remote.#{@name}.url", Runner::Verbosity::NEVER_OUTPUT).strip
+      output = Git.run_in_working_dir(@repo.path, "config --get remote.#{@name}.url", Runner::Verbosity::NEVER_OUTPUT).strip
+      return output == "" ? nil : output
     end
   end
 end

data/lib/multirepo/git/repo.rb

@@ -16,7 +16,13 @@ module MultiRepo
     # Inspection
     
     def exists?
-      Git.is_inside_git_repo(@path)
+      return false unless Dir.exist?("#{@path}/.git")
+      return Git.run_in_working_dir(@path, "rev-parse --is-inside-work-tree", Runner::Verbosity::NEVER_OUTPUT).strip == "true"
+    end
+    
+    def head_born?
+      result = Git.run_in_working_dir(@path, "rev-parse HEAD --", Runner::Verbosity::NEVER_OUTPUT).strip
+      return !result.start_with?("fatal: bad revision")
     end
     
     def current_branch

data/lib/multirepo/hooks/pre-commit-hook.rb

@@ -1,5 +1,5 @@
 require "multirepo/files/config-file"
-require "multirepo/files/lock-file"
+require "multirepo/files/tracking-files"
 require "multirepo/utility/utils"
 require "multirepo/utility/console"
 
@@ -10,16 +10,16 @@ module MultiRepo
       
       Console.log_step("Performing pre-commit operations...")
       
-      dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.load)
+      dependencies_clean = Utils.ensure_dependencies_clean(ConfigFile.load_entries)
       
       if !dependencies_clean
         Console.log_error("You must commit changes to your dependencies before you can commit this repo")
         exit 1
       end
       
-      LockFile.update
-      LockFile.stage
-      Console.log_info("Updated and staged lock file with current HEAD revisions for all dependencies")
+      TrackingFiles.update
+      TrackingFiles.stage
+      Console.log_info("Updated and staged tracking files")
       
       exit 0 # Success!
     rescue StandardError => e

data/lib/multirepo/utility/runner.rb

@@ -14,10 +14,12 @@ module MultiRepo
     end
     
     def self.run(cmd, verbosity)
+      Console.log_info("Command: #{cmd}") if Config.instance.verbose
+      
       lines = []
       Open3.popen2e(cmd) do |stdin, stdout_and_stderr, thread|
         stdout_and_stderr.each do |line|
-          Console.log_info(line.rstrip) if verbosity == Verbosity::ALWAYS_OUTPUT || Config.instance.verbose
+          Console.log_info("-------> #{line.rstrip}") if verbosity == Verbosity::ALWAYS_OUTPUT || Config.instance.verbose
           lines << line
         end
         @last_command_succeeded = thread.value.success?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta31
+  version: 1.0.0.beta32
 platform: ruby
 authors:
 - Michaël Fortin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,6 +112,7 @@ files:
 - .gitignore
 - .multirepo
 - .multirepo.lock
+- .multirepo.meta
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -142,6 +143,9 @@ files:
 - lib/multirepo/files/config-file.rb
 - lib/multirepo/files/lock-entry.rb
 - lib/multirepo/files/lock-file.rb
+- lib/multirepo/files/meta-file.rb
+- lib/multirepo/files/tracking-file.rb
+- lib/multirepo/files/tracking-files.rb
 - lib/multirepo/git/branch.rb
 - lib/multirepo/git/change.rb
 - lib/multirepo/git/commit.rb