svn2git 1.3.1 → 1.3.2

data/.gitignore

@@ -1 +1,2 @@
 pkg
+.idea

data/ChangeLog.markdown

@@ -1,3 +1,10 @@
+# 1.3.2 - 2010-03-12
+
+  Thanks to rajit for finding a problem with quoting in tag comments that were causing issues with svn2git's internal
+  quoting and providing a patch.
+
+  * Deal cleanly with any single quotes found in tag comments so that the 'git tag' commands run correctly
+
 # 1.3.1 - 2009-06-09
 
   Thanks to iteman for finding a problem with the tagging process and providing a patch.
@@ -50,4 +57,4 @@
 
 # 1.0.0 - 2008-07-19
 
-  * Forked version from jcoglan.
+  * Forked version from jcoglan.

data/README.markdown

@@ -64,10 +64,12 @@ the svn repo.
 Installation
 ------------
 
-Make sure you have git installed, then install the gem:
+Make sure you have git, ruby and rubygems installed, then install the gem:
 
-    $ sudo apt-get install git-core git-svn
-    $ sudo gem install nirvdrum-svn2git
+    $ sudo apt-get install git-core git-svn ruby rubygems
+    $ sudo gem install svn2git --source http://gemcutter.org
+    
+*NB: Previous versions of the gem could be installed from GitHub as nirvdrum-svn2git.  You can install that gem via `$ sudo gem install nirvdrum-svn2git --source http://gems.github.com`, but the nirvdrum-svn2git gem will no longer be updated.  Please use the one hosted on gemcutter.*
 
 Usage
 -----
@@ -130,6 +132,17 @@ 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.
 
+If you need a jump start on figuring out what users made changes in your
+svn repositories the following command sequence might help. It grabs all
+the logs from the svn repository, pulls out all the names from the commits,
+sorts them, and then reduces the list to only unique names. So, in the end
+it outputs a list of usernames of the people that made commits to the svn
+repository which name on its own line. This would allow you to easily
+redirect the output of this command sequence to ~/.svn2git/authors and have
+a very good starting point for your mapping.
+
+    $ svn log | grep -E "r[0-9]+ \| [a-z]+ \|" | awk '{print $3}' | sort | uniq
+
 Debugging
 ---------
 
@@ -169,4 +182,4 @@ FAQ
     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.
+    tags.

data/Rakefile

@@ -10,6 +10,7 @@ begin
     spec.homepage = "https://www.negativetwenty.net/redmine/projects/svn2git"
     spec.email = "nirvdrum@gmail.com"
   end
+  Jeweler::GemcutterTasks.new
   
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION.yml

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

data/lib/svn2git/migration.rb

@@ -129,7 +129,7 @@ module Svn2Git
         run_command(cmd)
       end
 
-      run_command("git config svn.authorsfile #{authors}") if authors
+      run_command("git config svn.authorsfile #{authors}") unless authors.nil?
 
       cmd = "git svn fetch"
       unless exclude.empty?
@@ -150,17 +150,22 @@ module Svn2Git
     end
 
     def get_branches
-      @remote = `git branch -r`.split(/\n/)
+      @local = run_command("git branch -l").split(/\n/).collect{ |b| b.strip }
+      @remote = run_command("git branch -r").split(/\n/).collect{ |b| b.strip }
       @tags = @remote.find_all { |b| b.strip =~ %r{^tags\/} }
     end
 
     def fix_tags
       @tags.each do |tag|
-        id = tag.strip.gsub(%r{^tags\/}, '')
-        subject = `git log -1 --pretty=format:"%s" #{tag.strip()}`
-        date = `git log -1 --pretty=format:"%ci" #{tag.strip()}`
-        run_command("GIT_COMMITTER_DATE='#{date}' git tag -a -m '#{subject}' '#{id.strip()}' '#{tag.strip()}'")
-        run_command("git branch -d -r #{tag.strip()}")
+        tag = tag.strip
+        id = tag.gsub(%r{^tags\/}, '').strip
+        subject = run_command("git log -1 --pretty=format:'%s' #{tag}")
+        date = run_command("git log -1 --pretty=format:'%ci' #{tag}")
+        subject = escape_quotes(subject)
+        date = escape_quotes(date)
+        id = escape_quotes(id)
+        run_command("GIT_COMMITTER_DATE='#{date}' git tag -a -m '#{subject}' '#{id}' '#{escape_quotes(tag)}'")
+        run_command("git branch -d -r #{tag}")
       end
     end
 
@@ -169,8 +174,9 @@ module Svn2Git
       svn_branches.each do |branch|
         branch = branch.strip
         next if branch == 'trunk'
+
         run_command("git checkout #{branch}")
-        run_command("git checkout -b #{branch}")
+        run_command("git checkout -b #{branch}")    
       end
     end
 
@@ -191,11 +197,16 @@ module Svn2Git
     def run_command(cmd)
       log "Running command: #{cmd}"
 
+      ret = ''
+
       IO.popen(cmd) do |stdout|
         stdout.each do |line|
           log line
+          ret << line
         end
       end
+      
+      ret
     end
 
     def log(msg)
@@ -208,6 +219,10 @@ module Svn2Git
       exit
     end
 
+    def escape_quotes(str)
+      str.gsub("'", "'\\\\''")
+    end
+
   end
 end
 

data/svn2git.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{svn2git}
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Coglan", "Kevin Menard"]
-  s.date = %q{2009-06-09}
+  s.date = %q{2010-03-12}
   s.default_executable = %q{svn2git}
   s.email = %q{nirvdrum@gmail.com}
   s.executables = ["svn2git"]
@@ -29,7 +32,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{https://www.negativetwenty.net/redmine/projects/svn2git}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A tool for migrating svn projects to git}
 
   if s.respond_to? :specification_version then
@@ -42,3 +45,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: svn2git
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - James Coglan
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-09 00:00:00 -04:00
+date: 2010-03-12 00:00:00 -05:00
 default_executable: svn2git
 dependencies: []
 
@@ -47,18 +52,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A tool for migrating svn projects to git