git-multirepo 1.0.0.beta34 → 1.0.0.beta37

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

@@ -1,104 +1,104 @@
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-require "multirepo/git/repo"
-require "multirepo/commands/checkout-command"
-
-module MultiRepo
-  class InstallCommand < Command
-    self.command = "install"
-    self.summary = "Clones and checks out dependencies as defined in the version-controlled multirepo metadata files and installs git-multirepo's local git hooks."
-    
-    def self.options
-      [['[--hooks]', 'Only install local git hooks.']].concat(super)
-    end
-    
-    def initialize(argv)
-      @hooks = argv.flag?("hooks")
-      super
-    end
-        
-    def run
-      super
-      ensure_in_work_tree
-      ensure_multirepo_tracked
-      
-      if @hooks
-        Console.log_step("Installing hooks in main repo and all dependencies...")
-        install_hooks_step
-      else
-        Console.log_step("Cloning dependencies and installing hooks...")
-        full_install
-      end
-      
-      Console.log_step("Done!")
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-    
-    def full_install
-      install_dependencies_step
-      install_hooks_step
-      update_gitconfigs_step
-    end
-    
-    def install_dependencies_step
-      # Read config entries as-is on disk, without prior checkout
-      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
-      config_entries.each { |entry| clone_or_fetch(entry) }
-      
-      # Checkout the appropriate branches as specified in the lock file
-      checkout_command = CheckoutCommand.new(CLAide::ARGV.new([]))
-      checkout_command.dependencies_checkout_step(CheckoutCommand::CheckoutMode::LATEST)
-    end
-    
-    def install_hooks_step
-      perform_in_main_repo_and_dependencies("Installed git hooks") { |repo| install_hooks(repo) }
-    end
-    
-    def update_gitconfigs_step
-      perform_in_main_repo_and_dependencies("Updated .git/config file") { |repo| update_gitconfig(repo) }
-    end
-    
-    def perform_in_main_repo_and_dependencies(message_prefix, &operation)
-      operation.call(".")
-      Console.log_substep("#{message_prefix} in main repo")
-      
-      multirepo_enabled_dependencies.each do |entry|
-        operation.call(entry.repo.path)
-        Console.log_substep("#{message_prefix} in multirepo-enabled dependency '#{entry.repo.path}'")
-      end
-    end
-    
-    def clone_or_fetch(entry)
-      if entry.repo.exists?
-        check_repo_validity(entry)
-        fetch_repo(entry)
-      else
-        clone_repo(entry)
-      end
-    end
-    
-    # Repo operations
-    
-    def fetch_repo(entry)
-      Console.log_substep("Working copy '#{entry.repo.path}' already exists, fetching instead...")
-      raise MultiRepoException, "Could not fetch from remote #{entry.repo.remote('origin').url}" unless entry.repo.fetch
-    end
-    
-    def clone_repo(entry)
-      Console.log_substep("Cloning #{entry.url} into '#{entry.repo.path}'")
-      raise MultiRepoException, "Could not clone remote #{entry.url}" unless entry.repo.clone(entry.url)
-    end
-    
-    # Validation
-    
-    def check_repo_validity(entry)
-      unless entry.repo.remote("origin").url == entry.url
-        raise MultiRepoException, "'#{entry.path}' origin URL (#{entry.repo.remote('origin').url}) does not match entry (#{entry.url})!"
-      end
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+require "multirepo/git/repo"
+require "multirepo/commands/checkout-command"
+
+module MultiRepo
+  class InstallCommand < Command
+    self.command = "install"
+    self.summary = "Clones and checks out dependencies as defined in the version-controlled multirepo metadata files and installs git-multirepo's local git hooks."
+    
+    def self.options
+      [['[--hooks]', 'Only install local git hooks.']].concat(super)
+    end
+    
+    def initialize(argv)
+      @hooks = argv.flag?("hooks")
+      super
+    end
+        
+    def run
+      super
+      ensure_in_work_tree
+      ensure_multirepo_tracked
+      
+      if @hooks
+        Console.log_step("Installing hooks in main repo and all dependencies...")
+        install_hooks_step
+      else
+        Console.log_step("Cloning dependencies and installing hooks...")
+        full_install
+      end
+      
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+    
+    def full_install
+      install_dependencies_step
+      install_hooks_step
+      update_gitconfigs_step
+    end
+    
+    def install_dependencies_step
+      # Read config entries as-is on disk, without prior checkout
+      config_entries = ConfigFile.new(".").load_entries
+      Console.log_substep("Installing #{config_entries.count} dependencies...");
+      
+      # Clone or fetch all configured dependencies to make sure nothing is missing locally
+      config_entries.each { |entry| clone_or_fetch(entry) }
+      
+      # Checkout the appropriate branches as specified in the lock file
+      checkout_command = CheckoutCommand.new(CLAide::ARGV.new([]))
+      checkout_command.dependencies_checkout_step(RevisionSelectionMode::LATEST)
+    end
+    
+    def install_hooks_step
+      perform_in_main_repo_and_dependencies("Installed git hooks") { |repo| install_hooks(repo) }
+    end
+    
+    def update_gitconfigs_step
+      perform_in_main_repo_and_dependencies("Updated .git/config file") { |repo| update_gitconfig(repo) }
+    end
+    
+    def perform_in_main_repo_and_dependencies(message_prefix, &operation)
+      operation.call(".")
+      Console.log_substep("#{message_prefix} in main repo")
+      
+      multirepo_enabled_dependencies.each do |entry|
+        operation.call(entry.repo.path)
+        Console.log_substep("#{message_prefix} in multirepo-enabled dependency '#{entry.repo.path}'")
+      end
+    end
+    
+    def clone_or_fetch(entry)
+      if entry.repo.exists?
+        check_repo_validity(entry)
+        fetch_repo(entry)
+      else
+        clone_repo(entry)
+      end
+    end
+    
+    # Repo operations
+    
+    def fetch_repo(entry)
+      Console.log_substep("Working copy '#{entry.repo.path}' already exists, fetching instead...")
+      raise MultiRepoException, "Could not fetch from remote #{entry.repo.remote('origin').url}" unless entry.repo.fetch
+    end
+    
+    def clone_repo(entry)
+      Console.log_substep("Cloning #{entry.url} into '#{entry.repo.path}'")
+      raise MultiRepoException, "Could not clone remote #{entry.url}" unless entry.repo.clone(entry.url)
+    end
+    
+    # Validation
+    
+    def check_repo_validity(entry)
+      unless entry.repo.remote("origin").url == entry.url
+        raise MultiRepoException, "'#{entry.path}' origin URL (#{entry.repo.remote('origin').url}) does not match entry (#{entry.url})!"
+      end
+    end
+  end
 end

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

