git-multirepo 1.0.0.beta42 → 1.0.0.beta43

data/lib/multirepo/hooks/post-commit-hook.rb

@@ -1,23 +1,23 @@
-require "multirepo/files/config-file"
-require "multirepo/files/tracking-files"
-require "multirepo/utility/utils"
-require "multirepo/utility/console"
-
-module MultiRepo
-  class PostCommitHook
-    def self.run
-      Config.instance.running_git_hook = true
-      
-      Console.log_step("Performing post-commit operations...")
-      
-      # Works around bug #91565510 (https://www.pivotaltracker.com/story/show/91565510)
-      TrackingFiles.new(".").stage
-      Console.log_info("Cleaned-up staging area")
-      
-      exit 0
-    rescue StandardError => e
-      Console.log_error("Post-commit hook failed to execute! #{e.message}")
-      exit 1
-    end
-  end
+require "multirepo/files/config-file"
+require "multirepo/files/tracking-files"
+require "multirepo/utility/utils"
+require "multirepo/utility/console"
+
+module MultiRepo
+  class PostCommitHook
+    def self.run
+      Config.instance.running_git_hook = true
+      
+      Console.log_step("Performing post-commit operations...")
+      
+      # Works around bug #91565510 (https://www.pivotaltracker.com/story/show/91565510)
+      TrackingFiles.new(".").stage
+      Console.log_info("Cleaned-up staging area")
+      
+      exit 0
+    rescue StandardError => e
+      Console.log_error("Post-commit hook failed to execute! #{e.message}")
+      exit 1
+    end
+  end
 end

data/lib/multirepo/hooks/pre-commit-hook.rb

@@ -1,35 +1,35 @@
-require "multirepo/files/config-file"
-require "multirepo/files/tracking-files"
-require "multirepo/utility/utils"
-require "multirepo/utility/console"
-
-module MultiRepo
-  class PreCommitHook
-    def self.run
-      Config.instance.running_git_hook = true
-      
-      Console.log_step("Performing pre-commit operations...")
-      
-      dependencies_clean = Utils.dependencies_clean?(ConfigFile.new(".").load_entries)
-      
-      unless dependencies_clean
-        Console.log_error("You must commit changes to your dependencies before you can commit this repo")
-        exit 1
-      end
-      
-      tracking_files = TrackingFiles.new(".")
-      tracking_files.update
-      tracking_files.stage
-      
-      Console.log_info("Updated and staged tracking files")
-      
-      exit 0
-    rescue MultiRepoException => e
-      Console.log_error("Can't perform commit. #{e.message}")
-      exit 1
-    rescue StandardError => e
-      Console.log_error("Pre-commit hook failed to execute! #{e.message}")
-      exit 1
-    end
-  end
+require "multirepo/files/config-file"
+require "multirepo/files/tracking-files"
+require "multirepo/utility/utils"
+require "multirepo/utility/console"
+
+module MultiRepo
+  class PreCommitHook
+    def self.run
+      Config.instance.running_git_hook = true
+      
+      Console.log_step("Performing pre-commit operations...")
+      
+      dependencies_clean = Utils.dependencies_clean?(ConfigFile.new(".").load_entries)
+      
+      unless dependencies_clean
+        Console.log_error("You must commit changes to your dependencies before you can commit this repo")
+        exit 1
+      end
+      
+      tracking_files = TrackingFiles.new(".")
+      tracking_files.update
+      tracking_files.stage
+      
+      Console.log_info("Updated and staged tracking files")
+      
+      exit 0
+    rescue MultiRepoException => e
+      Console.log_error("Can't perform commit. #{e.message}")
+      exit 1
+    rescue StandardError => e
+      Console.log_error("Pre-commit hook failed to execute! #{e.message}")
+      exit 1
+    end
+  end
 end

data/lib/multirepo/logic/dependency.rb

@@ -1,6 +1,6 @@
-module MultiRepo
-  class Dependency
-    attr_accessor :config_entry
-    attr_accessor :lock_entry
-  end
+module MultiRepo
+  class Dependency
+    attr_accessor :config_entry
+    attr_accessor :lock_entry
+  end
 end

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

