git-multirepo 1.0.0.beta40 → 1.0.0.beta42

data/lib/multirepo/git/change.rb

@@ -1,11 +1,11 @@
-module MultiRepo
-  class Change
-    attr_accessor :status
-    attr_accessor :path
-    
-    def initialize(line)
-      @status = line[0...2].strip
-      @path = line[3..-1]
-    end
-  end
+module MultiRepo
+  class Change
+    attr_accessor :status
+    attr_accessor :path
+    
+    def initialize(line)
+      @status = line[0...2].strip
+      @path = line[3..-1]
+    end
+  end
 end

data/lib/multirepo/git/commit.rb

@@ -1,18 +1,7 @@
-require_relative "git-runner"
-
-module MultiRepo
-  class Commit
-    attr_accessor :ref
-    
-    def initialize(repo, ref)
-      @repo = repo
-      @ref = ref
-    end
-
-    def is_merge?
-      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
-  end
+require_relative "ref"
+require_relative "git-runner"
+
+module MultiRepo
+  class Commit < Ref
+  end
 end

data/lib/multirepo/git/git-runner.rb

@@ -1,47 +1,47 @@
-require "multirepo/utility/runner"
-require "multirepo/config"
-
-module MultiRepo
-  class GitRunner
-    class << self
-      attr_accessor :last_command_succeeded
-    end
-    
-    def self.run_in_current_dir(git_command, verbosity)
-      full_command = "#{git_executable} #{git_command}"
-      run(full_command, verbosity)
-    end
-    
-    def self.run_in_working_dir(path, git_command, verbosity)
-      if path == "."
-        # It is always better to skip -C when running git commands in the
-        # current directory (especially in hooks). Doing this prevents
-        # any future issues because we automatically fallback to non-"-C" for ".".
-        # Fixes bug: https://www.pivotaltracker.com/story/show/94505654
-        return run_in_current_dir(git_command, verbosity)
-      else
-        full_command = "#{git_executable} -C \"#{path}\" #{git_command}";
-      end
-      
-      # True fix for the -C flag issue in pre-commit hook where the status command would
-      # fail to provide correct results if a pathspec was provided when performing a commit.
-      # http://thread.gmane.org/gmane.comp.version-control.git/263319/focus=263323
-      
-      if Config.instance.running_git_hook
-        full_command = "sh -c 'unset $(git rev-parse --local-env-vars); #{full_command};'" 
-      end
-      
-      run(full_command, verbosity)
-    end
-    
-    def self.run(full_command, verbosity)
-      result = Runner.run(full_command, verbosity)
-      @last_command_succeeded = Runner.last_command_succeeded
-      return result
-    end
-
-    def self.git_executable
-      Config.instance.git_executable || "git"
-    end
-  end
+require "multirepo/utility/runner"
+require "multirepo/config"
+
+module MultiRepo
+  class GitRunner
+    class << self
+      attr_accessor :last_command_succeeded
+    end
+    
+    def self.run_in_current_dir(git_command, verbosity)
+      full_command = "#{git_executable} #{git_command}"
+      run(full_command, verbosity)
+    end
+    
+    def self.run_in_working_dir(path, git_command, verbosity)
+      if path == "."
+        # It is always better to skip -C when running git commands in the
+        # current directory (especially in hooks). Doing this prevents
+        # any future issues because we automatically fallback to non-"-C" for ".".
+        # Fixes bug: https://www.pivotaltracker.com/story/show/94505654
+        return run_in_current_dir(git_command, verbosity)
+      else
+        full_command = "#{git_executable} -C \"#{path}\" #{git_command}";
+      end
+      
+      # True fix for the -C flag issue in pre-commit hook where the status command would
+      # fail to provide correct results if a pathspec was provided when performing a commit.
+      # http://thread.gmane.org/gmane.comp.version-control.git/263319/focus=263323
+      
+      if Config.instance.running_git_hook
+        full_command = "sh -c 'unset $(git rev-parse --local-env-vars); #{full_command};'" 
+      end
+      
+      run(full_command, verbosity)
+    end
+    
+    def self.run(full_command, verbosity)
+      result = Runner.run(full_command, verbosity)
+      @last_command_succeeded = Runner.last_command_succeeded
+      return result
+    end
+
+    def self.git_executable
+      Config.instance.git_executable || "git"
+    end
+  end
 end

data/lib/multirepo/git/git.rb

@@ -0,0 +1,10 @@
+require "multirepo/git/git-runner"
+
+module MultiRepo
+  class Git
+    def self.valid_branch_name?(name)
+      GitRunner.run_in_current_dir("check-ref-format --branch \"#{name}\"", Runner::Verbosity::OUTPUT_NEVER)
+      GitRunner.last_command_succeeded
+    end
+  end
+end

data/lib/multirepo/git/ref.rb

