git-multirepo 1.0.0.beta25 → 1.0.0.beta27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a892d79d4a76abc916a7fd0b405cddd1a7c38630
-  data.tar.gz: 0711b638dbed22d2b290a28891285c1192db1f3d
+  metadata.gz: 5bb3f5f11d1a761f838c22310b15316f20fa36a5
+  data.tar.gz: 6e1328bda9bd15b3d53209165baf7df8a407abb6
 SHA512:
-  metadata.gz: 20ed86eee694b2f3803c8665ea2e2649660b4eb7b43deb86f7b3564299deff9004f5d3fe69c3e17b04a5720c5a7de17031f668320054813f44bfc810b5f889f9
-  data.tar.gz: f9830b8ef378ccfebd1eefacff32beb6fadccfba436fc7db849aa77813de7bce39f93b5699ac8391e081222930cb20ed60587f2db86f30a1f447ea33239638d8
+  metadata.gz: d15869a01d986fd658f4316a5bcb8d69feb9f3871022a7f7c5c14ceaf15e60cb4cfdce47d40e865ab5c656abad52a324e690abdf7dbe6bd67519e057d3a04254
+  data.tar.gz: 452bfdeee8784b80aa982d5e7f9f7e5313e643c3842616fa5427136645db1c4f0c36de3dbf38fec6a71bb32da539e04b487bbeb777d9b58642ba1ce70897f6b7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-multirepo (0.0.1)
+    git-multirepo (1.0.0.beta25)
       claide (~> 0.8, >= 0.8.0)
       colored (~> 1.2)
       os (~> 0.9.6)
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    claide (0.8.0)
+    claide (0.8.1)
     colored (1.2)
     diff-lcs (1.2.5)
     os (0.9.6)
@@ -29,6 +29,7 @@ GEM
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
   bundler (~> 1.7)

data/lib/info.rb

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

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

@@ -22,7 +22,7 @@ module MultiRepo
     
     def run
       validate_in_work_tree
-      ensure_multirepo_initialized
+      ensure_multirepo_enabled
       ensure_repo_valid
       
       entry = ConfigEntry.new(Repo.new(@path))

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

@@ -1,5 +1,6 @@
 require "multirepo/utility/console"
 require "multirepo/files/config-file"
+require "multirepo/files/lock-file"
 
 module MultiRepo
   class BranchCommand < Command
@@ -28,10 +29,10 @@ module MultiRepo
     
     def run
       validate_in_work_tree
-      ensure_multirepo_initialized
-      
-      Console.log_step("Branching and checking out #{@branch_name}...")
+      ensure_multirepo_enabled
       
+      Console.log_step("Branching...")
+
       main_repo = main_repo = Repo.new(".")
       repos = ConfigFile.load.map{ |entry| entry.repo }.push(main_repo)
       
@@ -40,11 +41,17 @@ module MultiRepo
       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)

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

@@ -34,7 +34,7 @@ module MultiRepo
     
     def run
       validate_in_work_tree
-      ensure_multirepo_initialized
+      ensure_multirepo_enabled
       
       Console.log_step("Checking out #{@ref} and its dependencies...")
       
@@ -51,7 +51,7 @@ module MultiRepo
       initial_revision = main_repo.current_branch || main_repo.head_hash
       
       main_repo_checkout_step(main_repo, initial_revision, @ref)
-      ensure_dependencies_clean_step(initial_revision)
+      ensure_dependencies_clean_step(main_repo, initial_revision)
       dependencies_checkout_step(mode, @ref)
       
       Console.log_step("Done!")
@@ -73,13 +73,13 @@ module MultiRepo
       Console.log_substep("Checked out main repo #{ref}")
       
       # After checkout, make sure we're working with a multirepo-enabled ref
-      unless Utils.is_multirepo_enabled(".")
+      unless Utils.is_multirepo_tracked(".")
         main_repo.checkout(initial_revision)
