git-multirepo 1.0.0.beta27 → 1.0.0.beta29

data/Rakefile

@@ -1,2 +1,2 @@
-require "bundler/gem_tasks"
-
+require "bundler/gem_tasks"
+

data/bin/multi

@@ -1,11 +1,11 @@
-#!/usr/bin/env ruby
-
-require "claide"
-require "commands"
-
-trap("INT") do
-  puts "\rAbort, abort!!" # \r hides the interrupt control characters
-  exit
-end
-
+#!/usr/bin/env ruby
+
+require "claide"
+require "commands"
+
+trap("INT") do
+  puts "\rAbort, abort!!" # \r hides the interrupt control characters
+  exit
+end
+
 MultiRepo::Command.run(ARGV)

data/git-multirepo.gemspec

@@ -1,29 +1,29 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'info'
-
-Gem::Specification.new do |spec|
-  spec.name          = MultiRepo::NAME
-  spec.version       = MultiRepo::VERSION
-  spec.authors       = ["Michaël Fortin"]
-  spec.email         = ["fortinmike@irradiated.net"]
-  spec.summary       = %q{Track multiple Git repositories side-by-side}
-  spec.description   = MultiRepo::DESCRIPTION
-  spec.homepage      = "https://github.com/fortinmike/git-multirepo"
-  spec.license       = "MIT"
-  
-  spec.required_ruby_version = '~> 2.0'
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.1.0"
-
-  spec.add_runtime_dependency "claide", "~> 0.8", ">= 0.8.0"
-  spec.add_runtime_dependency "colored", "~> 1.2"
-  spec.add_runtime_dependency "os", "~> 0.9.6"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'info'
+
+Gem::Specification.new do |spec|
+  spec.name          = MultiRepo::NAME
+  spec.version       = MultiRepo::VERSION
+  spec.authors       = ["Michaël Fortin"]
+  spec.email         = ["fortinmike@irradiated.net"]
+  spec.summary       = %q{Track multiple Git repositories side-by-side}
+  spec.description   = MultiRepo::DESCRIPTION
+  spec.homepage      = "https://github.com/fortinmike/git-multirepo"
+  spec.license       = "MIT"
+  
+  spec.required_ruby_version = '~> 2.0'
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.1.0"
+
+  spec.add_runtime_dependency "claide", "~> 0.8", ">= 0.8.0"
+  spec.add_runtime_dependency "colored", "~> 1.2"
+  spec.add_runtime_dependency "os", "~> 0.9.6"
+end

data/lib/commands.rb

@@ -1,12 +1,12 @@
-require_relative "multirepo/commands/command"
-require_relative "multirepo/commands/add-command"
-require_relative "multirepo/commands/branch-command"
-require_relative "multirepo/commands/checkout-command"
-require_relative "multirepo/commands/clone-command"
-require_relative "multirepo/commands/fetch-command"
-require_relative "multirepo/commands/init-command"
-require_relative "multirepo/commands/install-command"
-require_relative "multirepo/commands/open-command"
-require_relative "multirepo/commands/remove-command"
-require_relative "multirepo/commands/uninit-command"
+require_relative "multirepo/commands/command"
+require_relative "multirepo/commands/add-command"
+require_relative "multirepo/commands/branch-command"
+require_relative "multirepo/commands/checkout-command"
+require_relative "multirepo/commands/clone-command"
+require_relative "multirepo/commands/fetch-command"
+require_relative "multirepo/commands/init-command"
+require_relative "multirepo/commands/install-command"
+require_relative "multirepo/commands/open-command"
+require_relative "multirepo/commands/remove-command"
+require_relative "multirepo/commands/uninit-command"
 require_relative "multirepo/commands/update-command"

data/lib/git-multirepo.rb

@@ -1,3 +1 @@
-require "multirepo/hooks/pre-commit-hook.rb"
-require "multirepo/hooks/prepare-commit-msg-hook.rb"
-require "multirepo/hooks/post-merge-hook.rb"
+require "multirepo/hooks/pre-commit-hook.rb"

data/lib/info.rb

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

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

