v2gpti 1.1.9 → 1.2.0

data/lib/git-pivotal-tracker-integration/command/start.rb

@@ -13,99 +13,95 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'git-pivotal-tracker-integration/command/base'
-require 'git-pivotal-tracker-integration/command/command'
-require 'git-pivotal-tracker-integration/util/git'
-require 'git-pivotal-tracker-integration/util/story'
-require 'pivotal-tracker'
-
-# The class that encapsulates starting a Pivotal Tracker Story
-class GitPivotalTrackerIntegration::Command::Start < GitPivotalTrackerIntegration::Command::Base
-
-  # Starts a Pivotal Tracker story by doing the following steps:
-  # * Create a branch
-  # * Add default commit hook
-  # * Start the story on Pivotal Tracker
-  #
-  # @param [String, nil] filter a filter for selecting the story to start.  This
-  #   filter can be either:
-  #   * a story id
-  #   * a story type (feature, bug, chore)
-  #   * +nil+
-  # @return [void]
-  def run(args)
-    my_projects = PivotalTracker::Project.all
-    filter = args[0]
-    $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{pwd} branch:#{GitPivotalTrackerIntegration::Util::Git.branch_name} args:#{filter}")
-    self.check_branch
-    story = nil
-    if (!args.nil? && args.any?{|arg| arg.include?("-n")})
-      story = self.create_story(args)
-    else
-      story = GitPivotalTrackerIntegration::Util::Story.select_story @project, filter
-    end
-    if story.nil?
-      abort "There are no available stories."
-    end
-    if story.story_type == "feature" && story.estimate < 0
-      estimate_story(story)
-    end
-    $LOG.debug("story:#{story.name}")
-    GitPivotalTrackerIntegration::Util::Story.pretty_print story
+module GitPivotalTrackerIntegration
+  module Command
 
-    development_branch_name = development_branch_name story
-    GitPivotalTrackerIntegration::Util::Git.create_branch development_branch_name
-    @configuration.story = story
-    GitPivotalTrackerIntegration::Util::Git.add_hook 'prepare-commit-msg', File.join(File.dirname(__FILE__), !OS.windows? ? 'prepare-commit-msg.sh' : 'prepare-commit-msg-win.sh' )
+    # The class that encapsulates starting a Pivotal Tracker Story
+    class Start < Base
 
-    start_on_tracker story
-  end
+      # Starts a Pivotal Tracker story by doing the following steps:
+      # * Create a branch
+      # * Add default commit hook
+      # * Start the story on Pivotal Tracker
+      #
+      # @param [String, nil] filter a filter for selecting the story to start.  This
+      #   filter can be either:
+      #   * a story id
+      #   * a story type (feature, bug, chore)
+      #   * +nil+
+      # @return [void]
+      def run(args)
+        filter = args[0]
+        $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{pwd} branch:#{Util::Git.branch_name} args:#{filter}")
+        self.check_branch
+        story = nil
+        if (!args.nil? && args.any?{|arg| arg.include?("-n")})
+          story = self.create_story(args)
+        else
+          story = Util::Story.select_story @project, filter
+        end
 
-  def check_branch
+        abort "There are no available stories." if story.nil?
 
-      current_branch = GitPivotalTrackerIntegration::Util::Git.branch_name
-      # suggested_branch = (GitPivotalTrackerIntegration::Util::Shell.exec "git config --get git-pivotal-tracker-integration.feature-root 2>/dev/null", false).chomp
-      suggested_branch = "develop"
+        if story.story_type == "feature" && story.estimate.to_i <= 0
+          story.estimate = estimate_story
+          story.save
+        end
 
-      if !suggested_branch.nil? && suggested_branch.length !=0 && current_branch != suggested_branch
-          $LOG.warn("Currently checked out branch is '#{current_branch}'.")
-          should_chage_branch = ask("Your currently checked out branch is '#{current_branch}'. Do you want to checkout '#{suggested_branch}' before starting?(Y/n)")
-          if should_chage_branch != "n"
-              $LOG.debug("Checking out branch '#{suggested_branch}'")
-              print "Checking out branch '#{suggested_branch}'...\n\n"
-              $LOG.debug(GitPivotalTrackerIntegration::Util::Shell.exec "git checkout --quiet #{suggested_branch}")
-          end
+        $LOG.debug("story:#{story.name}")
+        Util::Story.pretty_print story
+
+        Util::Git.create_branch feature_branch(story)
+        @configuration.story = story
+        Util::Git.add_hook 'prepare-commit-msg', File.join(File.dirname(__FILE__), !OS.windows? ? 'prepare-commit-msg.sh' : 'prepare-commit-msg-win.sh' )
 