-        raise MultiRepoException, "This revision is not managed by multirepo. Checkout reverted."
+        raise MultiRepoException, "This revision is not tracked by multirepo. Checkout reverted."
       end
     end
     
-    def ensure_dependencies_clean_step(initial_revision)
+    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."

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

@@ -50,9 +50,9 @@ module MultiRepo
       
       Console.log_substep("Checked out main repo #{@ref}")
       
-      # Make sure the ref we just checked out is multirepo-enabled
-      unless Utils.is_multirepo_enabled(main_repo_path)
-        raise MultiRepoException, "Ref #{@ref} is not multirepo-enabled"
+      # Make sure the ref we just checked out is tracked by multirepo
+      unless Utils.is_multirepo_tracked(main_repo_path)
+        raise MultiRepoException, "Ref #{@ref} is not tracked by multirepo"
       end
       
       # Install

data/lib/multirepo/commands/command.rb

@@ -30,7 +30,7 @@ module MultiRepo
     
     def install_hooks_in_multirepo_enabled_dependencies
       # Install the local git hooks in dependency repos
-      # if they are themselves tracked with multirepo
+      # if they are themselves multirepo-enabled
       ConfigFile.load.each do |entry|
         if Utils.is_multirepo_enabled(entry.repo.path)
           install_hooks(entry.repo.path)
@@ -52,8 +52,12 @@ module MultiRepo
       File.delete(".git/hooks/post-merge")
     end
     
-    def ensure_multirepo_initialized
+    def ensure_multirepo_enabled
       raise MultiRepoException, "multirepo is not initialized in this repository." unless Utils.is_multirepo_enabled(".")
     end
+
+    def ensure_multirepo_tracked
+      raise MultiRepoException, "This revision is not tracked by multirepo." unless Utils.is_multirepo_tracked(".")
+    end
   end
 end

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

@@ -7,7 +7,7 @@ module MultiRepo
     
     def run
       validate_in_work_tree
-      ensure_multirepo_initialized
+      ensure_multirepo_enabled
       
       Console.log_step("Fetching dependencies...")
       

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

@@ -19,7 +19,7 @@ module MultiRepo
         
     def run
       validate_in_work_tree
-      ensure_multirepo_initialized
+      ensure_multirepo_tracked
       
       if @hooks
         Console.log_step("Installing hooks in main repo and all dependencies...")

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

@@ -10,7 +10,7 @@ module MultiRepo
     
     def run
       validate_in_work_tree
-      ensure_multirepo_initialized
+      ensure_multirepo_enabled
       
       ConfigFile.load.each do |entry|
         if OS.osx?

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

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

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

@@ -7,7 +7,6 @@ module MultiRepo
     
     def run
       validate_in_work_tree
-      ensure_multirepo_initialized
       
       File.delete(".multirepo")
       File.delete(".multirepo.lock")

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

@@ -20,7 +20,7 @@ module MultiRepo
 
     def run
       validate_in_work_tree
-      ensure_multirepo_initialized
+      ensure_multirepo_enabled
       
       Console.log_step("Updating...")
       

data/lib/multirepo/utility/console.rb

@@ -46,7 +46,7 @@ module MultiRepo
     end
     
     def self.print_prefix
-      print $stdout.isatty ? "> ".white : "multirepo: "
+      print $stdout.isatty ? "> ".white : "[multirepo] "
     end
   end
 end

data/lib/multirepo/utility/utils.rb

@@ -8,8 +8,11 @@ module MultiRepo
     end
     
     def self.is_multirepo_enabled(path)
-      File.exists?(File.join(path, ".multirepo")) &&
-      File.exists?(File.join(path, ".multirepo.lock"))
+      File.exists?(File.join(path, ".multirepo"))
+    end
+
+    def self.is_multirepo_tracked(path)
+      is_multirepo_enabled(path) && File.exists?(File.join(path, ".multirepo.lock"))
     end
     
     def self.install_hook(name, path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta25
+  version: 1.0.0.beta27
 platform: ruby
 authors:
 - Michaël Fortin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler