git-multirepo 1.0.0.beta37 → 1.0.0.beta38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dfb2bbd05db8f1fc690a93f9e4d8dd5af2ac2b3
-  data.tar.gz: 94aaeaeaed6f949e5be90b5dd530f4d0e45d04b9
+  metadata.gz: 422c984238cb4049bcededa9a63ac57ca1d13445
+  data.tar.gz: f9e95a0941a9160fc5b714d76bd5c3664c35ba67
 SHA512:
-  metadata.gz: 12a9685e601c9e08fea6294a5ae6467cc46e6d467e110a7dbf4f6448b178b0a130c4962d3e396046e3a2046379932ac81da47a2bce26cdb42ed897984abc13d9
-  data.tar.gz: 5d8d985bd4266d03b0b3a909a31f13c1121c12504618afe5a30f5eb0230284e651002caee6c90c381957dc515fd002f7555566ab6f1d04ef1a991089d25e6842
+  metadata.gz: 73835b202c7a7d5e0104cca153488d57bc3173f30efcb04cea4f0a277f4c522215de0e50dcbeab6cd4216987f794268b6e8fd852d4b62bdbdefd6793ad6878ff
+  data.tar.gz: 7590706f24a5ca82f2275dbeb361fe251223ccdb6797f959a9fbeb941c0f0b7d852958ca2e01586bdac2be10ccd33a2c4627c732b9e7aadc5ccdebf86b405be9

data/.gitbugtraq

@@ -0,0 +1,3 @@
+[bugtraq "pivotal"]
+  url = https://www.pivotaltracker.com/story/show/%BUGID%
+  logRegex = (\\b\\d{8}\\b)

data/.multirepo.lock

@@ -2,8 +2,8 @@
 - !ruby/object:MultiRepo::LockEntry
   name: git-multirepo-dummy
   id: e27695e9-e21d-4ad1-81b8-0ed587574c38
-  head: a2d5471317b1c8510f4b9fb69fb1904c88eec4f8
-  branch: master
+  head: 7b9066617b1fa03b3bf2daecf0d3aea92cf2606a
+  branch: 
 - !ruby/object:MultiRepo::LockEntry
   name: git-multirepo-dummy-dep1
   id: dcb567d6-7456-494a-b7b5-adc208a87f2f
@@ -17,5 +17,5 @@
 - !ruby/object:MultiRepo::LockEntry
   name: git-multirepo-migrations
   id: ad6472a5-7238-447f-a54e-50f50197e21e
-  head: 160b6a15d9bed989abbcf81d2a91cb4a226f4482
+  head: 15ee465101c368193a052cd1f5b0c5accc6fb9fa
   branch: master

data/.multirepo.meta

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

data/README.md

@@ -124,6 +124,7 @@ Here is a quick rundown of commands available to you in git-multirepo:
 | 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. |
+| merge | Performs a git merge on all dependencies and the main repo, in the proper order. |
 | open | Opens all dependencies in the current OS's file explorer. |
 | remove | Removes the specified dependency from multirepo. |
 | update | Force-updates the multirepo tracking files. |

data/git-multirepo.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   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"
+  spec.add_runtime_dependency "terminal-table", "~> 1.4.5"
 end

data/lib/git-multirepo.rb

@@ -1,2 +1,3 @@
-require "multirepo/hooks/pre-commit-hook.rb"
-require "multirepo/hooks/post-commit-hook.rb"
+require "multirepo/utility/console"
+require "multirepo/hooks/pre-commit-hook"
+require "multirepo/hooks/post-commit-hook"

data/lib/info.rb

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

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

@@ -32,11 +32,12 @@ module MultiRepo
       super
       ensure_in_work_tree
       
-      Console.log_step("Checking out #{@ref} and its dependencies...")
-      
       # Find out the checkout mode based on command-line options
       mode = RevisionSelector.mode_for_args(@checkout_latest, @checkout_exact)
       
