submerge 0.1

data/History.txt

@@ -0,0 +1,3 @@
+== 0.1 / 2007-12-27
+
+* Initial release

data/Manifest.txt

@@ -0,0 +1,9 @@
+History.txt
+Manifest.txt
+README.txt
+Rakefile
+bin/submerge
+lib/contrib/revision.rb
+lib/submerge.rb
+lib/svn_helper.rb
+test/test_submerge.rb

data/README.txt

@@ -0,0 +1,77 @@
+submerge
+    by Aaron Suggs
+    http://ktheory.com/
+
+== DESCRIPTION:
+  
+Submerge make it easy to perform common merge tasks when working with trunk
+and branches in the subversion SCM.
+
+Submerge requires that your present working directory is a subversion
+checkout in order to compute the svn URL of your current checkout.
+
+submerge assumes that your project follows the convention of keeping the
+latest changes in
+  your-svn-project-url/trunk
+and branches in
+  your-svn-project-url/branches/your-branch-name
+and moreover that release branches are named like "RB-/\d+(\.\d+)*/";
+e.g. the release 1.0 branch would have the URL
+  your-svn-project-url/branches/RB-1.0
+
+== FEATURES/PROBLEMS:
+
+== SYNOPSIS:
+
+$ submerge [CHANGESET...] [-b BRANCH]
+
+CHANGESET may either be a single number, like "2", or a range changesets,
+like "M:N" where M and N are numbers. If no CHANGESET is specified, defaults
+to a single number HEAD. If M or N is not specified in range form, they
+default to HEAD.
+So the following are equivalent:
+  submerge
+  submerge HEAD
+and
+  submerge 2:
+  submerge 2:HEAD
+and
+  submerge :999
+  submerge HEAD:999
+
+If BRANCH is not set, defaults to:
+  * latest release branch if pwd is a trunk checkout
+  * trunk otherwise
+
+The -u or --undor option may be used for in
+
+== REQUIREMENTS:
+
+== INSTALL:
+
+gem install submerge
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2007 FIX
+
+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/Rakefile

@@ -0,0 +1,18 @@
+# -*- ruby -*-
+
+require 'rubygems'
+require 'hoe'
+$:.unshift(File.dirname(__FILE__) + "/lib")
+require 'submerge'
+
+Hoe.new('submerge', Submerge::VERSION) do |p|
+  p.rubyforge_name = 'submerge'
+  # p.author = 'Aaron Suggs'
+  # p.email = 'aaron@ktheory.om'
+  # p.summary = 'A tool for helping merge changesets between branches in the Subversion SCM'
+  # p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
+  # p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
+  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
+end
+
+# vim: syntax=Ruby

data/bin/submerge

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+begin
+  require 'submerge'
+rescue LoadError
+  require 'rubygems'
+  require 'submerge'
+end
+Submerge.new(ARGV).run

data/lib/contrib/revision.rb

@@ -0,0 +1,85 @@
+# Revision class
+# Designed to function in version comparisons, where the
+# version number matches /\d+(\.\d+)*/
+
+# Author: Hugh Sasse, De Montfort University <hgs / dmu.ac.uk>
+
+# Created: 06-OCT-2000
+# Last Modified: 19-OCT-2005
+# $Id: revision.rb,v 1.3 2000-10-09 10:40:39+01 hgs Exp hgs $
+
+class RevisionComparisonError < RuntimeError; end
+
+class Revision
+  include Comparable
+
+  DEBUG = false
+
+  attr :contents
+
+  def to_i
+    @contents.join('').to_i
+  end
+
+  def to_s
+    astring = @contents.collect { |j| j.to_s }.join(".")
+  end
+
+  # Convert the Major.Minor to float.  MinorMinor version number
+  # is difficult to handle because it depends on the size of Minor
+  # to determine how far right to shift it.  Bacwards
+  # compatibility would necessitate 1 decimal place per revision,
+  # but if Ruby reaches 1.10.1 this will break.  Therefore float
+  # comparisons should be deprecated.
+  def to_f
+    (@contents[0].to_s + '.' + contents[1]..to_s).to_f
+  end
+
+  def [](i)
+    return @contents[i]
+  end
+
+  def <=>(x)
+    puts "Revision(#{self}).<=> called with (#{x})" if DEBUG 
+    case x
+    when String
+      result = self <=> Revision.new(x)
+    when Float
+      f = self.to_f
+      puts "#{f} <=> #{x}" if DEBUG
+      result = self.to_f <=> x
+    when Revision
+      len = [@contents.size, x.contents.size].max 
+      puts "len is #{len}" if DEBUG
+      result = 0
+      (0..(len-1)).each do |index|
+        puts "result is #{result}" if DEBUG
+        if result ==  0 
+          result = ((@contents[index] || 0) <=> (x.contents[index] || 0))
+        else
+          break
+        end
+      end
+      puts " finally result is #{result}" if DEBUG
+      result
+    else
+      raise RevisionComparisonError.new("self is #{self}, other is #{x}")
+    end
+    result
+  end
+
+  def initialize(thing)
+    if thing.class == Revision
+      @contents = thing.contents.dup
+      # dup so we get a new copy, not a pointer to it.
+    elsif thing.class == String
+      result = thing.split(".").collect {|j| j.to_i}
+      @contents = result
+    elsif thing.class == Float
+      @contents = thing.to_s.split(".").collect {|j| j.to_i}
+    else
+      raise "cannot initialise to #{thing}"
+    end
+    puts "initialize(#{thing}) => @contents is #{@contents}" if DEBUG
+  end
+end

