git-multirepo 1.0.0.beta27 → 1.0.0.beta29

data/lib/multirepo/config.rb

@@ -1,16 +1,16 @@
-require "singleton"
-
-module MultiRepo
-  class Config
-    include Singleton
-    
-    attr_accessor :verbose
-    @verbose = false
-    
-    attr_accessor :running_git_hook
-    @running_git_hook = false
-
-    attr_accessor :git_executable
-    @git_executable = nil
-  end
+require "singleton"
+
+module MultiRepo
+  class Config
+    include Singleton
+    
+    attr_accessor :verbose
+    @verbose = false
+    
+    attr_accessor :running_git_hook
+    @running_git_hook = false
+
+    attr_accessor :git_executable
+    @git_executable = nil
+  end
 end

data/lib/multirepo/files/config-entry.rb

@@ -1,35 +1,35 @@
-require "securerandom"
-
-require "multirepo/utility/console"
-require "multirepo/git/repo"
-
-module MultiRepo
-  class ConfigEntry
-    attr_accessor :id
-    attr_accessor :path
-    attr_accessor :url
-    attr_accessor :repo
-    
-    def encode_with(coder)
-      coder["id"] = @id
-      coder["path"] = @path
-      coder["url"] = @url
-    end
-    
-    def ==(entry)
-      entry_path = Pathname.new(entry.path)
-      self_path = Pathname.new(self.path)
-      entry_path.exist? && self_path.exist? && entry_path.realpath == self_path.realpath
-    end
-    
-    def initialize(repo)
-      @id = SecureRandom.uuid
-      @path = repo.path
-      @url = repo.exists? ? repo.remote('origin').url : nil
-    end
-    
-    def repo
-      Repo.new(path)
-    end
-  end
+require "securerandom"
+
+require "multirepo/utility/console"
+require "multirepo/git/repo"
+
+module MultiRepo
+  class ConfigEntry
+    attr_accessor :id
+    attr_accessor :path
+    attr_accessor :url
+    attr_accessor :repo
+    
+    def encode_with(coder)
+      coder["id"] = @id
+      coder["path"] = @path
+      coder["url"] = @url
+    end
+    
+    def ==(entry)
+      entry_path = Pathname.new(entry.path)
+      self_path = Pathname.new(self.path)
+      entry_path.exist? && self_path.exist? && entry_path.realpath == self_path.realpath
+    end
+    
+    def initialize(repo)
+      @id = SecureRandom.uuid
+      @path = repo.path
+      @url = repo.exists? ? repo.remote('origin').url : nil
+    end
+    
+    def repo
+      Repo.new(path)
+    end
+  end
 end

data/lib/multirepo/files/config-file.rb

@@ -1,38 +1,34 @@
-require "fileutils"
-require "pathname"
-
-require_relative "config-entry"
-
-module MultiRepo
-  class ConfigFile
-    FILE = Pathname.new(".multirepo")
-    
-    def self.exists?
-      FILE.exist?
-    end
-    
-    def self.load
-      Psych.load(FILE.read)
-    end
-    
-    def self.save(entries)
-      File.write(FILE.to_s, Psych.dump(entries))
-    end
-    
-    def self.entry_exists?(entry)
-      load.any? { |e| e == entry }
-    end
-    
-    def self.add_entry(entry)
-      save(load.push(entry))
-    end
-    
-    def self.remove_entry(entry)
-      save(load.delete_if { |e| e == entry })
-    end
-
-    def self.stage
-      Git.run_in_current_dir("add -A -f #{FILE.to_s}", Runner::Verbosity::NEVER_OUTPUT)
-    end
-  end
+require "fileutils"
+require "pathname"
+
+require_relative "config-entry"
+
+module MultiRepo
+  class ConfigFile
+    FILE = Pathname.new(".multirepo")
+    
+    def self.exists?
+      FILE.exist?
+    end
+    
+    def self.load
+      Psych.load(FILE.read)
+    end
+    
+    def self.save(entries)
+      File.write(FILE.to_s, Psych.dump(entries))
+    end
+    
+    def self.entry_exists?(entry)
+      load.any? { |e| e == entry }
+    end
+    
+    def self.add_entry(entry)
+      save(load.push(entry))
+    end
+    
+    def self.remove_entry(entry)
+      save(load.delete_if { |e| e == entry })
+    end
+  end
 end