+      strategy_name = RevisionSelectionMode.name_for_mode(mode)
+      Console.log_step("Checking out #{@ref} and its dependencies using the '#{strategy_name}' strategy...")
+      
       main_repo = Repo.new(".")
       
       unless proceed_if_merge_commit?(main_repo, @ref, mode)

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

@@ -26,7 +26,7 @@ module MultiRepo
     end
     
     def clean(repo_path)
-      Git.run_in_working_dir(repo_path, "clean -df", Runner::Verbosity::OUTPUT_ALWAYS)
+      GitRunner.run_in_working_dir(repo_path, "clean -df", Runner::Verbosity::OUTPUT_ALWAYS)
     end
   end
 end

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

@@ -1,7 +1,10 @@
+require "terminal-table"
+
 require "multirepo/utility/console" 
 require "multirepo/logic/node"
 require "multirepo/logic/revision-selector"
 require "multirepo/logic/performer"
+require "multirepo/logic/merge-descriptor"
 
 module MultiRepo
   class MergeCommand < Command
@@ -34,20 +37,25 @@ module MultiRepo
       ensure_in_work_tree
       ensure_multirepo_enabled
       
-      Console.log_step("Merging #{@ref} ...")
+      # Find out the checkout mode based on command-line options
+      mode = RevisionSelector.mode_for_args(@checkout_latest, @checkout_exact)
+      
+      strategy_name = RevisionSelectionMode.name_for_mode(mode)
+      Console.log_step("Merging #{@ref} with '#{strategy_name}' strategy...")
       
       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)
+        # Revert to the initial revision only if necessary
+        unless main_repo.current_branch == initial_revision || main_repo.head_hash == initial_revision
+          Console.log_substep("Restoring working copy to #{initial_revision}")
+          main_repo.checkout(initial_revision)
+        end
         raise e
       end
       
@@ -70,22 +78,34 @@ module MultiRepo
         raise MultiRepoException, "Dependencies are not clean; merge aborted"
       end
       
+      # Fetch repos to make sure we have the latest history in each.
+      # Fetching pre-checkout dependency repositories is sufficient because
+      # we make sure that the same dependencies are configured post-checkout.
+      Console.log_substep("Fetching repositories before proceeding with merge...")
+      main_repo.fetch
+      pre_checkout_config_entries.each { |e| e.repo.fetch }
+      
       # 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
+      # Auto-merge would be too complex to implement (due to lots of edge cases)
+      # 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:")
       
+      # Create a merge descriptor for each would-be merge
+      descriptors = []
       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")
+        descriptors.push(MergeDescriptor.new(config_entry.name, config_entry.path, revision))
       end
-      Console.log_info("[main repo]: Merge #{@ref} into current branch")
+      descriptors.push(MergeDescriptor.new("Main Repo", main_repo.path, @ref))
+            
+      # Log merge operations to the console before the fact
+      Console.log_warning("Merging would #{message_for_mode(mode, @ref)}:")
+      log_merges(descriptors)
       
       raise MultiRepoException, "Merge aborted" unless Console.ask_yes_no("Proceed?")
       
@@ -94,16 +114,8 @@ module MultiRepo
       # 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)
+      # Merge dependencies and the main repo
+      perform_merges(descriptors)
     end
     
     def ensure_dependencies_match(pre_checkout_config_entries, post_checkout_config_entries)
@@ -122,5 +134,33 @@ module MultiRepo
         raise MultiRepoException, "There are more dependencies in the specified ref, please merge manually"
       end
     end