+        start_on_tracker story
       end
 
-  end
+      def check_branch
+        current_branch = Util::Git.branch_name
+        # suggested_branch = (Util::Shell.exec "git config --get git-pivotal-tracker-integration.feature-root 2>/dev/null", false).chomp
+        suggested_branch = 'develop'
+
+        if !suggested_branch.nil? && suggested_branch.length !=0 && current_branch != suggested_branch
+          $LOG.warn("Currently checked out branch is '#{current_branch}'.")
+          should_change_branch = ask("Your currently checked out branch is '#{current_branch}'. Do you want to checkout '#{suggested_branch}' before starting?(Y/n)")
+          if should_change_branch != "n"
+            $LOG.debug("Checking out branch '#{suggested_branch}'")
+            print "Checking out branch '#{suggested_branch}'...\n\n"
+            $LOG.debug(Util::Shell.exec "git checkout --quiet #{suggested_branch}")
+          end
+        end
+      end
 
-  private
+      private
 
-  def development_branch_name(story)
-      prefix = "#{story.id}-"
-      story_name = "#{story.name.gsub(/[^0-9a-z\\s]/i, '_')}"
-      if(story_name.length > 30)
+      def feature_branch(story)
+        prefix = "#{story.id}-"
+        story_name = "#{story.name.gsub(/[^0-9a-z\\s]/i, '_')}"
+        if(story_name.length > 30)
           suggested_suffix = story_name[0..27]
           suggested_suffix << "__"
-      else
+        else
           suggested_suffix = story_name
+        end
+        branch_name = ask("Enter branch name (#{story.id}-<#{suggested_suffix}>): ")
+        branch_name = branch_name.empty? ? "#{prefix}#{suggested_suffix}" : "#{prefix}#{branch_name}"
+        branch_name.gsub(/[^0-9a-z\\s\-]/i, '_')
       end
-      branch_name = "#{prefix}" + ask("Enter branch name (#{story.id}-<#{suggested_suffix}>): ")
-      puts
-      if branch_name == "#{prefix}"
-          branch_name << suggested_suffix
+
+      def start_on_tracker(story)
+        print 'Starting story on Pivotal Tracker... '
+        story.attributes = {
+            :current_state  => 'started',
+            :owned_by       => Util::Git.get_config('user.name')
+        }
+        story.save
+        puts 'OK'
       end
-      branch_name.gsub(/[^0-9a-z\\s\-]/i, '_')
-  end
 
-  def start_on_tracker(story)
-    print 'Starting story on Pivotal Tracker... '
-    story.update(
-      :current_state => 'started',
-      :owned_by => GitPivotalTrackerIntegration::Util::Git.get_config('user.name')
-    )
-    puts 'OK'
-  end
+    end
 
+  end
 end
+

data/lib/git-pivotal-tracker-integration/util/git.rb

@@ -13,232 +13,230 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'git-pivotal-tracker-integration/util/shell'
-require 'git-pivotal-tracker-integration/util/util'
-
-# Utilities for dealing with Git
-class GitPivotalTrackerIntegration::Util::Git
-
-  # Adds a Git hook to the current repository
-  #
-  # @param [String] name the name of the hook to add
-  # @param [String] source the file to use as the source for the created hook
-  # @param [Boolean] overwrite whether to overwrite the hook if it already exists
-  # @return [void]
-  def self.add_hook(name, source, overwrite = false)
-    hooks_directory =  File.join repository_root, '.git', 'hooks'
-    hook = File.join hooks_directory, name
-
-    if overwrite || !File.exist?(hook)
-      print "Creating Git hook #{name}...  "
-
-      FileUtils.mkdir_p hooks_directory
-      File.open(source, 'r') do |input|
-        File.open(hook, 'w') do |output|
-          output.write(input.read)
-          output.chmod(0755)
+module GitPivotalTrackerIntegration
+  module Util
+
+    # Utilities for dealing with Git
+    class Git
+
+      KEY_REMOTE          = 'remote'.freeze
+      KEY_ROOT_BRANCH     = 'root-branch'.freeze
+      KEY_ROOT_REMOTE     = 'root-remote'.freeze
+      RELEASE_BRANCH_NAME = 'pivotal-tracker-release'.freeze
+
+      # Adds a Git hook to the current repository
+      #
+      # @param [String] name the name of the hook to add
+      # @param [String] source the file to use as the source for the created hook
+      # @param [Boolean] overwrite whether to overwrite the hook if it already exists
+      # @return [void]
+      def self.add_hook(name, source, overwrite = false)
+        hooks_directory =  File.join repository_root, '.git', 'hooks'
+        hook = File.join hooks_directory, name
+
+        if overwrite || !File.exist?(hook)
+          print "Creating Git hook #{name}...  "
+
+          FileUtils.mkdir_p hooks_directory
+          File.open(source, 'r') do |input|
+            File.open(hook, 'w') do |output|
+              output.write(input.read)
+              output.chmod(0755)
+            end
+          end
+
+          puts 'OK'
         end
       end
 
-      puts 'OK'
-    end
-  end
+      # Returns the name of the currently checked out branch
+      #
+      # @return [String] the name of the currently checked out branch
+      def self.branch_name
+        Util::Shell.exec('git branch').scan(/\* (.*)/)[0][0]
+      end
 
-  # Returns the name of the currently checked out branch
-  #
-  # @return [String] the name of the currently checked out branch
-  def self.branch_name
-    GitPivotalTrackerIntegration::Util::Shell.exec('git branch').scan(/\* (.*)/)[0][0]
-  end
+      # Creates a branch with a given +name+.  First pulls the current branch to
+      # ensure that it is up to date and then creates and checks out the new
+      # branch.  If specified, sets branch-specific properties that are passed in.
+      #
+      # @param [String] name the name of the branch to create
+      # @param [Boolean] print_messages whether to print messages
+      # @return [void]
+      def self.create_branch(name, print_messages = true)
+        root_branch = branch_name
+        root_remote = get_config KEY_REMOTE, :branch
+
+        print "Pulling #{root_branch}... " if print_messages
+        Util::Shell.exec 'git pull --quiet --ff-only'
+        puts 'OK' if print_messages
+
+        print "Creating and checking out #{name}... " if print_messages
+
+        Util::Shell.exec "git checkout --quiet -b #{name}"
+        set_config KEY_ROOT_BRANCH, root_branch, :branch
+        set_config KEY_ROOT_REMOTE, root_remote, :branch
+        puts 'OK' if print_messages
+      end
 
-  # Creates a branch with a given +name+.  First pulls the current branch to
-  # ensure that it is up to date and then creates and checks out the new
-  # branch.  If specified, sets branch-specific properties that are passed in.
-  #
-  # @param [String] name the name of the branch to create
-  # @param [Boolean] print_messages whether to print messages
-  # @return [void]
-  def self.create_branch(name, print_messages = true)
-    root_branch = branch_name
-    root_remote = get_config KEY_REMOTE, :branch
-
-    if print_messages; print "Pulling #{root_branch}... " end
-    GitPivotalTrackerIntegration::Util::Shell.exec 'git pull --quiet --ff-only'
-    if print_messages; puts 'OK'
-    end
+      # Creates a commit with a given message.  The commit includes all change
+      # files.
+      #
+      # @param [String] message The commit message, which will be appended with
+      #   +[#<story-id]+
+      # @param [PivotalTracker::Story] story the story associated with the current
+      #   commit
+      # @return [void]
+      def self.create_commit(message, story)
+        Util::Shell.exec "git commit --quiet --all --allow-empty --message \"#{message}\n\n[##{story.id}]\""
+      end
 
-    if print_messages; print "Creating and checking out #{name}... " end
-    GitPivotalTrackerIntegration::Util::Shell.exec "git checkout --quiet -b #{name}"
-    set_config KEY_ROOT_BRANCH, root_branch, :branch
-    set_config KEY_ROOT_REMOTE, root_remote, :branch
-    if print_messages; puts 'OK'
-    end
-  end
+      # Creates a tag with the given name.  Before creating the tag, commits all
+      # outstanding changes with a commit message that reflects that these changes
+      # are for a release.
+      #
+      # @param [String] name the name of the tag to create
+      # @param [PivotalTracker::Story] story the story associated with the current
+      #   tag
+      # @return [void]
+      def self.create_release_tag(name, story)
+        root_branch = branch_name
+
+        print "Creating tag v#{name}... "
+
+        create_branch RELEASE_BRANCH_NAME, false
+        create_commit "#{name} Release", story
+        Util::Shell.exec "git tag v#{name}"
+        Util::Shell.exec "git checkout --quiet #{root_branch}"
+        Util::Shell.exec "git branch --quiet -D #{RELEASE_BRANCH_NAME}"
+
+        puts 'OK'
+      end
 