@@ -1,52 +1,51 @@
-require "multirepo/utility/console"
-require "multirepo/files/config-file"
-
-module MultiRepo
-  class AddCommand < Command
-    self.command = "add"
-    self.summary = "Track an additional dependency with multirepo."
-    
-    def self.options
-      [['<path>', 'The relative path to the new dependency (e.g. ../MyNewDependency)']].concat(super)
-    end
-    
-    def initialize(argv)
-      @path = argv.shift_argument
-      super
-    end
-    
-    def validate!
-      super
-      help! "You must specify a repository to add as a dependency" unless @path
-    end
-    
-    def run
-      validate_in_work_tree
-      ensure_multirepo_enabled
-      ensure_repo_valid
-      
-      entry = ConfigEntry.new(Repo.new(@path))
-      if ConfigFile.entry_exists?(entry)
-        Console.log_info("There is already an entry for '#{@path}' in the .multirepo file")
-      else
-        ConfigFile.add_entry(entry)
-        ConfigFile.stage
-        Console.log_step("Added '#{@path}' to the .multirepo file")
-      end
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-    
-    def ensure_repo_valid
-      raise MultiRepoException, "The provided path is not a direct sibling of the main repository" unless validate_is_sibling_repo(@path)
-      raise MultiRepoException, "There is no folder at path '#{@path}'" unless Dir.exists?(@path)
-      raise MultiRepoException, "'#{@path}' is not a repository" unless Repo.new(@path).exists?
-    end
-    
-    def validate_is_sibling_repo(path)
-      parent_dir = File.expand_path("..")
-      path = File.expand_path("..", path)
-      return parent_dir == path
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/files/config-file"
+
+module MultiRepo
+  class AddCommand < Command
+    self.command = "add"
+    self.summary = "Track an additional dependency with multirepo."
+    
+    def self.options
+      [['<path>', 'The relative path to the new dependency (e.g. ../MyNewDependency)']].concat(super)
+    end
+    
+    def initialize(argv)
+      @path = argv.shift_argument
+      super
+    end
+    
+    def validate!
+      super
+      help! "You must specify a repository to add as a dependency" unless @path
+    end
+    
+    def run
+      validate_in_work_tree
+      ensure_multirepo_enabled
+      ensure_repo_valid
+      
+      entry = ConfigEntry.new(Repo.new(@path))
+      if ConfigFile.entry_exists?(entry)
+        Console.log_info("There is already an entry for '#{@path}' in the .multirepo file")
+      else
+        ConfigFile.add_entry(entry)
+        Console.log_step("Added '#{@path}' to the .multirepo file")
+      end
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+    
+    def ensure_repo_valid
+      raise MultiRepoException, "The provided path is not a direct sibling of the main repository" unless validate_is_sibling_repo(@path)
+      raise MultiRepoException, "There is no folder at path '#{@path}'" unless Dir.exists?(@path)
+      raise MultiRepoException, "'#{@path}' is not a repository" unless Repo.new(@path).exists?
+    end
+    
+    def validate_is_sibling_repo(path)
+      parent_dir = File.expand_path("..")
+      path = File.expand_path("..", path)
+      return parent_dir == path
+    end
+  end
 end

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