@@ -1,95 +1,95 @@
-require "colored"
-require "multirepo/git/repo"
-
-module MultiRepo
-  class TheirState
-    NON_EXISTENT = 0
-    EXACT_REF = 1
-    LOCAL_NO_UPSTREAM = 2
-    UPSTREAM_NO_LOCAL = 3
-    LOCAL_UP_TO_DATE = 4
-    LOCAL_OUTDATED = 5
-    LOCAL_UPSTREAM_DIVERGED = 6
-  end
-  
-  class MergeDescriptor
-    attr_accessor :name
-    attr_accessor :repo
-    attr_accessor :our_revision
-    attr_accessor :their_revision
-    attr_accessor :state
-
-    def initialize(name, repo, our_revision, their_revision)
-      @name = name
-      @repo = repo
-      @our_revision = our_revision
-      @their_revision = their_revision
-      
-      # Revisions can be anything: "feature1", "origin/feature1", "b51f3c0", ...
-      their_ref = repo.ref(their_revision)
-      
-      @short_commit_id = their_ref.short_commit_id
-      
-      @state = determine_merge_state(repo, their_ref)
-    end
-    
-    def merge_description
-      case @state
-      when TheirState::NON_EXISTENT; "No revision named #{@their_revision}".red
-      else; "Merge '#{@state == TheirState::EXACT_REF ? @short_commit_id : @their_revision}' into '#{@our_revision}'"
-      end
-    end
-
-    def upstream_description
-      case @state
-      when TheirState::NON_EXISTENT; "--"
-      when TheirState::EXACT_REF; "Exact ref".yellow
-      when TheirState::LOCAL_NO_UPSTREAM; "Not remote-tracking".yellow
-      when TheirState::UPSTREAM_NO_LOCAL; "Branch is upstream".green
-      when TheirState::LOCAL_UP_TO_DATE; "Local up-to-date with upstream".green
-      when TheirState::LOCAL_OUTDATED; "Local outdated compared to upstream".yellow
-      when TheirState::LOCAL_UPSTREAM_DIVERGED; "Local and upstream have diverged!".red
-      end
-    end
-    
-    private
-    
-    def determine_merge_state(repo, their_ref)
-      return TheirState::NON_EXISTENT unless their_ref.exists?
-      
-      remote_branch = repo.remote_branches.select{ |b| b.name == their_ref.name }.first
-      local_branch = repo.local_branches.select{ |b| b.name == their_ref.name }.first
-      
-      # If no local branch nor remote branch exist for their_ref, this is an exact ref
-      return TheirState::EXACT_REF unless remote_branch || local_branch
-      
-      # If remote exists but local does not, return UPSTREAM_NO_LOCAL
-      return TheirState::UPSTREAM_NO_LOCAL if remote_branch && !local_branch
-      
-      # If there is no upstream, no need to check for differences between local and remote
-      return TheirState::LOCAL_NO_UPSTREAM unless local_branch.upstream_branch
-      
-      # Else check local vs upstream state
-      return determine_local_upstream_merge_state(repo, their_ref)
-    end
-    
-    def determine_local_upstream_merge_state(repo, their_ref)
-      # We can assume we're working with a branch at this point
-      their_branch = repo.branch(their_ref.name)
-      
-      their_upstream_branch = their_branch.upstream_branch
-      local_as_upstream = their_branch.commit_id == their_upstream_branch.commit_id
-      can_fast_forward_local_to_upstream = their_branch.can_fast_forward_to?(their_upstream_branch)
-      
-      state = if local_as_upstream
-        TheirState::LOCAL_UP_TO_DATE
-      elsif !local_as_upstream && can_fast_forward_local_to_upstream
-        TheirState::LOCAL_OUTDATED
-      else
-        TheirState::LOCAL_UPSTREAM_DIVERGED
-      end
-      
-      return state
-    end
-  end
+require "colored"
+require "multirepo/git/repo"
+
+module MultiRepo
+  class TheirState
+    NON_EXISTENT = 0
+    EXACT_REF = 1
+    LOCAL_NO_UPSTREAM = 2
+    UPSTREAM_NO_LOCAL = 3
+    LOCAL_UP_TO_DATE = 4
+    LOCAL_OUTDATED = 5
+    LOCAL_UPSTREAM_DIVERGED = 6
+  end
+  
+  class MergeDescriptor
+    attr_accessor :name
+    attr_accessor :repo
+    attr_accessor :our_revision
+    attr_accessor :their_revision
+    attr_accessor :state
+
+    def initialize(name, repo, our_revision, their_revision)
+      @name = name
+      @repo = repo
+      @our_revision = our_revision
+      @their_revision = their_revision
+      
+      # Revisions can be anything: "feature1", "origin/feature1", "b51f3c0", ...
+      their_ref = repo.ref(their_revision)
+      
+      @short_commit_id = their_ref.short_commit_id
+      
+      @state = determine_merge_state(repo, their_ref)
+    end
+    
+    def merge_description
+      case @state
+      when TheirState::NON_EXISTENT; "No revision named #{@their_revision}".red
+      else; "Merge '#{@state == TheirState::EXACT_REF ? @short_commit_id : @their_revision}' into '#{@our_revision}'"
+      end
+    end
+
+    def upstream_description
+      case @state
+      when TheirState::NON_EXISTENT; "--"
+      when TheirState::EXACT_REF; "Exact ref".yellow
+      when TheirState::LOCAL_NO_UPSTREAM; "Not remote-tracking".yellow
+      when TheirState::UPSTREAM_NO_LOCAL; "Branch is upstream".green
+      when TheirState::LOCAL_UP_TO_DATE; "Local up-to-date with upstream".green
+      when TheirState::LOCAL_OUTDATED; "Local outdated compared to upstream".yellow
+      when TheirState::LOCAL_UPSTREAM_DIVERGED; "Local and upstream have diverged!".red
+      end
+    end
+    
+    private
+    
+    def determine_merge_state(repo, their_ref)
+      return TheirState::NON_EXISTENT unless their_ref.exists?
+      
+      remote_branch = repo.remote_branches.select{ |b| b.name == their_ref.name }.first
+      local_branch = repo.local_branches.select{ |b| b.name == their_ref.name }.first
+      
+      # If no local branch nor remote branch exist for their_ref, this is an exact ref
+      return TheirState::EXACT_REF unless remote_branch || local_branch
+      
+      # If remote exists but local does not, return UPSTREAM_NO_LOCAL
+      return TheirState::UPSTREAM_NO_LOCAL if remote_branch && !local_branch
+      
+      # If there is no upstream, no need to check for differences between local and remote
+      return TheirState::LOCAL_NO_UPSTREAM unless local_branch.upstream_branch
+      
+      # Else check local vs upstream state
+      return determine_local_upstream_merge_state(repo, their_ref)
+    end
+    
+    def determine_local_upstream_merge_state(repo, their_ref)
+      # We can assume we're working with a branch at this point
+      their_branch = repo.branch(their_ref.name)
+      
+      their_upstream_branch = their_branch.upstream_branch
+      local_as_upstream = their_branch.commit_id == their_upstream_branch.commit_id
+      can_fast_forward_local_to_upstream = their_branch.can_fast_forward_to?(their_upstream_branch)
+      
+      state = if local_as_upstream
+        TheirState::LOCAL_UP_TO_DATE
+      elsif !local_as_upstream && can_fast_forward_local_to_upstream
+        TheirState::LOCAL_OUTDATED
+      else
+        TheirState::LOCAL_UPSTREAM_DIVERGED
+      end
+      
+      return state
+    end
+  end
 end

