knu-svn2git 1.3.1

data/.gitignore

@@ -0,0 +1 @@
+pkg

data/ChangeLog.markdown

@@ -0,0 +1,53 @@
+# 1.3.1 - 2009-06-09
+
+  Thanks to iteman for finding a problem with the tagging process and providing a patch.
+  
+  * Fixed a problem with creating actual git tags when the SVN tags path was named anything other than 'tags.'
+
+# 1.3.0 - 2009-06-09
+
+  Many thanks to mss for the patches making up most of this release.
+
+  * Fixed a problem where tags didn't get the original date and time.
+  * New switch --exclude which can be used to specify a PCRE pattern to exclude paths from the import.
+  * New switches --no{trunk,branches,tags} to skip import of those.
+  * Improved docs.
+
+# 1.2.4 - 2009-05-04
+
+  * No changes.  I ran the jeweler command twice inadvertently.  Tearing down the release would be more harmful than helpful.
+
+# 1.2.3 - 2009-05-04
+
+  * Yanked out the code referencing the gem by name.  This shouldn't be necessary at all.
+
+# 1.2.2 - 2009-05-04
+
+  * Updated the reference gem in the binary to use this one and not the one on RubyForge.
+
+# 1.2.1 - 2009-04-19
+
+  * Fixed a problem with the svn2git binary not loading command-line args properly.
+
+# 1.2.0 - 2009-04-17
+
+  * Reworked command-line options so they work similarly to every other app in the world.
+  * Better error messaging when no URL provided.
+  * Improved docs.
+
+# 1.1.1 - 2009-04-15
+  
+  * Started using Jeweler for gem management.
+  * Fixed issue with not loading up RubyGems appropriately.
+
+# 1.1.0 - 2009-01-02
+
+  * First release since nirvdrum fork.
+  
+  * Fixed issues with handling of tags and branches.
+  * Added better logging of output from git-svn.
+  * Wrap external command processing to capture failures.
+
+# 1.0.0 - 2008-07-19
+
+  * Forked version from jcoglan.

data/MIT-LICENSE

@@ -0,0 +1,21 @@
+Copyright (c) 2008 James Coglan, Kevin Menard
+Copyright (c) 2009 Akinori MUSHA
+
+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/README.markdown

