git-multirepo 1.0.0.beta50 → 1.0.0.beta51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96d1c4b54b0bc863b77d19b003b57b427c43a228
-  data.tar.gz: 1c7ccd22b0b03c32dccae18f0fc21ecd523e92d4
+  metadata.gz: f69d3b2b70a1a87eaf12962cb4d324f62368e5e5
+  data.tar.gz: 8ff1400b4b192b6ebd80077005f01983baf2691c
 SHA512:
-  metadata.gz: 22d584973f5eadf073e03a3767a72700fc8a1ec9390ba4578ff3cd9a2898fe4624245c703ae90aa0bcd75b919ae2de13df626d40d36230c61df893885bd57394
-  data.tar.gz: 6f5aab921c711670f41a317783624e024c067c657aeba5393671b0119777401d54fb484cf29312e71612cbe0d3510ffdf734edb6c14ad7077b310a61faae17b7
+  metadata.gz: 8003b60e23ec40811e2946958285c637aef6ccd537f884912f165a4c142fb49ab147916d653f27138aa18e714bfb9bb63c6a50a674c5cb404af5ae9db35498c5
+  data.tar.gz: 493424da5709a8404eb17541accbb49c1d5ed1bce257407e0a1d2ee3c93c551353c9af2b150c502ee47e63ad89f680b1d40ddd2f7c5bf228344bd2dba9b1bb6b

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 To install betas run `[sudo] gem install git-multirepo --pre`
 
+## 1.0.0.beta51
+
+- **Enhancement:** `multi merge` now shows a lock file diff if the user chooses to perform an update after the merge operation
+- **Enhancement:** `multi merge` now uses the same update logic as `multi update` for more robustness and uniformity
+- **Enhancement:** `multi update` has a new `--no-diff` option to skip lock file diffing and shows diff by default
+- **Bug Fix:** `multi update` did not show the lock file diff when the `--commit` flag was specified
+- **Internals:** `multi update`, `multi do` and `multi open` now use common repo-selection logic (--deps, --main, etc.)
+
+## 1.0.0.beta50
+
+- **Enhancement:** `multi merge` now asks to update the main repo lock file after a merge (useful for CI scenarios)
+- **Enhancement:** `multi update` now asks to show a lock file diff if the main repo's lock file was modified
+- **Enhancement:** Checking out the main repo in floating HEAD to prevent unnecessary local branch creation in `multi merge`
+
 ## 1.0.0.beta49
 
 - **Enhancement:** Added --deps, --main and --all flags to `multi update` and update all by default

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

@@ -1,4 +1,5 @@
 require "multirepo/utility/console"
+require "multirepo/utility/utils"
 require "multirepo/logic/revision-selector"
 require "multirepo/logic/performer"
 
@@ -25,7 +26,7 @@ module MultiRepo
     def validate!
       super
       help! "You must specify a branch or commit id to checkout" unless @ref_name
-      unless validate_only_one_flag(@checkout_latest, @checkout_exact)
+      unless Utils.only_one_true?(@checkout_latest, @checkout_exact)
         help! "You can't provide more than one operation modifier (--latest, --exact, etc.)"
       end
     end
@@ -36,7 +37,7 @@ module MultiRepo
       # 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)
+      strategy_name = RevisionSelection.name_for_mode(mode)
       Console.log_step("Checking out #{@ref_name} and its dependencies using the '#{strategy_name}' strategy...")
       
       main_repo = Repo.new(".")
@@ -87,11 +88,11 @@ module MultiRepo
       return true unless main_repo.ref(ref_name).merge_commit?
       
       case mode
-      when RevisionSelectionMode::AS_LOCK
+      when RevisionSelection::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 RevisionSelectionMode::LATEST
+      when RevisionSelection::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

data/lib/multirepo/commands/command.rb

@@ -65,10 +65,6 @@ module MultiRepo
     def multirepo_enabled_dependencies
       ConfigFile.new(".").load_entries.select { |e| Utils.multirepo_enabled?(e.repo.path) }
     end
-
-    def validate_only_one_flag(*flags)
-      flags.reduce(0) { |count, flag| count += 1 if flag; count } <= 1
-    end
     
     def ensure_in_work_tree
       repo = Repo.new(".")

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

@@ -1,10 +1,11 @@
 require_relative "command"
-require "multirepo/utility/utils"
 require "multirepo/utility/console"
+require "multirepo/utility/utils"
 require "multirepo/files/config-file"
 require "multirepo/git/repo"
 require "multirepo/git/git-runner"
 require "multirepo/logic/performer"
+require "multirepo/logic/repo-selection"
 
 module MultiRepo
   class DoCommand < Command
@@ -22,18 +23,14 @@ module MultiRepo
     
     def initialize(argv)
       @operation = argv.shift_argument
-      @all = argv.flag?("all")
-      @main_only = argv.flag?("main")
-      @deps_only = argv.flag?("deps")
+      @repo_selection = RepoSelection.new(argv)
       super
     end
 
     def validate!
       super
       help! "You must provide a git operation to perform" unless @operation
-      unless validate_only_one_flag(@all, @main_only, @deps_only)
-        help! "You can't provide more than one operation modifier (--deps, --main, etc.)"
-      end
+      help! "You can't provide more than one operation modifier (--deps, --main, etc.)" unless @repo_selection.valid?
     end
     
     def run
@@ -43,13 +40,14 @@ module MultiRepo
       @operation = @operation.sub(/^git /, "")
       
       success = true
-      if @main_only
+      case @repo_selection.value
+      when RepoSelection::MAIN
         confirm_main_repo_operation
         success &= perform_operation_on_main(@operation)
-      elsif @deps_only
+      when RepoSelection::DEPS
         confirm_dependencies_operation
         success &= perform_operation_on_dependencies(@operation)
-      else
+      when RepoSelection::ALL
         confirm_main_repo_operation
         confirm_dependencies_operation
         success &= perform_operation_on_dependencies(@operation) # Ordered dependencies first

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

@@ -21,7 +21,7 @@ module MultiRepo
     
     def validate!
       super
-      unless validate_only_one_flag(@version, @tracked)
+      unless Utils.only_one_true?(@version, @tracked)
         help! "You can't provide more than one operation modifier (--version, --tracked, etc.)"
       end
     end

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

@@ -26,7 +26,7 @@ module MultiRepo
     
     def validate!
       super
-      unless validate_only_one_flag(@hooks, @ci)
+      unless Utils.only_one_true?(@hooks, @ci)
         help! "You can't provide more than one operation modifier (--hooks, --ci, etc.)"
       end
     end
@@ -94,7 +94,7 @@ module MultiRepo
       
       # Checkout the appropriate branches as specified in the lock file
       checkout_command = CheckoutCommand.new(CLAide::ARGV.new([]))
-      mode = @ci ? RevisionSelectionMode::AS_LOCK : RevisionSelectionMode::LATEST
+      mode = @ci ? RevisionSelection::AS_LOCK : RevisionSelection::LATEST
       checkout_command.dependencies_checkout_step(mode)
     end
     

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

@@ -1,11 +1,14 @@
 require "terminal-table"
 
-require "multirepo/utility/console" 
+require "multirepo/utility/console"
+require "multirepo/utility/utils"
 require "multirepo/logic/node"
 require "multirepo/logic/revision-selector"
+require "multirepo/logic/repo-selection"
 require "multirepo/logic/performer"
 require "multirepo/logic/merge-descriptor"
 require "multirepo/files/tracking-files"
+require "multirepo/commands/update-command"
 
 module MultiRepo
   class MergeValidationResult
@@ -39,7 +42,7 @@ module MultiRepo
     def validate!
       super
       help! "You must specify a ref to merge" unless @ref_name
-      unless validate_only_one_flag(@checkout_latest, @checkout_exact)
+      unless Utils.only_one_true?(@checkout_latest, @checkout_exact)
         help! "You can't provide more than one operation modifier (--latest, --exact, etc.)"
       end
     end
@@ -51,7 +54,7 @@ module MultiRepo
       # 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)
+      strategy_name = RevisionSelection.name_for_mode(mode)
       Console.log_step("Merging #{@ref_name} with '#{strategy_name}' strategy...")
       
       main_repo = Repo.new(".")
@@ -222,26 +225,23 @@ module MultiRepo
     
     def ask_tracking_files_update(all_merges_succeeded)
       unless all_merges_succeeded
-        Console.log_warning("Perform a manual update using 'multi update' after resolving merge conflicts")
+        Console.log_warning("Perform a 'multi update' after resolving merge conflicts to ensure lock file contents are valid")
         return
       end
       
-      return unless Console.ask("Update main repo tracking files (important for continuous integration)?")
+      return unless Console.ask("Update main repo tracking files? (important for continuous integration)")
       
-      tracking_files = TrackingFiles.new(".")
-      tracking_files.update
-      tracking_files.commit("[multirepo] Post-merge tracking files update")
-      
-      Console.log_info("Updated and committed tracking files in the main repo")
+      update_command = UpdateCommand.new(CLAide::ARGV.new(["--commit", "--diff"]))
+      update_command.update_tracking_files_step(RepoSelection::MAIN)
     end
     
     def message_for_mode(mode, ref_name)
       case mode