-  # Creates a commit with a given message.  The commit includes all change
-  # files.
-  #
-  # @param [String] message The commit message, which will be appended with
-  #   +[#<story-id]+
-  # @param [PivotalTracker::Story] story the story associated with the current
-  #   commit
-  # @return [void]
-  def self.create_commit(message, story)
-    GitPivotalTrackerIntegration::Util::Shell.exec "git commit --quiet --all --allow-empty --message \"#{message}\n\n[##{story.id}]\""
-  end
+      # Returns a Git configuration value.  This value is read using the +git
+      # config+ command. The scope of the value to read can be controlled with the
+      # +scope+ parameter.
+      #
+      # @param [String] key the key of the configuration to retrieve
+      # @param [:branch, :inherited] scope the scope to read the configuration from
+      #   * +:branch+: equivalent to calling +git config branch.branch-name.key+
+      #   * +:inherited+: equivalent to calling +git config key+
+      # @return [String] the value of the configuration
+      # @raise if the specified scope is not +:branch+ or +:inherited+
+      def self.get_config(key, scope = :inherited)
+        if :branch == scope
+          Util::Shell.exec("git config branch.#{branch_name}.#{key}", false).strip
+        elsif :inherited == scope
+          Util::Shell.exec("git config #{key}", false).strip
+        else
+          raise "Unable to get Git configuration for scope '#{scope}'"
+        end
+      end
 
-  # Creates a tag with the given name.  Before creating the tag, commits all
-  # outstanding changes with a commit message that reflects that these changes
-  # are for a release.
-  #
-  # @param [String] name the name of the tag to create
-  # @param [PivotalTracker::Story] story the story associated with the current
-  #   tag
-  # @return [void]
-  def self.create_release_tag(name, story)
-    root_branch = branch_name
-
-    print "Creating tag v#{name}... "
-
-    create_branch RELEASE_BRANCH_NAME, false
-    create_commit "#{name} Release", story
-    GitPivotalTrackerIntegration::Util::Shell.exec "git tag v#{name}"
-    GitPivotalTrackerIntegration::Util::Shell.exec "git checkout --quiet #{root_branch}"
-    GitPivotalTrackerIntegration::Util::Shell.exec "git branch --quiet -D #{RELEASE_BRANCH_NAME}"
-
-    puts 'OK'
-  end
+      # Merges the current branch to its root branch and deletes the current branch
+      #
+      # @param [PivotalTracker::Story] story the story associated with the current branch
+      # @param [Boolean] no_complete whether to suppress the +Completes+ statement in the commit message
+      # @return [void]
+      def self.merge(story, no_complete)
+        development_branch = branch_name
+        root_branch = get_config KEY_ROOT_BRANCH, :branch
+
+        print "Merging #{development_branch} to #{root_branch}... "
+        Util::Shell.exec "git checkout --quiet #{root_branch}"
+        Util::Shell.exec 'git pull --quiet --ff-only'
+        Util::Shell.exec "git merge --quiet --no-ff -m \"Merge #{development_branch} to #{root_branch}\n\n[#{no_complete ? '' : 'Completes '}##{story.id}]\" #{development_branch}"
+        puts 'OK'
+
+        print "Deleting #{development_branch}... "
+        Util::Shell.exec "git branch --quiet -D #{development_branch}"
+        puts 'OK'
+      end
 
-  # Returns a Git configuration value.  This value is read using the +git
-  # config+ command. The scope of the value to read can be controlled with the
-  # +scope+ parameter.
-  #
-  # @param [String] key the key of the configuration to retrieve
-  # @param [:branch, :inherited] scope the scope to read the configuration from
-  #   * +:branch+: equivalent to calling +git config branch.branch-name.key+
-  #   * +:inherited+: equivalent to calling +git config key+
-  # @return [String] the value of the configuration
-  # @raise if the specified scope is not +:branch+ or +:inherited+
-  def self.get_config(key, scope = :inherited)
-    if :branch == scope
-      GitPivotalTrackerIntegration::Util::Shell.exec("git config branch.#{branch_name}.#{key}", false).strip
-    elsif :inherited == scope
-      GitPivotalTrackerIntegration::Util::Shell.exec("git config #{key}", false).strip
-    else
-      raise "Unable to get Git configuration for scope '#{scope}'"
-    end
-  end
+      # Push changes to the remote of the current branch
+      #
+      # @param [String] refs the explicit references to push
+      # @return [void]
+      def self.push(*refs)
+        remote = get_config KEY_REMOTE, :branch
 