+    
+    def log_merges(descriptors)
+      table = Terminal::Table.new do |t|
+        descriptors.reverse.each_with_index do |descriptor, index|
+          t.add_row [descriptor.name, "Merge '#{descriptor.revision}'"]
+          t.add_separator unless index == descriptors.count - 1
+        end
+      end
+      puts table
+    end
+    
+    def message_for_mode(mode, ref)
+      case mode
+      when RevisionSelectionMode::AS_LOCK
+        "merge specific commits as stored in the lock file for main repo revision #{ref}"
+      when RevisionSelectionMode::LATEST
+        "merge each branch as stored in the lock file of main repo revision #{ref}"
+      when RevisionSelectionMode::EXACT
+        "merge #{ref} for each repository, ignoring the contents of the lock file"
+      end
+    end
+    
+    def perform_merges(descriptors)
+      descriptors.each do |descriptor|
+        Console.log_substep("#{descriptor.name} : Merging #{descriptor.revision} into current branch...")
+        GitRunner.run_in_working_dir(descriptor.path, "merge #{descriptor.revision}", Runner::Verbosity::OUTPUT_ALWAYS)
+      end
+    end
   end
 end

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

@@ -16,20 +16,24 @@ module MultiRepo
       coder["url"] = @url
     end
     
-    def ==(entry)
-      entry_path = Pathname.new(entry.path)
-      self_path = Pathname.new(self.path)
-      entry_path.exist? && self_path.exist? && entry_path.realpath == self_path.realpath
-    end
-    
     def initialize(repo)
       @id = SecureRandom.uuid
       @path = repo.path
       @url = repo.exists? ? repo.remote('origin').url : nil
     end
     
+    def ==(entry)
+      entry_path = Pathname.new(entry.path)
+      self_path = Pathname.new(self.path)
+      entry_path.exist? && self_path.exist? && entry_path.realpath == self_path.realpath
+    end
+    
     def repo
       Repo.new(path)
     end
+    
+    def name
+      repo.basename
+    end
   end
 end

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

@@ -16,7 +16,7 @@ module MultiRepo
     end
     
     def initialize(config_entry)
-      @name = config_entry.repo.basename
+      @name = config_entry.name
       @id = config_entry.id
       @head = config_entry.repo.head_hash
       @branch = config_entry.repo.current_branch

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

@@ -1,7 +1,6 @@
 require "pathname"
 require "psych"
 
-require "multirepo/git/git"
 require_relative "tracking-file"
 require_relative "lock-entry"
 require_relative "config-file"

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

@@ -2,7 +2,6 @@ require "pathname"
 require "psych"
 
 require "info"
-require "multirepo/git/git"
 require_relative "tracking-file"
 require_relative "lock-entry"
 require_relative "config-file"

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

@@ -1,4 +1,4 @@
-require "multirepo/git/git"
+require "multirepo/git/git-runner"
 require_relative "meta-file"
 require_relative "lock-file"
 
@@ -13,20 +13,20 @@ module MultiRepo
     end
     
     def self.stage
-      Git.run_in_current_dir("add --force -- #{files_pathspec}", Runner::Verbosity::OUTPUT_ON_ERROR)
+      GitRunner.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::OUTPUT_NEVER)
+      output = GitRunner.run_in_current_dir("ls-files --modified --others -- #{files_pathspec}", Runner::Verbosity::OUTPUT_NEVER)
       files_are_untracked_or_modified = output.strip != ""
       
-      output = Git.run_in_current_dir("diff --name-only --cached -- #{files_pathspec}", Runner::Verbosity::OUTPUT_NEVER)
+      output = GitRunner.run_in_current_dir("diff --name-only --cached -- #{files_pathspec}", Runner::Verbosity::OUTPUT_NEVER)
       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
+      GitRunner.run_in_current_dir("commit -m \"#{message}\" --only -- #{files_pathspec}", Runner::Verbosity::OUTPUT_ON_ERROR) if must_commit
             
       return must_commit
     end

data/lib/multirepo/git/branch.rb

@@ -1,4 +1,4 @@
-require_relative "git"
+require_relative "git-runner"
 
 module MultiRepo
   class Branch
@@ -10,19 +10,19 @@ module MultiRepo
     end
 
     def exists?
-      lines = Git.run_in_working_dir(@repo.path, "branch", Runner::Verbosity::OUTPUT_NEVER).split("\n")
+      lines = GitRunner.run_in_working_dir(@repo.path, "branch", Runner::Verbosity::OUTPUT_NEVER).split("\n")
       branch_names = lines.map { |line| line.tr("* ", "")}
       branch_names.include?(@name)
     end
 
     def create(remote_tracking = false)