data/lib/multirepo/files/lock-entry.rb

@@ -1,26 +1,26 @@
-require "multirepo/utility/console"
-require "multirepo/git/repo"
-
-module MultiRepo
-  class LockEntry
-    attr_accessor :config_entry
-    attr_accessor :name
-    attr_accessor :id
-    attr_accessor :head
-    attr_accessor :branch
-    
-    def encode_with(coder)
-      coder["name"] = @name
-      coder["id"] = @id
-      coder["head"] = @head
-      coder["branch"] = @branch
-    end
-    
-    def initialize(config_entry)
-      @name = config_entry.repo.basename
-      @id = config_entry.id
-      @head = config_entry.repo.head_hash
-      @branch = config_entry.repo.current_branch
-    end
-  end
+require "multirepo/utility/console"
+require "multirepo/git/repo"
+
+module MultiRepo
+  class LockEntry
+    attr_accessor :config_entry
+    attr_accessor :name
+    attr_accessor :id
+    attr_accessor :head
+    attr_accessor :branch
+    
+    def encode_with(coder)
+      coder["name"] = @name
+      coder["id"] = @id
+      coder["head"] = @head
+      coder["branch"] = @branch
+    end
+    
+    def initialize(config_entry)
+      @name = config_entry.repo.basename
+      @id = config_entry.id
+      @head = config_entry.repo.head_hash
+      @branch = config_entry.repo.current_branch
+    end
+  end
 end

data/lib/multirepo/files/lock-file.rb

@@ -1,40 +1,45 @@
-require "pathname"
-require "psych"
-
-require "multirepo/git/git"
-require_relative "lock-entry"
-require_relative "config-file"
-
-module MultiRepo
-  class LockFile
-    FILE = Pathname.new(".multirepo.lock")
-    
-    def self.exists?
-      FILE.exist?
-    end
-    
-    def self.load
-      Psych.load(FILE.read)
-    end
-    
-    def self.update
-      config_entries = ConfigFile.load
-      lock_entries = config_entries.map { |c| LockEntry.new(c) }
-      
-      File.write(FILE.to_s, Psych.dump(lock_entries))
-      
-      Git.run_in_current_dir("add -A #{FILE.to_s}", Runner::Verbosity::OUTPUT_ON_ERROR)
-    end
-
-    def self.commit(message = nil)
-      message = message || "[multirepo] Updated lock file"
-      Git.run_in_current_dir("commit -m \"#{message}\" -o -- #{FILE.to_s}", Runner::Verbosity::OUTPUT_ON_ERROR)
-    end
-    
-    def self.validate_components(line, components)
-      unless components.count == 2
-        raise MultiRepoException, "Wrong entry format in .multirepo.lock file: #{line}"
-      end
-    end
-  end
+require "pathname"
+require "psych"
+
+require "multirepo/git/git"
+require_relative "lock-entry"
+require_relative "config-file"
+
+module MultiRepo
+  class LockFile
+    FILE = Pathname.new(".multirepo.lock")
+    
+    def self.exists?
+      FILE.exist?
+    end
+    
+    def self.load
+      Psych.load(FILE.read)
+    end
+    
+    def self.update
+      config_entries = ConfigFile.load
+      lock_entries = config_entries.map { |c| LockEntry.new(c) }
+      
+      old_content = File.read(FILE.to_s)
+      new_content = Psych.dump(lock_entries)
+      File.write(FILE.to_s, new_content)
+      
+      return new_content != old_content
+    end
+    
+    def self.stage
+      Git.run_in_current_dir("add -A #{FILE.to_s}", Runner::Verbosity::OUTPUT_ON_ERROR)
+    end
+
+    def self.commit(message)
+      Git.run_in_current_dir("commit -m \"#{message}\" -o -- #{FILE.to_s}", Runner::Verbosity::OUTPUT_ON_ERROR)
+    end
+    
+    def self.validate_components(line, components)
+      unless components.count == 2
+        raise MultiRepoException, "Wrong entry format in .multirepo.lock file: #{line}"
+      end
+    end
+  end
 end

data/lib/multirepo/git/branch.rb