@@ -0,0 +1,38 @@
+require_relative "git-runner"
+
+module MultiRepo
+  class Ref
+    attr_accessor :name
+    
+    def initialize(repo, name)
+      @repo = repo
+      @name = name
+    end
+    
+    def exists?
+      output = GitRunner.run_in_working_dir(@repo.path, "rev-parse --verify --quiet #{@name}", Runner::Verbosity::OUTPUT_NEVER).strip
+      return output != ""
+    end
+    
+    def commit_id
+      GitRunner.run_in_working_dir(@repo.path, "rev-parse #{@name}", Runner::Verbosity::OUTPUT_NEVER).strip
+    end
+    
+    def short_commit_id
+      GitRunner.run_in_working_dir(@repo.path, "rev-parse --short #{@name}", Runner::Verbosity::OUTPUT_NEVER).strip
+    end
+    
+    def is_merge?
+      lines = GitRunner.run_in_working_dir(@repo.path, "cat-file -p #{@name}", Runner::Verbosity::OUTPUT_NEVER).split("\n")
+      parents = lines.grep(/^parent /)
+      return parents.count > 1
+    end
+    
+    def can_fast_forward_to?(ref)
+      # http://stackoverflow.com/a/2934062/167983
+      rev_parse_output = GitRunner.run_in_working_dir(@repo.path, "rev-parse #{@name}", Runner::Verbosity::OUTPUT_NEVER)
+      merge_base_output = GitRunner.run_in_working_dir(@repo.path, "merge-base \"#{rev_parse_output}\" \"#{ref.name}\"", Runner::Verbosity::OUTPUT_NEVER)
+      return merge_base_output == rev_parse_output
+    end
+  end
+end

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_in_working_dir(@repo.path, "config --get remote.#{@name}.url", Runner::Verbosity::OUTPUT_NEVER).strip
-      return output == "" ? nil : output
-    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_in_working_dir(@repo.path, "config --get remote.#{@name}.url", Runner::Verbosity::OUTPUT_NEVER).strip
+      return output == "" ? nil : output
+    end
+  end
 end

data/lib/multirepo/git/repo.rb

@@ -1,78 +1,123 @@
-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_in_working_dir(@path, "rev-parse --is-inside-work-tree", Runner::Verbosity::OUTPUT_NEVER).strip == "true"
-    end
-    
-    def head_born?
-      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 = GitRunner.run_in_working_dir(@path, "rev-parse --abbrev-ref HEAD", Runner::Verbosity::OUTPUT_NEVER).strip
-      branch != "HEAD" ? branch : nil
-    end
-    
-    def head_hash
-      GitRunner.run_in_working_dir(@path, "rev-parse HEAD", Runner::Verbosity::OUTPUT_NEVER).strip
-    end
-    
-    def changes
-      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
-    
-    def clean?
-      return changes.count == 0
-    end
-    
-    # Operations
-    
-    def fetch
-      GitRunner.run_in_working_dir(@path, "fetch --prune --progress", Runner::Verbosity::OUTPUT_ALWAYS)
-      Runner.last_command_succeeded
-    end
-    
-    def clone(url)
-      GitRunner.run_in_current_dir("clone #{url} #{@path} --progress", Runner::Verbosity::OUTPUT_ALWAYS)
-      Runner.last_command_succeeded
-    end
-    
-    def checkout(ref)
-      GitRunner.run_in_working_dir(@path, "checkout #{ref}", Runner::Verbosity::OUTPUT_ON_ERROR)
-      Runner.last_command_succeeded
-    end
-    
-    # Remotes and branches
-    
-    def branch(name)
-      Branch.new(self, name)
-    end
-    
-    def remote(name)
-      Remote.new(self, name)
-    end
-    
-    def commit(ref)
-      Commit.new(self, ref)
-    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_in_working_dir(@path, "rev-parse --is-inside-work-tree", Runner::Verbosity::OUTPUT_NEVER).strip == "true"
+    end
+    
+    def head_born?
+      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_revision
+      (current_branch || current_commit).name
+    end
+    
+    def clean?
+      changes.count == 0
+    end
+    
+    def local_branches
+      branches_by_removing_prefix(/^refs\/heads\//)
+    end
+    
+    def remote_branches
+      branches_by_removing_prefix(/^refs\/remotes\//)
+    end
+    
+    def changes
+      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
+    
+    # Operations
+    
+    def fetch
+      GitRunner.run_in_working_dir(@path, "fetch --prune --progress", Runner::Verbosity::OUTPUT_ALWAYS)
+      Runner.last_command_succeeded
+    end
+    
+    def clone(url, branch = nil)
+      if branch != nil
+        GitRunner.run_in_current_dir("clone #{url} -b #{branch} #{@path} --progress", Runner::Verbosity::OUTPUT_ALWAYS)
+      else
+        GitRunner.run_in_current_dir("clone #{url} #{@path} --progress", Runner::Verbosity::OUTPUT_ALWAYS)
+      end
+      Runner.last_command_succeeded
+    end
+    
+    def checkout(ref_name)
+      GitRunner.run_in_working_dir(@path, "checkout #{ref_name}", Runner::Verbosity::OUTPUT_ON_ERROR)
+      Runner.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_in_working_dir(@path, "rev-parse --abbrev-ref HEAD", Runner::Verbosity::OUTPUT_NEVER).strip
+      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_in_working_dir(@path, "for-each-ref --format='%(refname)'", Runner::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 # Success!
-    rescue StandardError => e
-      Console.log_error("Post-commit hook failed to execute! #{e.message}")
-      exit 1 # Something went wrong!
-    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