-  # Merges the current branch to its root branch and deletes the current branch
-  #
-  # @param [PivotalTracker::Story] story the story associated with the current branch
-  # @param [Boolean] no_complete whether to suppress the +Completes+ statement in the commit message
-  # @return [void]
-  def self.merge(story, no_complete)
-    development_branch = branch_name
-    root_branch = get_config KEY_ROOT_BRANCH, :branch
-
-    print "Merging #{development_branch} to #{root_branch}... "
-    GitPivotalTrackerIntegration::Util::Shell.exec "git checkout --quiet #{root_branch}"
-    GitPivotalTrackerIntegration::Util::Shell.exec "git merge --quiet --no-ff -m \"Merge #{development_branch} to #{root_branch}\n\n[#{no_complete ? '' : 'Completes '}##{story.id}]\" #{development_branch}"
-    puts 'OK'
-
-    print "Deleting #{development_branch}... "
-    GitPivotalTrackerIntegration::Util::Shell.exec "git branch --quiet -D #{development_branch}"
-    puts 'OK'
-  end
+        print "Pushing to #{remote}... "
+        Util::Shell.exec "git push --quiet #{remote} " + refs.join(' ')
+        puts 'OK'
+      end
 
-  # Push changes to the remote of the current branch
-  #
-  # @param [String] refs the explicit references to push
-  # @return [void]
-  def self.push(*refs)
-    remote = get_config KEY_REMOTE, :branch
+      # Returns the root path of the current Git repository.  The root is
+      # determined by ascending the path hierarchy, starting with the current
+      # working directory (+Dir#pwd+), until a directory is found that contains a
+      # +.git/+ sub directory.
+      #
+      # @return [String] the root path of the Git repository
+      # @raise if the current working directory is not in a Git repository
+      def self.repository_root
+        repository_root = Dir.pwd
+
+        until Dir.entries(repository_root).any? { |child| File.directory?(child) && (child =~ /^.git$/) }
+          next_repository_root = File.expand_path('..', repository_root)
+          abort('Current working directory is not in a Git repository') unless repository_root != next_repository_root
+          repository_root =  next_repository_root
+        end
 
-    print "Pushing to #{remote}... "
-    GitPivotalTrackerIntegration::Util::Shell.exec "git push --quiet #{remote} " + refs.join(' ')
-    puts 'OK'
-  end
+        repository_root
+      end
 
-  # Returns the root path of the current Git repository.  The root is
-  # determined by ascending the path hierarchy, starting with the current
-  # working directory (+Dir#pwd+), until a directory is found that contains a
-  # +.git/+ sub directory.
-  #
-  # @return [String] the root path of the Git repository
-  # @raise if the current working directory is not in a Git repository
-  def self.repository_root
-    repository_root = Dir.pwd
-
-    until Dir.entries(repository_root).any? { |child| File.directory?(child) && (child =~ /^.git$/) }
-      next_repository_root = File.expand_path('..', repository_root)
-      abort('Current working directory is not in a Git repository') unless repository_root != next_repository_root
-      repository_root =  next_repository_root
-    end
+      # Sets a Git configuration value.  This value is set using the +git config+
+      # command.  The scope of the set value can be controlled with the +scope+
+      # parameter.
+      #
+      # @param [String] key the key of configuration to store
+      # @param [String] value the value of the configuration to store
+      # @param [:branch, :global, :local] scope the scope to store the configuration value in.
+      #   * +:branch+: equivalent to calling +git config --local branch.branch-name.key value+
+      #   * +:global+: equivalent to calling +git config --global key value+
+      #   * +:local+:  equivalent to calling +git config --local key value+
+      # @return [void]
+      # @raise if the specified scope is not +:branch+, +:global+, or +:local+
+      def self.set_config(key, value, scope = :local)
+        if :branch == scope
+          Util::Shell.exec "git config --local branch.#{branch_name}.#{key} #{value}"
+        elsif :global == scope
+          Util::Shell.exec "git config --global #{key} #{value}"
+        elsif :local == scope
+          Util::Shell.exec "git config --local #{key} #{value}"
+        else
+          raise "Unable to set Git configuration for scope '#{scope}'"
+        end
+      end
 