@@ -1,60 +1,60 @@
-require "multirepo/utility/console"
-require "multirepo/files/config-file"
-require "multirepo/files/lock-file"
-
-module MultiRepo
-  class BranchCommand < Command
-    self.command = "branch"
-    self.summary = "Create and/or checkout a new branch for all repos."
-    
-    def self.options
-      [
-        ['<branch name>', 'The name of the branch to create and checkout.'],
-        ['[--force]', 'Force creating the branch even if the repos contain uncommmitted changes.'],
-        ['[--no-track]', 'Do not configure as a remote-tracking branch on creation.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @branch_name = argv.shift_argument
-      @force = argv.flag?("force")
-      @remote_tracking = argv.flag?("track", true)
-      super
-    end
-    
-    def validate!
-      super
-      help! "You must specify a branch name" unless @branch_name
-    end
-    
-    def run
-      validate_in_work_tree
-      ensure_multirepo_enabled
-      
-      Console.log_step("Branching...")
-
-      main_repo = main_repo = Repo.new(".")
-      repos = ConfigFile.load.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"
-      end
-
-      repos.each do |repo|
-        Console.log_substep("Branching and checking out #{repo.path} #{@branch_name} ...")
-
-        branch = repo.branch(@branch_name)
-        branch.create(@remote_tracking) unless branch.exists?
-        branch.checkout
-      end
-
-      Console.log_substep("Updating and committing lock file")
-      LockFile.update
-      LockFile.commit("[multirepo] Post-branch lock file update")
-
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/files/config-file"
+require "multirepo/files/lock-file"
+
+module MultiRepo
+  class BranchCommand < Command
+    self.command = "branch"
+    self.summary = "Create and/or checkout a new branch for all repos."
+    
+    def self.options
+      [
+        ['<branch name>', 'The name of the branch to create and checkout.'],
+        ['[--force]', 'Force creating the branch even if the repos contain uncommmitted changes.'],
+        ['[--no-track]', 'Do not configure as a remote-tracking branch on creation.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @branch_name = argv.shift_argument
+      @force = argv.flag?("force")
+      @remote_tracking = argv.flag?("track", true)
+      super
+    end
+    
+    def validate!
+      super
+      help! "You must specify a branch name" unless @branch_name
+    end
+    
+    def run
+      validate_in_work_tree
+      ensure_multirepo_enabled
+      
+      Console.log_step("Branching...")
+
+      main_repo = main_repo = Repo.new(".")
+      repos = ConfigFile.load.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"
+      end
+
+      repos.each do |repo|
+        Console.log_substep("Branching and checking out #{repo.path} #{@branch_name} ...")
+
+        branch = repo.branch(@branch_name)
+        branch.create(@remote_tracking) unless branch.exists?
+        branch.checkout
+      end
+
+      Console.log_substep("Updating and committing lock file")
+      LockFile.update
+      LockFile.commit("[multirepo] Post-branch lock file update")
+
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end

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

@@ -1,120 +1,140 @@
-require "multirepo/utility/console"
-
-module MultiRepo
-  class CheckoutCommand < Command
-    self.command = "checkout"
-    self.summary = "Checks out the specified commit or branch of the main repo and checks out matching versions of all dependencies."
-    
-    class CheckoutMode
-      AS_LOCK = 0
-      LATEST = 1
-      EXACT = 2
-    end
-    
-    def self.options
-      [
-        ['<ref>', 'The main repo tag, branch or commit id to checkout.'],
-        ['[--latest]', 'Checkout the HEAD of each dependency branch (as recorded in the lock file) instead of the exact required commits.'],
-        ['[--exact]', 'Checkout the exact specified ref for each repo, regardless of what\'s stored in the lock file.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @ref = argv.shift_argument
-      @checkout_latest = argv.flag?("latest")
-      @checkout_exact = argv.flag?("exact")
-      super
-    end
-    
-    def validate!
-      super
-      help! "You must specify a branch or commit id to checkout" unless @ref
-      help! "You can't provide more than one operation modifier (--latest, --exact, etc.)" if @checkout_latest && @checkout_exact
-    end
-    
-    def run
-      validate_in_work_tree
-      ensure_multirepo_enabled
-      
-      Console.log_step("Checking out #{@ref} and its dependencies...")
-      
-      # Find out the checkout mode based on command-line options
-      mode = if @checkout_latest then
-        CheckoutMode::LATEST
-      elsif @checkout_exact then
-        CheckoutMode::EXACT
-      else
-        CheckoutMode::AS_LOCK
-      end
-      
-      main_repo = Repo.new(".")
-      initial_revision = main_repo.current_branch || main_repo.head_hash
-      
-      main_repo_checkout_step(main_repo, initial_revision, @ref)
-      ensure_dependencies_clean_step(main_repo, initial_revision)
-      dependencies_checkout_step(mode, @ref)
-      
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-            
-    def main_repo_checkout_step(main_repo, initial_revision, ref)
-      # Make sure the main repo is clean before attempting a checkout
-      unless main_repo.is_clean?
-        raise MultiRepoException, "Can't checkout #{ref} because the main repo contains uncommitted changes"
-      end
-      
-      # Checkout the specified ref
-      unless main_repo.checkout(ref)
-        raise MultiRepoException, "Couldn't perform checkout of main repo #{ref}!"
-      end
-      
-      Console.log_substep("Checked out main repo #{ref}")
-      
-      # After checkout, make sure we're working with a multirepo-enabled ref
-      unless Utils.is_multirepo_tracked(".")
-        main_repo.checkout(initial_revision)
-        raise MultiRepoException, "This revision is not tracked by multirepo. Checkout reverted."
-      end
-    end
-    
-    def ensure_dependencies_clean_step(main_repo, initial_revision)
-      unless Utils.ensure_dependencies_clean(ConfigFile.load)
-        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) }
-    end
-    
-    def perform_dependency_checkout(config_entries, lock_entry, ref, mode)
-      # Find the config entry that matches the given lock entry
-      config_entry = config_entries.select{ |config_entry| config_entry.id == lock_entry.id }.first
-      
-      # Make sure the repo exists on disk, and clone it if it doesn't
-      # (in case the checked-out revision had an additional dependency)
-      unless config_entry.repo.exists?
-        Console.log_substep("Cloning missing dependency '#{config_entry.path}' from #{config_entry.url}")
-        config_entry.repo.clone(config_entry.url)
-      end
-      
-      # Find out the proper revision to checkout based on the checkout mode
-      revision = case mode
-      when CheckoutMode::AS_LOCK; lock_entry.head
-      when CheckoutMode::LATEST; lock_entry.branch
-      when CheckoutMode::EXACT; ref
-      end
-      
-      # Checkout!
-      if config_entry.repo.checkout(revision)
-        Console.log_substep("Checked out #{lock_entry.name} #{revision}")
-      else
-        raise MultiRepoException, "Couldn't check out the appropriate version of dependency #{lock_entry.name}"
-      end
-    end
-  end
+require "multirepo/utility/console"
+
+module MultiRepo
+  class CheckoutCommand < Command
+    self.command = "checkout"
+    self.summary = "Checks out the specified commit or branch of the main repo and checks out matching versions of all dependencies."
+    
+    class CheckoutMode
+      AS_LOCK = 0
+      LATEST = 1
+      EXACT = 2
+    end
+    
+    def self.options
+      [
+        ['<ref>', 'The main repo tag, branch or commit id to checkout.'],
+        ['[--latest]', 'Checkout the HEAD of each dependency branch (as recorded in the lock file) instead of the exact required commits.'],
+        ['[--exact]', 'Checkout the exact specified ref for each repo, regardless of what\'s stored in the lock file.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @ref = argv.shift_argument
+      @checkout_latest = argv.flag?("latest")
+      @checkout_exact = argv.flag?("exact")
+      super
+    end
+    
+    def validate!
+      super
+      help! "You must specify a branch or commit id to checkout" unless @ref
+      help! "You can't provide more than one operation modifier (--latest, --exact, etc.)" if @checkout_latest && @checkout_exact
+    end
+    
+    def run
+      validate_in_work_tree
+      ensure_multirepo_enabled
+      
+      Console.log_step("Checking out #{@ref} and its dependencies...")
+      
+      # Find out the checkout mode based on command-line options
+      mode = if @checkout_latest then
+        CheckoutMode::LATEST
+      elsif @checkout_exact then
+        CheckoutMode::EXACT
+      else
+        CheckoutMode::AS_LOCK
+      end
+      
+      main_repo = Repo.new(".")
+      initial_revision = main_repo.current_branch || main_repo.head_hash
+      
+      unless proceed_if_merge_commit?(main_repo, @ref, mode)
+        raise MultiRepoException, "Aborting checkout"
+      end
+      
+      main_repo_checkout_step(main_repo, initial_revision, @ref)
+      ensure_dependencies_clean_step(main_repo, initial_revision)
+      dependencies_checkout_step(mode, @ref)
+            
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+            
+    def main_repo_checkout_step(main_repo, initial_revision, ref)
+      # Make sure the main repo is clean before attempting a checkout
+      unless main_repo.is_clean?
+        raise MultiRepoException, "Can't checkout #{ref} because the main repo contains uncommitted changes"
+      end
+      
+      # Checkout the specified ref
+      unless main_repo.checkout(ref)
+        raise MultiRepoException, "Couldn't perform checkout of main repo #{ref}!"
+      end
+      
+      Console.log_substep("Checked out main repo #{ref}")
+      
+      # After checkout, make sure we're working with a multirepo-enabled ref
+      unless Utils.is_multirepo_tracked(".")
+        main_repo.checkout(initial_revision)
+        raise MultiRepoException, "This revision is not tracked by multirepo. Checkout reverted."
+      end
+    end
+    
+    def ensure_dependencies_clean_step(main_repo, initial_revision)
+      unless Utils.ensure_dependencies_clean(ConfigFile.load)
+        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) }
+    end
+    
+    def proceed_if_merge_commit?(main_repo, ref, mode)
+      return true unless main_repo.commit(ref).is_merge?
+      
+      case mode
+      when CheckoutMode::AS_LOCK
+        Console.log_error("The specified ref is a merge commit and an \"as-lock\" checkout was requested.")
+        Console.log_error("The resulting checkout would most probably not result in a valid project state.")
+        return false
+      when CheckoutMode::LATEST
+        Console.log_warning("The specified ref is a merge commit and a \"latest\" checkout was requested.")
+        Console.log_warning("The work branches recorded in the branch from which the merge was performed will be checked out.")
+      end
+      
+      return true
+    end
+    
+    def perform_dependency_checkout(config_entries, lock_entry, ref, mode)
+      # Find the config entry that matches the given lock entry
+      config_entry = config_entries.select{ |config_entry| config_entry.id == lock_entry.id }.first
+      
+      # Make sure the repo exists on disk, and clone it if it doesn't
+      # (in case the checked-out revision had an additional dependency)
+      unless config_entry.repo.exists?
+        Console.log_substep("Cloning missing dependency '#{config_entry.path}' from #{config_entry.url}")
+        config_entry.repo.clone(config_entry.url)
+      end
+      
+      # Find out the proper revision to checkout based on the checkout mode
+      revision = case mode
+      when CheckoutMode::AS_LOCK; lock_entry.head
+      when CheckoutMode::LATEST; lock_entry.branch
+      when CheckoutMode::EXACT; ref
+      end
+      
+      # Checkout!
+      if config_entry.repo.checkout(revision)
+        Console.log_substep("Checked out #{lock_entry.name} #{revision}")
+      else
+        raise MultiRepoException, "Couldn't check out the appropriate version of dependency #{lock_entry.name}"
+      end
+    end
+  end
 end