@@ -0,0 +1,179 @@
+svn2git
+=======
+
+_svn2git_ is a tiny utility for migrating projects from Subversion to Git
+while keeping the trunk, branches and tags where they should be. It uses
+git-svn to clone an svn repository and does some clean-up to make sure
+branches and tags are imported in a meaningful way, and that the code checked
+into master ends up being what's currently in your svn trunk rather than
+whichever svn branch your last commit was in.
+
+Examples
+--------
+
+Say I have this code in svn:
+
+    trunk
+      ...
+    branches
+      1.x
+      2.x
+    tags
+      1.0.0
+      1.0.1
+      1.0.2
+      1.1.0
+      2.0.0
+
+git-svn will go through the commit history to build a new git repo. It will
+import all branches and tags as remote svn branches, whereas what you really
+want is git-native local branches and git tag objects. So after importing this
+project I'll get:
+
+    $ git branch
+    * master
+    $ git branch -a
+    * master
+      1.x
+      2.x
+      tags/1.0.0
+      tags/1.0.1
+      tags/1.0.2
+      tags/1.1.0
+      tags/2.0.0
+      trunk
+    $ git tag -l
+    [ empty ]
+
+After svn2git is done with your project, you'll get this instead:
+
+    $ git branch
+    * master
+      1.x
+      2.x
+    $ git tag -l
+      1.0.0
+      1.0.1
+      1.0.2
+      1.1.0
+      2.0.0
+
+Finally, it makes sure the HEAD of master is the same as the current trunk of
+the svn repo.
+
+Installation
+------------
+
+Make sure you have git installed, then install the gem:
+
+    $ sudo apt-get install git-core git-svn
+    $ sudo gem install knu-svn2git
+
+Usage
+-----
+
+There are a number of ways in which you can create a git repo from an existing
+svn repo. The differentiating factor is the svn repo layout. Below is an
+enumerated listing of the varying supported layouts and the proper way to
+create a git repo from a svn repo in the specified layout.
+
+1. The svn repo is in the standard layout of (trunk, branches, tags) at the
+root level of the repo.
+
+        $ svn2git http://svn.example.com/path/to/repo
+
+2. The svn repo is NOT in standard layout and has only a trunk and tags at the
+root level of the repo.
+
+        $ svn2git http://svn.example.com/path/to/repo --trunk dev --tags rel --nobranches
+
+3. The svn repo is NOT in standard layout and has only a trunk at the root
+level of the repo.
+
+        $ svn2git http://svn.example.com/path/to/repo --trunk trunk --nobranches --notags
+
+4. The svn repo is NOT in standard layout and has no trunk, branches, or tags
+at the root level of the repo. Instead the root level of the repo is
+equivalent to the trunk and there are no tags or branches.
+
+        $ svn2git http://svn.example.com/path/to/repo --rootistrunk
+
+Or you may want to only grab the trunk from a svn repo.
+
+        $ svn2git http://svn.example.com/path/to/repo/trunk repo --rootistrunk
+
+5. The svn repo is in the standard layout but you want to exclude the massive
+doc directory and the backup files you once accidently added.
+
+        $ svn2git http://svn.example.com/path/to/repo --exclude doc --exclude '.*~$'
+
+Note that in the above cases the trunk, branches, tags options are
+simply folder names relative to the provided repo path. For example if
+you specified trunk=foo branches=bar and tags=foobar it would be
+referencing http://svn.example.com/path/to/repo/foo as your trunk, and
+so on. However, in case 4 it references the root of the repo as trunk.
+
+If you want to fix an existing repository created by git-svn, run the
+following command.
+
+        $ svn2git --fix repo
+
+
+Authors
+-------
+
+To convert all your svn authors to git format, create a file somewhere on your
+system with the list of conversions to make, one per line, for example:
+
+    jcoglan = James Coglan <jcoglan@never-you-mind.com>
+    stnick = Santa Claus <nicholas@lapland.com>
+
+Then pass an +authors+ option to +svn2git+ pointing to your file:
+
+    $ svn2git http://svn.example.com/path/to/repo --authors ~/authors.txt
+
+Alternatively, you can place the authors file into ~/.svn2git/authors and
+svn2git will load it out of there. This allows you to build up one authors
+file for all your projects and have it loaded for each repository that you
+migrate.
+
+Debugging
+---------
+
+If you're having problems with converting your repository and you're not sure why,
+try turning on verbose logging.  This will print out more information from the
+underlying git-svn process.
+
+You can turn on verbose logging with the '-v' or '--verbose' flags, like so:
+
+    $ svn2git http://svn.yoursite.com/path/to/repo --verbose
+
+FAQ
+---
+
+1. Why don't the tags show up in the master branch?
+
+    The tags won't show up in the master branch because the tags are actually
+    tied to the commits that were created in svn when the user made the tag.
+    Those commits are the first (head) commit of branch in svn that is
+    associated with that tag. If you want to see all the branches and tags
+    and their relationships in gitk you can run the following: gitk --all
+    
+    For further details please refer to FAQ #2.
+    
+2. Why don't you reference the parent of the tag commits instead?
+
+    In svn you are forced to create what are known in git as annotated tags.
+    It just so happens that svn annotated tags allow you to commit change
+    sets along with the tagging action. This means that the svn annotated tag
+    is a bit more complex then just an annotated tag it is a commit which is
+    treated as an annotated tag. Hence, for there to be a true 1-to-1 mapping
+    between git and svn we have to transfer over the svn commit which acts as
+    an annotated tag and then tag that commit in git using an annotated tag.
+    
+    If we were to reference the parent of this svn tagged commit there could
+    potentially be situations where a developer would checkout a tag in git
+    and the resulting code base would be different then if they checked out
+    that very same tag in the original svn repo. This is only due to the fact
+    that the svn tags allow changesets in them, making them not just annotated
+    tags.

