git-multirepo 1.0.0.beta70 → 1.0.0.beta71

data/lib/multirepo/git/remote.rb

@@ -1,17 +1,17 @@
-require_relative "git-runner"
-
-module MultiRepo
-  class Remote
-    attr_accessor :name
-    
-    def initialize(repo, name)
-      @repo = repo
-      @name = name
-    end
-    
-    def url
-      output = GitRunner.run(@repo.path, "config --get remote.#{@name}.url", Verbosity::OUTPUT_NEVER).strip
-      return output == "" ? nil : output
-    end
-  end
-end
+require_relative "git-runner"
+
+module MultiRepo
+  class Remote
+    attr_accessor :name
+    
+    def initialize(repo, name)
+      @repo = repo
+      @name = name
+    end
+    
+    def url
+      output = GitRunner.run(@repo.path, "config --get remote.#{@name}.url", Verbosity::OUTPUT_NEVER).strip
+      return output == "" ? nil : output
+    end
+  end
+end

data/lib/multirepo/git/repo.rb

@@ -1,131 +1,131 @@
-require_relative "branch"
-require_relative "remote"
-require_relative "commit"
-require_relative "change"
-
-module MultiRepo
-  class Repo
-    attr_accessor :path
-    attr_accessor :basename
-    
-    def initialize(path)
-      @path = path
-      @basename = Pathname.new(path).basename.to_s
-    end
-    
-    # Inspection
-    
-    def exists?
-      return false unless Dir.exist?("#{@path}/.git")
-      return GitRunner.run(@path, "rev-parse --is-inside-work-tree", Verbosity::OUTPUT_NEVER).strip == "true"
-    end
-    
-    def head_born?
-      result = GitRunner.run(@path, "rev-parse HEAD --", Verbosity::OUTPUT_NEVER).strip
-      return !result.start_with?("fatal: bad revision")
-    end
-    
-    def current_revision
-      (current_branch || current_commit).name
-    end
-    
-    def clean?
-      changes.count == 0
-    end
-    
-    def local_branches
-      branches_by_removing_prefix(%r{^refs/heads/})
-    end
-    
-    def remote_branches
-      branches_by_removing_prefix(%r{^refs/remotes/})
-    end
-    
-    def changes
-      output = GitRunner.run(@path, "status --porcelain", Verbosity::OUTPUT_NEVER)
-      lines = output.split("\n").each(&:strip).delete_if{ |f| f == "" }
-      lines.map { |l| Change.new(l) }
-    end
-    
-    # Operations
-    
-    def fetch
-      GitRunner.run_as_system(@path, "fetch --prune")
-      GitRunner.last_command_succeeded
-    end
-    
-    def clone(url, options = nil)
-      options = {} unless options
-      
-      branch = options[:branch]
-
-      command = "clone #{url} #{@path}"
-      command << " -q" if options[:quiet] || false
-      command << " -b #{branch}" if branch
-      command << " --recurse-submodules"
-      command << " --shallow-submodules" if options[:shallow] || false
-      command << " --depth 1" if options[:shallow] || false
-      
-      GitRunner.run_as_system(".", command)
-      GitRunner.last_command_succeeded
-    end
-    
-    def checkout(ref_name)
-      GitRunner.run(@path, "checkout #{ref_name}", Verbosity::OUTPUT_ON_ERROR)
-      GitRunner.last_command_succeeded
-    end
-    
-    # Current
-    
-    def head
-      return nil unless exists? && head_born?
-      Ref.new(self, "HEAD")
-    end
-    
-    def current_commit
-      return nil unless exists? && head_born?
-      Commit.new(self, head.commit_id)
-    end
-    
-    def current_branch
-      return nil unless exists? && head_born?
-      name = GitRunner.run(@path, "rev-parse --abbrev-ref HEAD", Verbosity::OUTPUT_NEVER).strip
-      return nil if name == "HEAD" # Code assumes that current_branch will be nil when we're in floating HEAD
-      Branch.new(self, name)
-    end
-    
-    # Factory methods
-    
-    def ref(name)
-      Ref.new(self, name)
-    end
-    
-    def branch(name)
-      Branch.new(self, name)
-    end
-    
-    def remote(name)
-      Remote.new(self, name)
-    end
-    
-    def commit(id)
-      Commit.new(self, id)
-    end
-    
-    # Private helper methods
-    
-    private
-    
-    def branches_by_removing_prefix(prefix_regex)
-      output = GitRunner.run(@path, "for-each-ref --format='%(refname)'", Verbosity::OUTPUT_NEVER)
-      all_refs = output.strip.split("\n")
-
-      # Remove surrounding quotes on Windows
-      all_refs = all_refs.map { |l| l.sub(/^\'/, "").sub(/\'$/, "") }
-
-      full_names = all_refs.select { |r| r =~ prefix_regex }
-      names = full_names.map{ |f| f.sub(prefix_regex, "") }.delete_if{ |n| n =~ /HEAD$/ }
-      names.map { |b| Branch.new(self, b) }
-    end
-  end
-end
+require_relative "branch"
+require_relative "remote"
+require_relative "commit"
+require_relative "change"
+
+module MultiRepo
+  class Repo
+    attr_accessor :path
+    attr_accessor :basename
+    
+    def initialize(path)
+      @path = path
+      @basename = Pathname.new(path).basename.to_s
+    end
+    
+    # Inspection
+    
+    def exists?
+      return false unless Dir.exist?("#{@path}/.git")
+      return GitRunner.run(@path, "rev-parse --is-inside-work-tree", Verbosity::OUTPUT_NEVER).strip == "true"
+    end
+    
+    def head_born?
+      result = GitRunner.run(@path, "rev-parse HEAD --", Verbosity::OUTPUT_NEVER).strip
+      return !result.start_with?("fatal: bad revision")
+    end
+    
+    def current_revision
+      (current_branch || current_commit).name
+    end
+    
+    def clean?
+      changes.count == 0
+    end
+    
+    def local_branches
+      branches_by_removing_prefix(%r{^refs/heads/})
+    end
+    
+    def remote_branches
+      branches_by_removing_prefix(%r{^refs/remotes/})
+    end
+    
+    def changes
+      output = GitRunner.run(@path, "status --porcelain", Verbosity::OUTPUT_NEVER)
+      lines = output.split("\n").each(&:strip).delete_if{ |f| f == "" }
+      lines.map { |l| Change.new(l) }
+    end
+    
+    # Operations
+    
+    def fetch
+      GitRunner.run_as_system(@path, "fetch --prune")
+      GitRunner.last_command_succeeded
+    end
+    
+    def clone(url, options = nil)
+      options = {} unless options
+      
+      branch = options[:branch]
+
+      command = "clone #{url} #{@path}"
+      command << " -q" if options[:quiet] || false
+      command << " -b #{branch}" if branch
+      command << " --recurse-submodules"
+      command << " --shallow-submodules" if options[:shallow] || false
+      command << " --depth 1" if options[:shallow] || false
+      
+      GitRunner.run_as_system(".", command)
+      GitRunner.last_command_succeeded
+    end
+    
+    def checkout(ref_name)
+      GitRunner.run(@path, "checkout #{ref_name}", Verbosity::OUTPUT_ON_ERROR)
+      GitRunner.last_command_succeeded
+    end
+    
+    # Current
+    
+    def head
+      return nil unless exists? && head_born?
+      Ref.new(self, "HEAD")
+    end
+    
+    def current_commit
+      return nil unless exists? && head_born?
+      Commit.new(self, head.commit_id)
+    end
+    
+    def current_branch
+      return nil unless exists? && head_born?
+      name = GitRunner.run(@path, "rev-parse --abbrev-ref HEAD", Verbosity::OUTPUT_NEVER).strip
+      return nil if name == "HEAD" # Code assumes that current_branch will be nil when we're in floating HEAD
+      Branch.new(self, name)
+    end
+    
+    # Factory methods
+    
+    def ref(name)
+      Ref.new(self, name)
+    end
+    
+    def branch(name)
+      Branch.new(self, name)
+    end
+    
+    def remote(name)
+      Remote.new(self, name)
+    end
+    
+    def commit(id)
+      Commit.new(self, id)
+    end
+    
+    # Private helper methods
+    
+    private
+    
+    def branches_by_removing_prefix(prefix_regex)
+      output = GitRunner.run(@path, "for-each-ref --format='%(refname)'", Verbosity::OUTPUT_NEVER)
+      all_refs = output.strip.split("\n")
+
+      # Remove surrounding quotes on Windows
+      all_refs = all_refs.map { |l| l.sub(/^\'/, "").sub(/\'$/, "") }
+
+      full_names = all_refs.select { |r| r =~ prefix_regex }
+      names = full_names.map{ |f| f.sub(prefix_regex, "") }.delete_if{ |n| n =~ /HEAD$/ }
+      names.map { |b| Branch.new(self, b) }
+    end
+  end
+end

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
-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
-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/info.rb

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

data/lib/multirepo/logic/dependency.rb

@@ -1,6 +1,6 @@
-module MultiRepo
-  class Dependency
-    attr_accessor :config_entry
-    attr_accessor :lock_entry
-  end
-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 then "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 then "--"
-      when TheirState::EXACT_REF then "Exact ref".yellow
-      when TheirState::LOCAL_NO_UPSTREAM then "Not remote-tracking".yellow
-      when TheirState::UPSTREAM_NO_LOCAL then "Branch is upstream".green
-      when TheirState::LOCAL_UP_TO_DATE then "Local up-to-date with upstream".green
-      when TheirState::LOCAL_OUTDATED then "Local outdated compared to upstream".yellow
-      when TheirState::LOCAL_UPSTREAM_DIVERGED then "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.find { |b| b.name == their_ref.name }
-      local_branch = repo.local_branches.find { |b| b.name == their_ref.name }
-      
-      # 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
+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 then "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 then "--"
+      when TheirState::EXACT_REF then "Exact ref".yellow
+      when TheirState::LOCAL_NO_UPSTREAM then "Not remote-tracking".yellow
+      when TheirState::UPSTREAM_NO_LOCAL then "Branch is upstream".green
+      when TheirState::LOCAL_UP_TO_DATE then "Local up-to-date with upstream".green
+      when TheirState::LOCAL_OUTDATED then "Local outdated compared to upstream".yellow
+      when TheirState::LOCAL_UPSTREAM_DIVERGED then "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.find { |b| b.name == their_ref.name }
+      local_branch = repo.local_branches.find { |b| b.name == their_ref.name }
+      
+      # 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