-      Git.run_in_working_dir(@repo.path, "branch #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
-      Git.run_in_working_dir(@repo.path, "push -u origin #{name}", Runner::Verbosity::OUTPUT_ON_ERROR) if remote_tracking
+      GitRunner.run_in_working_dir(@repo.path, "branch #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
+      GitRunner.run_in_working_dir(@repo.path, "push -u origin #{name}", Runner::Verbosity::OUTPUT_ON_ERROR) if remote_tracking
     end
     
     def checkout
-      Git.run_in_working_dir(@repo.path, "checkout #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
-      Git.last_command_succeeded
+      GitRunner.run_in_working_dir(@repo.path, "checkout #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
+      GitRunner.last_command_succeeded
     end
   end
 end

data/lib/multirepo/git/commit.rb

@@ -1,4 +1,4 @@
-require_relative "git"
+require_relative "git-runner"
 
 module MultiRepo
   class Commit
@@ -10,7 +10,7 @@ module MultiRepo
     end
 
     def is_merge?
-      lines = Git.run_in_working_dir(@repo.path, "cat-file -p #{@ref}", Runner::Verbosity::OUTPUT_NEVER).split("\n")
+      lines = GitRunner.run_in_working_dir(@repo.path, "cat-file -p #{@ref}", Runner::Verbosity::OUTPUT_NEVER).split("\n")
       parents = lines.grep(/^parent /)
       return parents.count > 1
     end

data/lib/multirepo/git/{git.rb → git-runner.rb}

@@ -1,9 +1,8 @@
 require "multirepo/utility/runner"
-require "multirepo/git/git"
 require "multirepo/config"
 
 module MultiRepo
-  class Git
+  class GitRunner
     class << self
       attr_accessor :last_command_succeeded
     end

data/lib/multirepo/git/remote.rb

@@ -1,4 +1,4 @@
-require_relative "git"
+require_relative "git-runner"
 
 module MultiRepo
   class Remote
@@ -10,7 +10,7 @@ module MultiRepo
     end
     
     def url
-      output = Git.run_in_working_dir(@repo.path, "config --get remote.#{@name}.url", Runner::Verbosity::OUTPUT_NEVER).strip
+      output = GitRunner.run_in_working_dir(@repo.path, "config --get remote.#{@name}.url", Runner::Verbosity::OUTPUT_NEVER).strip
       return output == "" ? nil : output
     end
   end

data/lib/multirepo/git/repo.rb

@@ -17,25 +17,25 @@ module MultiRepo
     
     def exists?
       return false unless Dir.exist?("#{@path}/.git")
-      return Git.run_in_working_dir(@path, "rev-parse --is-inside-work-tree", Runner::Verbosity::OUTPUT_NEVER).strip == "true"
+      return GitRunner.run_in_working_dir(@path, "rev-parse --is-inside-work-tree", Runner::Verbosity::OUTPUT_NEVER).strip == "true"
     end
     
     def head_born?
-      result = Git.run_in_working_dir(@path, "rev-parse HEAD --", Runner::Verbosity::OUTPUT_NEVER).strip
+      result = GitRunner.run_in_working_dir(@path, "rev-parse HEAD --", Runner::Verbosity::OUTPUT_NEVER).strip
       return !result.start_with?("fatal: bad revision")
     end
     
     def current_branch
-      branch = Git.run_in_working_dir(@path, "rev-parse --abbrev-ref HEAD", Runner::Verbosity::OUTPUT_NEVER).strip
+      branch = GitRunner.run_in_working_dir(@path, "rev-parse --abbrev-ref HEAD", Runner::Verbosity::OUTPUT_NEVER).strip
       branch != "HEAD" ? branch : nil
     end
     
     def head_hash
-      Git.run_in_working_dir(@path, "rev-parse HEAD", Runner::Verbosity::OUTPUT_NEVER).strip
+      GitRunner.run_in_working_dir(@path, "rev-parse HEAD", Runner::Verbosity::OUTPUT_NEVER).strip
     end
     
     def changes
-      output = Git.run_in_working_dir(@path, "status --porcelain", Runner::Verbosity::OUTPUT_NEVER)
+      output = GitRunner.run_in_working_dir(@path, "status --porcelain", Runner::Verbosity::OUTPUT_NEVER)
       lines = output.split("\n").each{ |f| f.strip }.delete_if{ |f| f == "" }
       lines.map { |l| Change.new(l) }
     end
@@ -47,17 +47,17 @@ module MultiRepo
     # Operations
     
     def fetch
-      Git.run_in_working_dir(@path, "fetch --progress", Runner::Verbosity::OUTPUT_ALWAYS)
+      GitRunner.run_in_working_dir(@path, "fetch --prune --progress", Runner::Verbosity::OUTPUT_ALWAYS)
       Runner.last_command_succeeded
     end
     
     def clone(url)
-      Git.run_in_current_dir("clone #{url} #{@path} --progress", Runner::Verbosity::OUTPUT_ALWAYS)
+      GitRunner.run_in_current_dir("clone #{url} #{@path} --progress", Runner::Verbosity::OUTPUT_ALWAYS)
       Runner.last_command_succeeded
     end
     
     def checkout(ref)
-      Git.run_in_working_dir(@path, "checkout #{ref}", Runner::Verbosity::OUTPUT_ON_ERROR)
+      GitRunner.run_in_working_dir(@path, "checkout #{ref}", Runner::Verbosity::OUTPUT_ON_ERROR)
       Runner.last_command_succeeded
     end
     

data/lib/multirepo/logic/merge-descriptor.rb

@@ -0,0 +1,13 @@
+module MultiRepo
+  class MergeDescriptor
+    attr_accessor :name
+    attr_accessor :path
+    attr_accessor :revision
+    
+    def initialize(name, path, revision)
+      @name = name
+      @path = path
+      @revision = revision
+    end
+  end
+end

data/lib/multirepo/logic/performer.rb

@@ -38,6 +38,10 @@ module MultiRepo
       ordered_pairs.each { |pair| operation.call(pair.config_entry, pair.lock_entry) }
     end
     
+    def self.dependencies
+      
+    end
+    
     private
     
     def self.build_config_lock_pairs(config_entries, lock_entries)

data/lib/multirepo/logic/revision-selector.rb

@@ -3,6 +3,14 @@ module MultiRepo
     AS_LOCK = 0
     LATEST = 1
     EXACT = 2
+    
+    def self.name_for_mode(mode)
+      case mode
+      when AS_LOCK; "as-lock"
+      when LATEST; "latest"
+      when EXACT; "exact"
+      end
+    end
   end
   
   class RevisionSelector

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta37
+  version: 1.0.0.beta38
 platform: ruby
 authors:
 - Michaël Fortin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,6 +100,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.6
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.5
 description: Track multiple Git repositories side-by-side.
 email:
 - fortinmike@irradiated.net
@@ -109,6 +123,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitattributes
+- .gitbugtraq
 - .gitignore
 - .multirepo
 - .multirepo.lock
@@ -154,11 +169,12 @@ files:
 - lib/multirepo/git/branch.rb
 - lib/multirepo/git/change.rb
 - lib/multirepo/git/commit.rb
-- lib/multirepo/git/git.rb
+- lib/multirepo/git/git-runner.rb
 - lib/multirepo/git/remote.rb
 - lib/multirepo/git/repo.rb
 - lib/multirepo/hooks/post-commit-hook.rb
 - lib/multirepo/hooks/pre-commit-hook.rb
+- lib/multirepo/logic/merge-descriptor.rb
 - lib/multirepo/logic/node.rb
 - lib/multirepo/logic/performer.rb
 - lib/multirepo/logic/revision-selector.rb