data/lib/multirepo/logic/node.rb

@@ -1,72 +1,72 @@
-require "multirepo/files/config-file"
-
-module MultiRepo
-  class Node
-    attr_accessor :path
-    attr_accessor :depth
-    attr_accessor :parent
-    
-    def initialize(path, parent = nil, depth = 0)
-      @path = path
-      @depth = depth
-      @parent = parent
-    end
-    
-    def name
-      Pathname.new(File.expand_path(@path)).basename.to_s
-    end
-    
-    def children
-      return [] unless Utils.is_multirepo_enabled(@path)
-      config_entries = ConfigFile.new(@path).load_entries
-      return config_entries.map { |e| Node.new(e.path, self, @depth + 1) }
-    end
-    
-    def ordered_descendants_including_self
-      return ordered_descendants.push(self)
-    end
-    
-    def ordered_descendants
-      descendants = find_descendants_recursive(self)
-      
-      unique_paths = descendants.map{ |d| d.path }.uniq
-      unique_nodes = unique_paths.collect do |path|
-        nodes_for_path = descendants.select { |d| d.path == path }
-        next nodes_for_path.sort{ |n| n.depth }.first
-      end
-      
-      return unique_nodes.sort_by{ |d| d.depth }.reverse
-    end
-    
-    def find_descendants_recursive(node)
-      ensure_no_dependency_cycle(node)
-      
-      descendants = node.children
-      descendants.each { |d| descendants.push(*find_descendants_recursive(d)) }
-      return descendants
-    end
-    
-    def ensure_no_dependency_cycle(node)
-      parent = node.parent
-      visited = []
-      while parent
-        visited.push(parent)
-        if parent == node
-          Console.log_warning("Dependency cycle detected:")
-          visited.reverse.each_with_index do |n, i|
-            description = "[first]" if i == visited.count - 1
-            description = "itself" if visited.count == 1
-            Console.log_warning("'#{n.path}' depends on #{description}")
-          end
-          raise MultiRepoException, "Dependency cycles are not supported by multirepo."
-        end
-        parent = parent.parent # Will eventually be nil (root node), which will break out of the loop
-      end
-    end
-    
-    def ==(object)
-      object.class == self.class &&
-      object.path == @path
-    end
-  end
+require "multirepo/files/config-file"
+
+module MultiRepo
+  class Node
+    attr_accessor :path
+    attr_accessor :depth
+    attr_accessor :parent
+    
+    def initialize(path, parent = nil, depth = 0)
+      @path = path
+      @depth = depth
+      @parent = parent
+    end
+    
+    def name
+      Pathname.new(File.expand_path(@path)).basename.to_s
+    end
+    
+    def children
+      return [] unless Utils.is_multirepo_enabled(@path)
+      config_entries = ConfigFile.new(@path).load_entries
+      return config_entries.map { |e| Node.new(e.path, self, @depth + 1) }
+    end
+    
+    def ordered_descendants_including_self
+      return ordered_descendants.push(self)
+    end
+    
+    def ordered_descendants
+      descendants = find_descendants_recursive(self)
+      
+      unique_paths = descendants.map{ |d| d.path }.uniq
+      unique_nodes = unique_paths.collect do |path|
+        nodes_for_path = descendants.select { |d| d.path == path }
+        next nodes_for_path.sort{ |n| n.depth }.first
+      end
+      
+      return unique_nodes.sort_by{ |d| d.depth }.reverse
+    end
+    
+    def find_descendants_recursive(node)
+      ensure_no_dependency_cycle(node)
+      
+      descendants = node.children
+      descendants.each { |d| descendants.push(*find_descendants_recursive(d)) }
+      return descendants
+    end
+    
+    def ensure_no_dependency_cycle(node)
+      parent = node.parent
+      visited = []
+      while parent
+        visited.push(parent)
+        if parent == node
+          Console.log_warning("Dependency cycle detected:")
+          visited.reverse.each_with_index do |n, i|
+            description = "[first]" if i == visited.count - 1
+            description = "itself" if visited.count == 1
+            Console.log_warning("'#{n.path}' depends on #{description}")
+          end
+          raise MultiRepoException, "Dependency cycles are not supported by multirepo."
+        end
+        parent = parent.parent # Will eventually be nil (root node), which will break out of the loop
+      end
+    end
+    
+    def ==(object)
+      object.class == self.class &&
+      object.path == @path
+    end
+  end
 end