hg-port 0.0.0

data/MIT-LICENSE.txt

@@ -0,0 +1,21 @@
+Copyright (c) 2013 Richard Cook - http://rcook.org/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/bin/hg-port

@@ -0,0 +1,207 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'tempfile'
+
+THIS_PATH = Pathname.new(__FILE__).realpath
+THIS_DIR = THIS_PATH.dirname
+THIS_BASE_NAME = THIS_PATH.basename
+
+module Helper
+  def self.fail(message, lines)
+    display_output(lines)
+    raise RuntimeError.new(message)
+  end
+
+  def self.display_output(lines)
+    lines.each do |line|
+      puts "> #{line}"
+    end
+  end
+
+  def self.display_usage(versions)
+    $stderr.puts <<-EOS
+Usage:
+    #{THIS_BASE_NAME} [<arg0> ... <argN-1>]
+
+Switches:
+    --merge-version <version-branch>
+
+Available versions:
+#{versions.collect { |version| "    #{version}" }.join("\n")}
+
+EOS
+  end
+end
+
+module HGHelper
+  def self.run_hg(dir, command, fail_on_error = true)
+    temp_file = Tempfile.new('hg-port-run-hg')
+    status = nil
+    lines = nil
+    begin
+      temp_file.close
+      status = system("(cd #{dir} && #{command}) > #{temp_file.path} 2>&1")
+      lines = File.readlines(temp_file.path).collect(&:chomp)
+      if fail_on_error && !status
+        Helper.fail("Command \"#{command}\" failed in directory \"#{dir}\"", lines)
+      end
+    ensure
+      temp_file.unlink
+    end
+    [status, lines]
+  end
+
+  def self.get_branches(dir)
+    status, lines = run_hg(dir, 'hg branches')
+    lines.collect { |line| line.split.first }
+  end
+
+  def self.current_branch(dir)
+    status, lines = run_hg(dir, 'hg branch')
+    lines.first
+  end
+end
+
+
+class Version
+  include Comparable
+
+  attr_reader :major, :minor
+
+  def self.parse(str)
+    return nil if str !~ /^v([0-9]+)\.([0-9]+)$/
+    new(Integer($1), Integer($2))
+  end
+
+  def <=>(other)
+    return 1 if other.nil?
+
+    delta = major - other.major
+    return 1 if delta > 0
+    return -1 if delta < 0
+
+    delta = minor - other.minor
+    return 1 if delta > 0
+    return -1 if delta < 0
+    0
+  end
+
+  def to_s
+    "v#{major}.#{minor}"
+  end
+
+  private
+
+  def initialize(major, minor)
+    @major = major
+    @minor = minor
+  end
+end
+
+class Options
+  attr_reader :merge_version
+
+  def self.parse(args, versions)
+    merge_version = nil
+    while arg = args.shift
+      case arg
+      when '--merge-version' then
+        temp = args.shift or raise RuntimeError.new('Value required for --merge-version')
+        merge_version = Version.parse(temp) or raise RuntimeError.new("Invalid value \"#{temp}\" for --merge-version")
+      else
+        raise RuntimeError.new("Unsupported switch \"#{arg}\"")
+      end
+    end
+
+    if !merge_version || !versions.include?(merge_version)
+      Helper.display_usage(versions)
+      return nil
+    end
+
+    new(merge_version)
+  end
+
+  private
+
+  def initialize(merge_version)
+    @merge_version = merge_version
+  end
+end
+
+def get_versions(branches)
+  branches.collect { |branch| Version.parse(branch)}.compact.sort
+end
+
+def forward_port(dir, merge_version, version)
+  # Move to the target branch.
+  HGHelper.run_hg(dir, "hg update #{version}")
+
+  # Build commit message from preview
+  status, lines = HGHelper.run_hg(dir, "hg merge --preview #{merge_version}")
+  puts "LINES: #{lines.inspect}"
+  commit_message = <<-EOS
+Automatic forward port from #{merge_version} to #{version}
+
+----------
+
+Changes merged by this commit:
+#{lines.collect { |line| "  #{line}" }.join("\n")}
+EOS
+
+  temp_file = Tempfile.new('hg-port-commit-message')
+  begin
+    temp_file.write commit_message
+    temp_file.close
+
+    # Perform the merge for real
+    status, lines = HGHelper.run_hg(dir, "hg merge #{merge_version}", false)
+    if status
+      status, lines = HGHelper.run_hg(dir, "hg commit --logfile #{temp_file.path} && hg tip --template '{node}'")
+      revision_id = lines.last
+      puts "Changes automatically ported from #{merge_version} to #{version} (#{revision_id[0...12]})"
+      true
+    elsif lines.include?('abort: merging with a working directory ancestor has no effect')
+      puts "No changes required porting from #{merge_version} to #{version}"
+      true
+    else
+      Helper.display_output(lines)
+
+      puts <<-EOS
+Automatic forward port abandoned due to merge conflict.
+Please resolve conflict manually and commit your changes.
+Suggested commit command:
+
+    hg commit -m "Manual forward port form #{merge_version} to #{version}"
+
+Resume the automatic forward port with the following command:
+
+    #{THIS_BASE_NAME} --merge-version #{version}
+
+EOS
+      false
+    end
+  ensure
+    temp_file.unlink
+  end
+
+end
+
+dir = '.'
+
+versions = get_versions(HGHelper.get_branches(dir))
+options = Options.parse(ARGV.clone, versions)
+exit 1 if options.nil?
+
+unless options.merge_version.to_s == HGHelper.current_branch(dir)
+  raise RuntimeError.new("Check out merge version \"#{options.merge_version}\" before attempting a forward port")
+end
+
+merge_and_later_versions = versions.select { |version| version >= options.merge_version }
+merge_and_later_versions.each_with_index do |version, index|
+  next if index == 0
+  unless forward_port(dir, merge_and_later_versions[index - 1], version)
+    exit 1
+  end
+end
+puts 'Done'
+

metadata

@@ -0,0 +1,48 @@
+--- !ruby/object:Gem::Specification
+name: hg-port
+version: !ruby/object:Gem::Version
+  version: 0.0.0
+  prerelease: 
+platform: ruby
+authors:
+- Richard Cook
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2013-07-23 00:00:00.000000000 Z
+dependencies: []
+description: Script to automate forward porting in Mercurial
+email: rcook@rcook.org
+executables:
+- hg-port
+extensions: []
+extra_rdoc_files: []
+files:
+- MIT-LICENSE.txt
+- bin/hg-port
+homepage: https://bitbucket.org/rcook/hg-port
+licenses:
+- MIT
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 1.8.23
+signing_key: 
+specification_version: 3
+summary: hg-port
+test_files: []