nirvdrum-svn2git 1.1.1

data/README

@@ -0,0 +1,126 @@
+== 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 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.yoursite.com/path/to/repo trunk=trunk branches=branches tags=tags
+
+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.yoursite.com/path/to/repo trunk=trunk tags=tags
+
+3. The svn repo is NOT in standard layout and has only a trunk and branches at
+the root level of the repo.
+
+  $ svn2git http://svn.yoursite.com/path/to/repo trunk=trunk branches=branches
+
+4. The svn repo is NOT in standard layout and has only a trunk at the root
+level of the repo.
+
+  $ svn2git http://svn.yoursite.com/path/to/repo trunk=trunk
+
+5. 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.yoursite.com/path/to/repo rootistrunk=true
+
+The above will create a git repository in the current directory with the git
+version of the svn repository. Hence, you need to make a directory that you
+want your new git repo to exist in, change into it and then run one of the
+above commands. 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.yoursite.com/path/to/repo/foo as your trunk, and so on. However, in
+case 5 it references the root of the repo as trunk.
+
+=== 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://repos.com/myproject 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.

data/Rakefile

@@ -0,0 +1,44 @@
+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"]
+    spec.homepage = "https://www.negativetwenty.net/redmine/projects/svn2git"
+    spec.email = "nirvdrum@gmail.com"
+  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 @@
+--- 
+:patch: 1
+:major: 1
+:minor: 1

data/bin/svn2git

@@ -0,0 +1,37 @@
+#!/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 'rubygems'
+gem 'svn2git'
+
+require 'svn2git'
+
+url = ARGV.shift
+options = ARGV.inject({}) do |memo, arg|
+  parts = arg.split('=')
+  memo[parts.first.to_sym] = parts.last
+  memo
+end
+
+migration = Svn2Git::Migration.new(url, options)
+migration.run!
+

data/lib/svn2git/migration.rb

@@ -0,0 +1,120 @@
+module Svn2Git
+  DEFAULT_AUTHORS_FILE = "~/.svn2git/authors"
+  
+  class Migration
+  
+    attr_reader :dir
+    
+    def initialize(url, options = {})
+      @url = url
+      @dir = @url.scan(/[^\/]+/).last
+      
+      @options = options
+      @options[:trunk] ||= 'trunk'
+      @options[:branches] ||= 'branches'
+      @options[:tags] ||= 'tags'
+      
+      @authors = options[:authors]
+      if @authors.nil? && File.exists?(File.expand_path(DEFAULT_AUTHORS_FILE))
+        @authors = DEFAULT_AUTHORS_FILE
+      end
+    end
+    
+    def run!
+      clone!
+      fix_tags
+      fix_branches
+      fix_trunk
+      optimize_repos
+    end
+    
+  private
+    
+    def clone!
+      trunk = @options[:trunk]
+      branches = @options[:branches]
+      tags = @options[:tags]
+      rootistrunk = @options[:rootistrunk]
+      
+      if (!rootistrunk.nil?)
+        # Non-standard repository layout.  The repository root is effectively 'trunk.'
+        run_command("git svn init --no-metadata --trunk=#{@url}")
+      
+      else
+        cmd = "git svn init --no-metadata "
+        
+        # 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
+        
+        run_command(cmd)
+      end
+      
+      run_command("git config svn.authorsfile #{@authors}") if @authors
+      run_command("git svn fetch")
+      
+      get_branches
+    end
+    
+    def get_branches
+      @remote = `git branch -r`.split(/\n/)
+      @tags = @remote.find_all { |b| b.strip =~ %r{^#{@options[:tags]}\/} }
+    end
+    
+    def fix_tags
+      @tags.each do |tag|
+        id = tag.strip.gsub(%r{^#{@options[:tags]}\/}, '')
+        subject = `git log -1 --pretty=format:"%s" #{tag.strip()}`
+        date = `git log -1 --pretty=format:"%ci" #{tag.strip()}`
+        `export GIT_COMMITER_DATE="#{date}"`
+        run_command("git tag -a -m '#{subject}' '#{id.strip()}' '#{tag.strip()}'")
+        run_command("git branch -d -r #{tag.strip()}")
+      end
+    end
+    
+    def fix_branches
+      svn_branches = @remote.find_all { |b| not @tags.include?(b) }
+      svn_branches.each do |branch|
+        branch = branch.strip
+        next if branch == 'trunk'
+        run_command("git checkout #{branch}")
+        run_command("git checkout -b #{branch}")
+      end
+    end
+    
+    def fix_trunk
+      trunk = @remote.find { |b| b.strip == 'trunk' }
+      if 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)
+      log "Running command: #{cmd}"
+      
+      IO.popen(cmd) do |stdout|
+        stdout.each do |line|
+          log line
+        end
+      end
+    end
+
+    private
+    
+    def log(msg)
+      puts msg if @options[:verbose]
+    end
+
+  end
+end
+

data/lib/svn2git.rb

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

metadata

@@ -0,0 +1,59 @@
+--- !ruby/object:Gem::Specification 
+name: nirvdrum-svn2git
+version: !ruby/object:Gem::Version 
+  version: 1.1.1
+platform: ruby
+authors: 
+- James Coglan
+- Kevin Menard
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-04-15 00:00:00 -07:00
+default_executable: svn2git
+dependencies: []
+
+description: 
+email: nirvdrum@gmail.com
+executables: 
+- svn2git
+extensions: []
+
+extra_rdoc_files: 
+- README
+files: 
+- Rakefile
+- VERSION.yml
+- bin/svn2git
+- lib/svn2git.rb
+- lib/svn2git/migration.rb
+- README
+has_rdoc: true
+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: "0"
+  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: 2
+summary: A tool for migrating svn projects to git
+test_files: []
+