-    repository_root
-  end
+      # Checks whether merging the current branch back to its root branch would be
+      # a trivial merge.  A trivial merge is defined as one where the net change
+      # of the merge would be the same as the net change of the branch being
+      # merged.  The easiest way to ensure that a merge is trivial is to rebase a
+      # development branch onto the tip of its root branch.
+      #
+      # @return [void]
+      def self.trivial_merge?
+        development_branch = branch_name
+        root_branch = get_config KEY_ROOT_BRANCH, :branch
 
-  # Sets a Git configuration value.  This value is set using the +git config+
-  # command.  The scope of the set value can be controlled with the +scope+
-  # parameter.
-  #
-  # @param [String] key the key of configuration to store
-  # @param [String] value the value of the configuration to store
-  # @param [:branch, :global, :local] scope the scope to store the configuration value in.
-  #   * +:branch+: equivalent to calling +git config --local branch.branch-name.key value+
-  #   * +:global+: equivalent to calling +git config --global key value+
-  #   * +:local+:  equivalent to calling +git config --local key value+
-  # @return [void]
-  # @raise if the specified scope is not +:branch+, +:global+, or +:local+
-  def self.set_config(key, value, scope = :local)
-    if :branch == scope
-      GitPivotalTrackerIntegration::Util::Shell.exec "git config --local branch.#{branch_name}.#{key} #{value}"
-    elsif :global == scope
-      GitPivotalTrackerIntegration::Util::Shell.exec "git config --global #{key} #{value}"
-    elsif :local == scope
-      GitPivotalTrackerIntegration::Util::Shell.exec "git config --local #{key} #{value}"
-    else
-      raise "Unable to set Git configuration for scope '#{scope}'"
-    end
-  end
+        print "Checking for trivial merge from #{development_branch} to #{root_branch}... "
 
-  # Checks whether merging the current branch back to its root branch would be
-  # a trivial merge.  A trivial merge is defined as one where the net change
-  # of the merge would be the same as the net change of the branch being
-  # merged.  The easiest way to ensure that a merge is trivial is to rebase a
-  # development branch onto the tip of its root branch.
-  #
-  # @return [void]
-  def self.trivial_merge?
-    development_branch = branch_name
-    root_branch = get_config KEY_ROOT_BRANCH, :branch
+        Util::Shell.exec "git checkout --quiet #{root_branch}"
+        Util::Shell.exec 'git pull --quiet --ff-only'
+        Util::Shell.exec "git checkout --quiet #{development_branch}"
 
-    print "Checking for trivial merge from #{development_branch} to #{root_branch}... "
+        root_tip = Util::Shell.exec "git rev-parse #{root_branch}"
+        common_ancestor = Util::Shell.exec "git merge-base #{root_branch} #{development_branch}"
 
-    GitPivotalTrackerIntegration::Util::Shell.exec "git checkout --quiet #{root_branch}"
-    GitPivotalTrackerIntegration::Util::Shell.exec 'git pull --quiet --ff-only'
-    GitPivotalTrackerIntegration::Util::Shell.exec "git checkout --quiet #{development_branch}"
+        if root_tip != common_ancestor
+          abort "\n#{root_branch} branch is ahead of your #{development_branch} branch. \nSo please merge #{root_branch} to #{development_branch} and resolve any conflicts if any. Run 'git merge #{root_branch}' and try git finish again."
+        end
 
-    root_tip = GitPivotalTrackerIntegration::Util::Shell.exec "git rev-parse #{root_branch}"
-    common_ancestor = GitPivotalTrackerIntegration::Util::Shell.exec "git merge-base #{root_branch} #{development_branch}"
+        puts 'OK'
+      end
 
-    if root_tip != common_ancestor
-      abort "\n#{root_branch} branch is ahead of your #{development_branch} branch. \nSo please merge #{root_branch} to #{development_branch} and resolve any conflicts if any. Run 'git merge #{root_branch}' and try git finish again."
     end
 
-    puts 'OK'
   end
-
-  private
-
-  KEY_REMOTE = 'remote'.freeze
-
-  KEY_ROOT_BRANCH = 'root-branch'.freeze
-
-  KEY_ROOT_REMOTE = 'root-remote'.freeze
-
-  RELEASE_BRANCH_NAME = 'pivotal-tracker-release'.freeze
-
 end