data/Rakefile

@@ -0,0 +1,45 @@
+require 'rake'
+require 'rake/gempackagetask'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |spec|
+    spec.name = "svn2git"
+    spec.summary = "A tool for migrating svn projects to git"
+    spec.authors = ["James Coglan", "Kevin Menard", "Akinori MUSHA"]
+    spec.homepage = "https://www.negativetwenty.net/redmine/projects/svn2git"
+    spec.email = "knu@idaemons.org"
+    spec.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
+  end
+  
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+    
+# 
+# spec = Gem::Specification.new do |spec| 
+#   
+#   spec.version = "1.1.0"
+#   spec.platform = Gem::Platform::RUBY
+#   
+#   
+#   spec.require_path = "lib"
+#   spec.files = FileList["lib/**/*"].to_a
+#   spec.autorequire = "lib/svn2git.rb"
+#   spec.bindir = "bin"
+#   spec.executables = ["svn2git"]
+#   spec.default_executable = "svn2git"
+#   
+#   
+#   
+#   
+#   spec.test_files = FileList["test/**/*"].to_a
+#   spec.has_rdoc = true
+#   spec.extra_rdoc_files = ["README"]
+#   spec.rdoc_options << "--main" << "README" << '--line-numbers' << '--inline-source'
+# end
+#  
+# Rake::GemPackageTask.new(spec) do |pkg| 
+#   pkg.need_tar = true 
+# end
+# 

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:minor: 3
+:patch: 1
+:major: 1

data/bin/svn2git

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+# Copyright (c) 2008 James Coglan
+#
+# 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.
+
+require 'svn2git'
+
+migration = Svn2Git::Migration.new(ARGV)
+migration.run!

data/lib/svn2git.rb

@@ -0,0 +1,2 @@
+require File.dirname(__FILE__) + '/svn2git/migration'
+

data/lib/svn2git/migration.rb