-      when RevisionSelectionMode::AS_LOCK
+      when RevisionSelection::AS_LOCK
         "merge specific commits as stored in the lock file for main repo revision #{ref_name}"
-      when RevisionSelectionMode::LATEST
+      when RevisionSelection::LATEST
         "merge each branch as stored in the lock file of main repo revision #{ref_name}"
-      when RevisionSelectionMode::EXACT
+      when RevisionSelection::EXACT
         "merge #{ref_name} for each repository, ignoring the contents of the lock file"
       end
     end

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

@@ -2,6 +2,7 @@ require "os"
 
 require "multirepo/utility/console"
 require "multirepo/utility/utils"
+require "multirepo/logic/repo-selection"
 
 module MultiRepo
   class OpenCommand < Command
@@ -17,28 +18,25 @@ module MultiRepo
     end
     
     def initialize(argv)
-      @all = argv.flag?("all")
-      @main_only = argv.flag?("main")
-      @deps_only = argv.flag?("deps")
+      @repo_selection = RepoSelection.new(argv)
       super
     end
 
     def validate!
       super
-      unless validate_only_one_flag(@all, @main_only, @deps_only)
-        help! "You can't provide more than one operation modifier (--deps, --main, etc.)"
-      end
+      help! "You can't provide more than one operation modifier (--deps, --main, etc.)" unless @repo_selection.valid?
     end
     
     def run
       ensure_in_work_tree
       ensure_multirepo_enabled
       
-      if @main_only
+      case @repo_selection.value
+      when RepoSelection::MAIN
         open_main
-      elsif @deps_only
+      when RepoSelection::DEPS
         open_dependencies
-      else
+      when RepoSelection::ALL
         open_dependencies
         open_main
       end

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

@@ -1,5 +1,7 @@
 require "multirepo/utility/console"
+require "multirepo/utility/utils"
 require "multirepo/logic/performer"
+require "multirepo/logic/repo-selection"
 require "multirepo/files/tracking-files"
 require "multirepo/git/git-runner"
 
@@ -14,24 +16,22 @@ module MultiRepo
         ['[--main]', 'Update the main repository.'],
         ['[--deps]', 'Update dependencies.'],
         ['[--force]', 'Update the tracking files even if dependencies contain uncommitted changes.'],
-        ['[--commit]', 'Commit the tracking files after updating them.']
+        ['[--commit]', 'Commit the tracking files after updating them.'],
+        ['[--no-diff]', 'Don\'t show lock file diff(s) after updating.']
       ].concat(super)
     end
     
     def initialize(argv)
-      @all = argv.flag?("all")
-      @main_only = argv.flag?("main")
-      @deps_only = argv.flag?("deps")
+      @repo_selection = RepoSelection.new(argv)
       @commit = argv.flag?("commit")
       @force = argv.flag?("force")
+      @diff = argv.flag?("diff", true)
       super
     end
 
     def validate!
       super
-      unless validate_only_one_flag(@all, @main_only, @deps_only)
-        help! "You can't provide more than one operation modifier (--deps, --main, etc.)"
-      end
+      help! "You can't provide more than one operation modifier (--deps, --main, etc.)" unless @repo_selection.valid?
     end
 
     def run
@@ -40,7 +40,7 @@ module MultiRepo
       
       dependencies_clean = Utils.dependencies_clean?(ConfigFile.new(".").load_entries)
       if dependencies_clean || @force
-        update_tracking_files_step
+        update_tracking_files_step(@repo_selection.value)
       else
         fail MultiRepoException, "Can't update because not all dependencies are clean"
       end
@@ -48,21 +48,19 @@ module MultiRepo
       Console.log_step("Done!")
     end
     
-    def update_tracking_files_step
-      main_changed = false
-      if @main_only
+    def update_tracking_files_step(repo_selection_value)
+      case repo_selection_value
+      when RepoSelection::MAIN
         Console.log_step("Updating main repo...")
-        main_changed = update_main
-      elsif @deps_only
+        update_main
+      when RepoSelection::DEPS
         Console.log_step("Updating dependencies...")
         update_dependencies
-      else
+      when RepoSelection::ALL
         Console.log_step("Updating main repo and dependencies...")
         update_dependencies
-        main_changed = update_main
+        update_main
       end
-
-      show_diff(".") if main_changed && Console.ask("Show diff?")
     end
 
     def update_dependencies
@@ -70,13 +68,20 @@ module MultiRepo
       Performer.dependencies.each do |dependency|
         path = dependency.config_entry.path
         name = dependency.config_entry.name