@@ -1,28 +1,28 @@
-require_relative "git"
-
-module MultiRepo
-  class Branch
-    attr_accessor :name
-    
-    def initialize(repo, name)
-      @repo = repo
-      @name = name
-    end
-
-    def exists?
-      lines = Git.run_in_working_dir(@repo.path, "branch", Runner::Verbosity::NEVER_OUTPUT).split("\n")
-      branch_names = lines.map { |line| line.tr("* ", "")}
-      branch_names.include?(@name)
-    end
-
-    def create(remote_tracking = false)
-      Git.run_in_working_dir(@repo.path, "branch #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
-      Git.run_in_working_dir(@repo.path, "push -u origin #{name}", Runner::Verbosity::OUTPUT_ON_ERROR) if remote_tracking
-    end
-    
-    def checkout
-      Git.run_in_working_dir(@repo.path, "checkout #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
-      Git.last_command_succeeded
-    end
-  end
+require_relative "git"
+
+module MultiRepo
+  class Branch
+    attr_accessor :name
+    
+    def initialize(repo, name)
+      @repo = repo
+      @name = name
+    end
+
+    def exists?
+      lines = Git.run_in_working_dir(@repo.path, "branch", Runner::Verbosity::NEVER_OUTPUT).split("\n")
+      branch_names = lines.map { |line| line.tr("* ", "")}
+      branch_names.include?(@name)
+    end
+
+    def create(remote_tracking = false)
+      Git.run_in_working_dir(@repo.path, "branch #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
+      Git.run_in_working_dir(@repo.path, "push -u origin #{name}", Runner::Verbosity::OUTPUT_ON_ERROR) if remote_tracking
+    end
+    
+    def checkout
+      Git.run_in_working_dir(@repo.path, "checkout #{@name}", Runner::Verbosity::OUTPUT_ON_ERROR)
+      Git.last_command_succeeded
+    end
+  end
 end

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

@@ -0,0 +1,18 @@
+require_relative "git"
+
+module MultiRepo
+  class Commit
+    attr_accessor :ref
+    
+    def initialize(repo, ref)
+      @repo = repo
+      @ref = ref
+    end
+
+    def is_merge?
+      lines = Git.run_in_working_dir(@repo.path, "cat-file -p #{@ref}", Runner::Verbosity::NEVER_OUTPUT).split("\n")
+      parents = lines.grep(/^parent /)
+      return parents.count > 1
+    end
+  end
+end

data/lib/multirepo/git/git.rb

@@ -1,43 +1,43 @@
-require "multirepo/utility/runner"
-require "multirepo/git/git"
-require "multirepo/config"
-
-module MultiRepo
-  class Git
-    class << self
-      attr_accessor :last_command_succeeded
-    end
-    
-    def self.is_inside_git_repo(path)
-      return false unless Dir.exist?("#{path}/.git")
-      return Git.run_in_working_dir(path, "rev-parse --is-inside-work-tree", Runner::Verbosity::NEVER_OUTPUT).strip == "true"
-    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)
-      full_command = "#{git_executable} -C \"#{path}\" #{git_command}";
-      
-      # 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
-      full_command = "sh -c 'unset $(git rev-parse --local-env-vars); #{full_command};'" if Config.instance.running_git_hook
-      
-      run(full_command, verbosity)
-    end
-    
-    def self.run(full_command, verbosity)
-      Console.log_info(full_command) if Config.instance.verbose
-      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/git/git"
+require "multirepo/config"
+
+module MultiRepo
+  class Git
+    class << self
+      attr_accessor :last_command_succeeded
+    end
+    
+    def self.is_inside_git_repo(path)
+      return false unless Dir.exist?("#{path}/.git")
+      return Git.run_in_working_dir(path, "rev-parse --is-inside-work-tree", Runner::Verbosity::NEVER_OUTPUT).strip == "true"
+    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)
+      full_command = "#{git_executable} -C \"#{path}\" #{git_command}";
+      
+      # 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
+      full_command = "sh -c 'unset $(git rev-parse --local-env-vars); #{full_command};'" if Config.instance.running_git_hook
+      
+      run(full_command, verbosity)
+    end
+    
+    def self.run(full_command, verbosity)
+      Console.log_info(full_command) if Config.instance.verbose
+      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