@@ -0,0 +1,247 @@
+require 'optparse'
+require 'pp'
+require 'shellwords'
+
+module Svn2Git
+  DEFAULT_AUTHORS_FILE = File.expand_path("~/.svn2git/authors")
+
+  class Migration
+
+    attr_reader :dir
+
+    def initialize(args)
+      @options = parse(args)
+      if @options[:fix]
+        show_help_message('Too many arguments') if args.size > 1
+        @repo = args.first || '.'
+      else
+        show_help_message("Missing SVN_URL parameter") if args.empty?
+        show_help_message('Too many arguments') if args.size > 2
+        @url, @repo = args
+        @repo ||= @url.split('/').last || '.'
+      end
+
+      if !File.directory?(@repo)
+        begin
+          Dir.mkdir(@repo)
+        rescue => e
+          show_help_message("Cannot create #{@repo}: #{e}")
+        end
+      end
+      Dir.chdir(@repo)
+    end
+
+    def run!
+      if @options[:fix]
+        puts `pwd`
+        if !File.directory?(".git/svn")
+          show_help_message("This is not a repository cloned by git-svn")
+        end
+        log "Fixing the existing repository"
+        get_branches
+      else
+        clone!
+      end
+      fix_tags
+      fix_branches
+      fix_trunk
+      optimize_repos
+    end
+
+    def parse(args)
+      # Set up reasonable defaults for options.
+      options = {}
+      options[:verbose] = false
+      options[:rootistrunk] = false
+      options[:fix] = false
+      options[:trunk] = 'trunk'
+      options[:branches] = 'branches'
+      options[:tags] = 'tags'
+      options[:exclude] = []
+
+      if File.exists?(DEFAULT_AUTHORS_FILE)
+        options[:authors] = DEFAULT_AUTHORS_FILE
+      end
+
+
+      # Parse the command-line arguments.
+      @opts = OptionParser.new do |opts|
+        opts.banner = 'Usage: svn2git [options] SVN_URL [REPO_DIR] | svn2git [options] --fix [REPO_DIR]'
+
+        opts.separator ''
+        opts.separator 'Specific options:'
+
+        opts.on('--trunk TRUNK_PATH', 'Subpath to trunk from repository URL (default: trunk)') do |trunk|
+          options[:trunk] = trunk
+        end
+
+        opts.on('--branches BRANCHES_PATH', 'Subpath to branches from repository URL (default: branches)') do |branches|
+          options[:branches] = branches
+        end
+        opts.on('--tags TAGS_PATH', 'Subpath to tags from repository URL (default: tags)') do |tags|
+          options[:tags] = tags
+        end
+
+        opts.on('--rootistrunk', 'Use this if the root level of the repo is equivalent to the trunk and there are no tags or branches') do
+          options[:rootistrunk] = true
+          options[:trunk] = nil
+          options[:branches] = nil
+          options[:tags] = nil
+        end
+
+        opts.on('--notrunk', 'Do not import anything from trunk') do
+          options[:trunk] = nil
+        end
+
+        opts.on('--nobranches', 'Do not try to import any branches') do
+          options[:branches] = nil
+        end
+
+        opts.on('--notags', 'Do not try to import any tags') do
+          options[:tags] = nil
+        end
+
+        opts.on('--authors AUTHORS_FILE', "Path to file containing svn-to-git authors mapping (default: #{DEFAULT_AUTHORS_FILE})") do |authors|
+          if authors !~ %r{\A/}
+            show_help_message('Authors file path must be absolute.')
+          end
+          options[:authors] = authors
+        end
+
+        opts.on('--exclude REGEX', 'Specify a Perl regular expression to filter paths when fetching; can be used multiple times') do |regex|
+          options[:exclude] << regex
+        end
+
+        opts.on('-v', '--verbose', 'Be verbose in logging -- useful for debugging issues') do
+          options[:verbose] = true
+        end
+
+        opts.on('--fix', 'Fix an existing repository') do
+          options[:fix] = true
+        end
+
+        opts.separator ""
+
+        # No argument, shows at tail.  This will print an options summary.
+        # Try it and see!
+        opts.on_tail('-h', '--help', 'Show this message') do
+          puts opts
+          exit
+        end
+      end
+
+      @opts.parse! args
+      options
+    end
+
+  private
+
+    def clone!
+      trunk = @options[:trunk]
+      branches = @options[:branches]
+      tags = @options[:tags]
+      rootistrunk = @options[:rootistrunk]
+      authors = @options[:authors]
+      exclude = @options[:exclude]
+
+      cmd = %w"git svn init --no-metadata"
+
+      if rootistrunk
+        # Non-standard repository layout.  The repository root is effectively 'trunk.'
+        cmd << "--trunk=#{@url}"
+      else
+        # Add each component to the command that was passed as an argument.
+        cmd << "--trunk=#{trunk}" unless trunk.nil?
+        cmd << "--tags=#{tags}" unless tags.nil?
+        cmd << "--branches=#{branches}" unless branches.nil?
+
+        cmd << @url
+      end
+
+      run_command(cmd)
+
+      run_command(%w"git config svn.authorsfile" << authors) if authors
+
+      cmd = %w"git svn fetch"
+      unless exclude.empty?
+        # Add exclude paths to the command line; some versions of git support
+        # this for fetch only, later also for init.
+        regex = []
+        unless rootistrunk
+          regex << "#{Regexp.quote(trunk)}/" unless trunk.nil?
+          regex << "#{Regexp.quote(tags)}/[^/]+/" unless tags.nil?
+          regex << "#{Regexp.quote(branches)}/[^/]+/" unless branches.nil?
+        end
+        regex = '^(?:' + regex.join('|') + ')(?:' + exclude.join('|') + ')'
+        cmd << "--ignore-paths=#{regex}"
+      end
+      run_command(cmd)
+
+      get_branches
+    end
+
+    def get_branches
+      @remote = `git branch -r`.split
+      @tags = @remote.grep(%r{^tags/})
+    end
+
+    def fix_tags
+      @tags.each do |tag|
+        id = tag.gsub(%r{^tags/}, '')
+        subject = `git log -1 --pretty=format:"%s" #{tag.shellescape}`.chomp
+        date = `git log -1 --pretty=format:"%ci" #{tag.shellescape}`.chomp
+        run_command("GIT_COMMITTER_DATE=#{date.shellescape} git tag -a -m #{subject.shellescape} #{id.shellescape} #{tag.shellescape}")
+        run_command("git branch -d -r #{tag.shellescape}")
+      end
+    end
+
+    def fix_branches
+      svn_branches = @remote - @tags
+      svn_branches.each do |branch|
+        next if branch == 'trunk'
+        run_command("git checkout #{branch.shellescape}")
+        run_command("git checkout -b #{branch.shellescape}")
+      end
+    end
+
+    def fix_trunk
+      if @remote.include?('trunk')
+        run_command("git checkout trunk")
+        run_command("git branch -D master")
+        run_command("git checkout -f -b master")
+        run_command("git branch -d -r trunk")
+      end
+    end
+
+    def optimize_repos
+      run_command("git gc")
+    end
+
+    def run_command(cmd)
+      case cmd
+      when Array
+        cmd = cmd.shelljoin
+      end
+
+      log "Running command: #{cmd}"
+
+      IO.popen(cmd) do |stdout|
+        stdout.each do |line|
+          log line
+        end
+      end
+    end
+
+    def log(msg)
+      puts msg if @options[:verbose]
+    end
+
+    def show_help_message(msg)
+      puts "Error starting script: #{msg}\n\n"
+      puts @opts.help
+      exit
+    end
+
+  end
+end
+