@@ -0,0 +1,126 @@
+require "multirepo/utility/console" 
+require "multirepo/logic/node"
+require "multirepo/logic/revision-selector"
+require "multirepo/logic/performer"
+
+module MultiRepo
+  class MergeCommand < Command
+    self.command = "merge"
+    self.summary = "Performs a git merge on all dependencies and the main repo, in the proper order."
+    
+    def self.options
+      [
+        ['<ref>', 'The main repo tag, branch or commit id to merge.'],
+        ['[--latest]', 'Merge the HEAD of each stored dependency branch instead of the commits recorded in the lock file.'],
+        ['[--exact]', 'Merge 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 ref to merge" unless @ref
+      help! "You can't provide more than one operation modifier (--latest, --exact, etc.)" if @checkout_latest && @checkout_exact
+    end
+    
+    def run
+      super
+      ensure_in_work_tree
+      ensure_multirepo_enabled
+      
+      Console.log_step("Merging #{@ref} ...")
+      
+      main_repo = Repo.new(".")
+      
+      # Keep the initial revision because we're going to need to come back to it later
+      initial_revision = main_repo.current_branch || main_repo.head_hash
+      
+      # Find out the checkout mode based on command-line options
+      mode = RevisionSelector.mode_for_args(@checkout_latest, @checkout_exact)
+      
+      begin
+        merge_core(main_repo, initial_revision, mode)
+      rescue MultiRepoException => e
+        Performer.perform_main_repo_checkout(main_repo, initial_revision)
+        raise e
+      end
+      
+      Console.log_step("Done!")
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+    
+    def merge_core(main_repo, initial_revision, mode)
+      config_file = ConfigFile.new(".")
+      
+      # Load entries prior to checkout so that we can compare them later
+      pre_checkout_config_entries = config_file.load_entries
+      
+      # Ensure the main repo is clean
+      raise MultiRepoException, "Main repo is not clean; merge aborted" unless main_repo.clean?
+      
+      # Ensure dependencies are clean
+      unless Utils.ensure_dependencies_clean(pre_checkout_config_entries)
+        raise MultiRepoException, "Dependencies are not clean; merge aborted"
+      end
+      
+      # Checkout the specified main repo ref to find out which dependency refs to merge
+      Performer.perform_main_repo_checkout(main_repo, @ref)
+      
+      # Load config entries for the ref we're going to merge
+      post_checkout_config_entries = config_file.load_entries
+      
+      # Auto-merge would be too complex if the specified ref does not have the same dependencies
+      ensure_dependencies_match(pre_checkout_config_entries, post_checkout_config_entries)
+            
+      Console.log_substep("Merging would do the following:")
+      
+      Performer.perform_on_dependencies do |config_entry, lock_entry|
+        revision = RevisionSelector.revision_for_mode(mode, @ref, lock_entry)
+        Console.log_info("#{lock_entry.name}: Merge #{revision} into current branch")
+      end
+      Console.log_info("[main repo]: Merge #{@ref} into current branch")
+      
+      raise MultiRepoException, "Merge aborted" unless Console.ask_yes_no("Proceed?")
+      
+      Console.log_step("Performing merge...")
+      
+      # Checkout the initial revision to perform the merge in it
+      Performer.perform_main_repo_checkout(main_repo, initial_revision)
+      
+      # Merge dependencies
+      Performer.perform_on_dependencies do |config_entry, lock_entry|
+        revision = RevisionSelector.revision_for_mode(mode, @ref, lock_entry)
+        Console.log_substep("#{lock_entry.name}: Merging #{revision} into current branch...")
+        Git.run_in_working_dir(config_entry.path, "merge #{revision}", Runner::Verbosity::OUTPUT_ALWAYS)
+      end
+      
+      # Merge the main repo
+      Console.log_substep("[main repo]: Merging #{@ref} into current branch...")
+      Git.run_in_current_dir("merge #{@ref}", Runner::Verbosity::OUTPUT_ALWAYS)
+    end
+    
+    def ensure_dependencies_match(pre_checkout_config_entries, post_checkout_config_entries)
+      perfect_match = true
+      pre_checkout_config_entries.each do |pre_entry|
+        found = post_checkout_config_entries.find { |post_entry| post_entry.id = pre_entry.id }
+        perfect_match &= found
+        Console.log_warning("Dependency '#{pre_entry.repo.path}' was not found in the target ref") unless found
+      end
+      
+      unless perfect_match
+        raise MultiRepoException, "Dependencies differ, please merge manually"
+      end
+      
+      if post_checkout_config_entries.count > pre_checkout_config_entries.count
+        raise MultiRepoException, "There are more dependencies in the specified ref, please merge manually"
+      end
+    end
+  end
+end

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

@@ -1,27 +1,27 @@
-require "os"
-
-require "multirepo/utility/console"
-require "multirepo/utility/utils"
-
-module MultiRepo
-  class OpenCommand < Command
-    self.command = "open"
-    self.summary = "Opens all dependencies in the current OS's file explorer."
-    
-    def run
-      super
-      ensure_in_work_tree
-      ensure_multirepo_enabled
-      
-      ConfigFile.load_entries.each do |entry|
-        if OS.osx?
-          `open "#{entry.repo.path}"`
-        elsif OS.windows?
-          `explorer "#{Utils.convert_to_windows_path(entry.repo.path)}"`
-        end
-      end
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "os"
+
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
+
+module MultiRepo
+  class OpenCommand < Command
+    self.command = "open"
+    self.summary = "Opens all dependencies in the current OS's file explorer."
+    
+    def run
+      super
+      ensure_in_work_tree
+      ensure_multirepo_enabled
+      
+      ConfigFile.new(".").load_entries.each do |entry|
+        if OS.osx?
+          `open "#{entry.repo.path}"`
+        elsif OS.windows?
+          `explorer "#{Utils.convert_to_windows_path(entry.repo.path)}"`
+        end
+      end
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end

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

@@ -1,50 +1,51 @@
-require "multirepo/utility/console"
-require "multirepo/files/config-file"
-
-module MultiRepo
-  class RemoveCommand < Command
-    self.command = "remove"
-    self.summary = "Removes the specified dependency from multirepo."
-    
-    def self.options
-      [
-        ['<path>', 'The relative path to the dependency to remove (e.g. ../MyOldDependency).'],
-        ['[--delete]', 'Delete the dependency on disk in addition to removing it from the multirepo config.']
-      ].concat(super)
-    end
-    
-    def initialize(argv)
-      @path = argv.shift_argument
-      @delete = argv.flag?("delete")
-      super
-    end
-    
-    def validate!
-      super
-      help! "You must specify a dependency repository to remove" unless @path
-    end
-    
-    def run
-      super
-      ensure_in_work_tree
-      ensure_multirepo_enabled
-      
-      repo = Repo.new(@path)
-      entry = ConfigEntry.new(repo)
-      
-      if ConfigFile.entry_exists?(entry)
-        ConfigFile.remove_entry(entry)
-        Console.log_step("Removed '#{@path}' from the .multirepo file")
-        
-        if @delete
-          FileUtils.rm_rf(@path)
-          Console.log_step("Deleted '#{@path}' from disk")
-        end
-      else
-        raise MultiRepoException, "'#{@path}' isn't tracked by multirepo"
-      end
-    rescue MultiRepoException => e
-      Console.log_error(e.message)
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/files/config-file"
+
+module MultiRepo
+  class RemoveCommand < Command
+    self.command = "remove"
+    self.summary = "Removes the specified dependency from multirepo."
+    
+    def self.options
+      [
+        ['<path>', 'The relative path to the dependency to remove (e.g. ../MyOldDependency).'],
+        ['[--delete]', 'Delete the dependency on disk in addition to removing it from the multirepo config.']
+      ].concat(super)
+    end
+    
+    def initialize(argv)
+      @path = argv.shift_argument
+      @delete = argv.flag?("delete")
+      super
+    end
+    
+    def validate!
+      super
+      help! "You must specify a dependency repository to remove" unless @path
+    end
+    
+    def run
+      super
+      ensure_in_work_tree
+      ensure_multirepo_enabled
+      
+      repo = Repo.new(@path)
+      entry = ConfigEntry.new(repo)
+      
+      config_file = ConfigFile.new(".")
+      if config_file.entry_exists?(entry)
+        config_file.remove_entry(entry)
+        Console.log_step("Removed '#{@path}' from the .multirepo file")
+        
+        if @delete
+          FileUtils.rm_rf(@path)
+          Console.log_step("Deleted '#{@path}' from disk")
+        end
+      else
+        raise MultiRepoException, "'#{@path}' isn't tracked by multirepo"
+      end
+    rescue MultiRepoException => e
+      Console.log_error(e.message)
+    end
+  end
 end