-        any_changed |= update_tracking_files(path, name) if Utils.multirepo_enabled?(path)
+        any_changed |= update_one(path, name) if Utils.multirepo_enabled?(path)
       end
       return any_changed
     end
 
     def update_main
-      return update_tracking_files(".", "main repo")
+      update_one(".", "main repo")
+    end
+
+    def update_one(path, name)
+      updated = update_tracking_files(path, name)
+      show_diff(path) if updated && @diff
+      commit_tracking_files(path) if @commit
+      return updated
     end
     
     def update_tracking_files(path, name)
@@ -91,14 +96,15 @@ module MultiRepo
         Console.log_info("Tracking files are already up-to-date")
       end
       
-      if @commit
-        committed = tracking_files.commit("[multirepo] Updated tracking files manually")
-        Console.log_info("Committed tracking files") if committed
-      end
-
       return changed
     end
 
+    def commit_tracking_files(path)
+      tracking_files = TrackingFiles.new(path)
+      committed = tracking_files.commit("[multirepo] Updated tracking files manually")
+      Console.log_info("Committed tracking files") if committed
+    end
+
     def show_diff(path)
       GitRunner.run_as_system(path, "diff .multirepo.lock")
     end

data/lib/multirepo/info.rb

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

data/lib/multirepo/logic/repo-selection.rb

@@ -0,0 +1,25 @@
+require "multirepo/utility/utils"
+
+module MultiRepo
+  class RepoSelection
+    ALL = 0
+    MAIN = 1
+    DEPS = 2
+
+    def initialize(argv)
+    	@main = argv.flag?("main")
+		  @deps = argv.flag?("deps")
+		  @all = argv.flag?("all")
+    end
+
+    def valid?
+      Utils.only_one_true?(@main, @deps, @all)
+    end
+
+    def value
+    	return MAIN if @main
+    	return DEPS if @deps
+    	return ALL # Default if unspecified
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module MultiRepo
+  class RevisionSelection
+    AS_LOCK = 0
+    LATEST = 1
+    EXACT = 2
+    
+    def self.name_for_mode(mode)
+      case mode
+      when AS_LOCK then "as-lock"
+      when LATEST then "latest"
+      when EXACT then "exact"
+      end
+    end
+  end
+end

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

@@ -1,34 +1,22 @@
+require_relative "revision-selection"
+
 module MultiRepo
-  class RevisionSelectionMode
-    AS_LOCK = 0
-    LATEST = 1
-    EXACT = 2
-    
-    def self.name_for_mode(mode)
-      case mode
-      when AS_LOCK then "as-lock"
-      when LATEST then "latest"
-      when EXACT then "exact"
-      end
-    end
-  end
-  
   class RevisionSelector
     def self.mode_for_args(checkout_latest, checkout_exact)
       if checkout_latest
-        RevisionSelectionMode::LATEST
+        RevisionSelection::LATEST
       elsif checkout_exact
-        RevisionSelectionMode::EXACT
+        RevisionSelection::EXACT
       else
-        RevisionSelectionMode::AS_LOCK
+        RevisionSelection::AS_LOCK
       end
     end
     
     def self.revision_for_mode(mode, ref_name, lock_entry)
       case mode
-      when RevisionSelectionMode::AS_LOCK then lock_entry.head
-      when RevisionSelectionMode::LATEST then lock_entry.branch
-      when RevisionSelectionMode::EXACT then ref_name
+      when RevisionSelection::AS_LOCK then lock_entry.head
+      when RevisionSelection::LATEST then lock_entry.branch
+      when RevisionSelection::EXACT then ref_name
       end
     end
   end

data/lib/multirepo/utility/utils.rb

@@ -3,6 +3,10 @@ require "fileutils"
 
 module MultiRepo
   class Utils
+    def self.only_one_true?(*flags)
+      flags.reduce(0) { |count, flag| count += 1 if flag; count } <= 1
+    end
+
     def self.path_for_resource(resource_name)
       gem_path = Gem::Specification.find_by_name("git-multirepo").gem_dir
       File.join(gem_path, "resources/#{resource_name}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta50
+  version: 1.0.0.beta51
 platform: ruby
 authors:
 - Michaël Fortin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,6 +197,8 @@ files:
 - lib/multirepo/logic/merge-descriptor.rb
 - lib/multirepo/logic/node.rb
 - lib/multirepo/logic/performer.rb
+- lib/multirepo/logic/repo-selection.rb
+- lib/multirepo/logic/revision-selection.rb
 - lib/multirepo/logic/revision-selector.rb
 - lib/multirepo/multirepo-exception.rb
 - lib/multirepo/utility/console.rb