data/lib/submerge.rb

@@ -0,0 +1,157 @@
+# == Author
+#   Aaron Suggs (aaron@zenbe.com)
+#
+# == Copyright
+#   Copyright (c) 2007 Zenbe.
+require 'optparse'
+require 'ostruct'
+require 'rdoc/usage'
+
+#$:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+begin
+  require 'contrib/revision'
+  require 'svn_helper'
+rescue
+
+  require 'rubygems'
+  gem 'submerge'
+end
+
+class Submerge
+  VERSION = '0.1'
+
+  attr_reader :options
+
+  def initialize(args)
+    # Set default options
+    @options = OpenStruct.new
+    @options.quiet = false
+    @options.verbose = false
+    
+    # Parse options
+    opts = OptionParser.new 
+    opts.on('-v', '--version')    { output_version; exit 0 }
+    opts.on('-h', '--help', '-?') { output_help; exit 0 }
+    opts.on('-V', '--verbose')    { @options.verbose = true }  
+    opts.on('-q', '--quiet')      { @options.quiet = true }
+    opts.on('-u', '--undo')       { @options.undo = true}
+    opts.on("-b", "--branch BRANCH", "merge from branch BRANCH") {|branch| @branch = branch}
+    opts.parse!(args)
+
+    begin
+      @svn = SvnHelper.new
+    rescue => e
+      puts e.message
+      exit 1
+    end
+
+    @changesets = opts.default_argv
+    if @changesets.empty?
+      puts "No changesets specified, using HEAD" if @options.verbose
+      @changesets << 'HEAD'
+    end
+  end
+  
+  def run
+    parse_changesets
+    
+    @changesets.each do |changeset|
+      cmd = "svn merge -r#{changeset} #{source_url}"
+      puts cmd unless @options.quiet
+      system(cmd)
+    end
+  end
+
+  def source_url
+    @source_url ||= compute_source_url
+  end
+
+  def compute_source_url
+    # Compute the source_url from which to merge
+    if @branch
+      unless @svn.valid_branch?(@branch)
+        puts "Invalid branch #{@branch}"
+        exit 1
+      end
+      url = @svn.branch_url(@branch)
+    else
+      url = @svn.trunk? ? @svn.latest_release_branch_url : @svn.trunk_url
+    end
+    puts "Merging from #{url}" unless @options.quiet
+    url
+  end
+
+  # Convert all changesets to ranges by merging from prevision changeset.
+  # E.g.,
+  # "5" => "4:5";
+  # "5:" => "5:HEAD"
+  def parse_changesets
+    @changesets.map! do |changeset|
+      if changeset.include?(':')
+        # Changeset range
+        s,e =  changeset.split(':')
+        [s,e].each{|rev| rev = (rev.to_i == 0) ? @svn.head_revision : rev}
+        "#{s}:#{e}"
+      else
+        # Single changeset
+        rev = (changeset.to_i == 0) ? @svn.head_revision.to_i : changeset.to_i
+        @options.undo ? "#{rev}:#{rev-1}" : "#{rev-1}:#{rev}"
+      end
+    end
+  end
+
+  protected
+
+  def output_help
+    output_version
+    
+    puts %Q{
+USAGE:
+  $ submerge [CHANGESET...] [-b BRANCH]
+
+  CHANGESET may either be a single number, like "2", or a range changesets,
+  like "M:N" where M and N are numbers. If no CHANGESET is specified, defaults
+  to a single number HEAD. If M or N is not specified in range form, they
+  default to HEAD.
+  So the following are equivalent:
+    submerge
+    submerge HEAD
+  and
+    submerge 2:
+    submerge 2:HEAD
+  and
+    submerge :999
+    submerge HEAD:999
+
+  If BRANCH is not set, defaults to:
+    * latest release branch if pwd is a trunk checkout
+    * trunk otherwise
+
+OPTIONS:
+  -h, --help          Display help message
+  -b, --branch        Specify a branch from which to merge
+  -q, --quiet         Silence output
+  -u, --undo          Invert merge order for single
+
+EXAMPLES:
+  If your pwd is a trunk checkout:
+   The following command would merge the difference from changeset 999
+     from the latest release branch to your pwd:
+     submerge 999
+   This is equivalent to running
+     svn merge -r998:999 your-svn-project-url/branches/latest-release-branch
+   The following merges changeset 999 from my-branch:
+     submerge 999 -b my-branch
+     submerge 2
+  Other examples:
+    submerge 2:HEAD
+    submerge 2 3 100
+    submerge 2 -b BRANCH
+}
+    exit
+  end
+
+  def output_version
+    puts "#{File.basename(__FILE__, '.rb')} version #{VERSION}"
+  end
+end