data/svn2git.gemspec

@@ -0,0 +1,45 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{svn2git}
+  s.version = "1.3.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["James Coglan", "Kevin Menard", "Akinori MUSHA"]
+  s.date = %q{2009-06-18}
+  s.default_executable = %q{svn2git}
+  s.email = %q{knu@idaemons.org}
+  s.executables = ["svn2git"]
+  s.extra_rdoc_files = [
+    "ChangeLog.markdown",
+     "README.markdown"
+  ]
+  s.files = [
+    ".gitignore",
+     "ChangeLog.markdown",
+     "MIT-LICENSE",
+     "README.markdown",
+     "Rakefile",
+     "VERSION.yml",
+     "bin/svn2git",
+     "lib/svn2git.rb",
+     "lib/svn2git/migration.rb",
+     "svn2git.gemspec"
+  ]
+  s.homepage = %q{https://www.negativetwenty.net/redmine/projects/svn2git}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
+  s.rubygems_version = %q{1.3.4}
+  s.summary = %q{A tool for migrating svn projects to git}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

metadata

@@ -0,0 +1,65 @@
+--- !ruby/object:Gem::Specification 
+name: knu-svn2git
+version: !ruby/object:Gem::Version 
+  version: 1.3.1
+platform: ruby
+authors: 
+- James Coglan
+- Kevin Menard
+- Akinori MUSHA
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-06-18 00:00:00 -07:00
+default_executable: svn2git
+dependencies: []
+
+description: 
+email: knu@idaemons.org
+executables: 
+- svn2git
+extensions: []
+
+extra_rdoc_files: 
+- ChangeLog.markdown
+- README.markdown
+files: 
+- .gitignore
+- ChangeLog.markdown
+- MIT-LICENSE
+- README.markdown
+- Rakefile
+- VERSION.yml
+- bin/svn2git
+- lib/svn2git.rb
+- lib/svn2git/migration.rb
+- svn2git.gemspec
+has_rdoc: false
+homepage: https://www.negativetwenty.net/redmine/projects/svn2git
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.7
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 3
+summary: A tool for migrating svn projects to git
+test_files: []
+