data/lib/svn_helper.rb

@@ -0,0 +1,71 @@
+# Worlds dumbest svn wrapper
+class SvnNotFound < Exception; end
+class PwdNotSvn < Exception; end
+class UnrecognizedSvnURL < Exception; end
+
+
+class SvnHelper
+  TRUNK_REGEXP = /\/trunk$/ # matches a trunk checkout
+  BRANCH_REGEXP = /\/branches\/\S+$/ # matches a branch checkout
+  RELEASE_BRANCH_REGEXP = /^RB-([0-9.]+)/ # matches release branch names
+  
+  attr_reader :url
+  
+  def initialize
+    begin
+      @svn_path = `which svn`
+      raise SvnNotFound, "svn not found in path" if @svn_path.empty?
+      svn_info = `svn info`
+      raise PwdNotSvn, "Current directory does not appear to be under SVN" unless $? == 0
+      svn_info.detect{|line| line =~ /^URL: (.*)$/}
+      @url = $1 # The current url
+      raise UnrecognizedSvnUrl, "SVN url is neither trunk nor a branch: #{@url}" unless trunk? || branch?
+    end
+  end
+
+  # Is the current directory a trunk checkout?
+  def trunk?
+    @url =~ TRUNK_REGEXP
+  end
+
+  # Is the current directory a branch checkout?
+  def branch?
+    @url =~ BRANCH_REGEXP
+  end
+  
+  def base_url
+    @base_url ||= @url.gsub(trunk? ? TRUNK_REGEXP : BRANCH_REGEXP, '')
+  end
+  
+  def branches
+    @branches ||= `svn ls #{base_url}/branches`.split("\n").map{|name| name.sub(/\/$/, '')}
+  end
+  
+  def valid_branch?(branch)
+    branches.include? branch
+  end
+  
+  def latest_release_branch
+    begin
+      @latest_release ||= branches.inject(Revision.new('0')){|rev, branch| branch =~ RELEASE_BRANCH_REGEXP ? [rev, Revision.new($1)].max : rev}
+      raise LatestReleaseBranchNotFound, "could not find a latest release branch\ntry specifying a source with '-b BRANCH' instead" if @latest_release == Revision.new('0')
+      @latest_release_branch ||= "RB-#{@latest_release}"
+    end
+  end
+  
+  def head_revision
+    # TODO: there must be a better way to compute this
+    @head_revision ||= `svn log --limit 1 -q`.split[1].sub(/^r/, '')
+  end
+  def trunk_url
+    "#{base_url}/trunk"
+  end
+  
+  def branch_url(branch)
+    "#{base_url}/branches/#{branch}"
+  end
+
+  def latest_release_branch_url
+    branch_url(latest_release_branch)
+  end
+end

metadata

@@ -0,0 +1,65 @@
+--- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.4
+specification_version: 1
+name: submerge
+version: !ruby/object:Gem::Version 
+  version: "0.1"
+date: 2007-12-27 00:00:00 -05:00
+summary: The author was too lazy to write a summary
+require_paths: 
+- lib
+email: ryand-ruby@zenspider.com
+homepage: http://www.zenspider.com/ZSS/Products/submerge/
+rubyforge_project: submerge
+description: The author was too lazy to write a description
+autorequire: 
+default_executable: 
+bindir: bin
+has_rdoc: true
+required_ruby_version: !ruby/object:Gem::Version::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
+  version: 
+platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
+authors: 
+- Ryan Davis
+files: 
+- History.txt
+- Manifest.txt
+- README.txt
+- Rakefile
+- bin/submerge
+- lib/contrib/revision.rb
+- lib/submerge.rb
+- lib/svn_helper.rb
+- test/test_submerge.rb
+test_files: 
+- test/test_submerge.rb
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
+executables: 
+- submerge
+extensions: []
+
+requirements: []
+
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.0
+    version: