svn2git 2.2.1 → 2.2.2

data/ChangeLog.markdown

@@ -1,4 +1,17 @@
-# 2.2.1
+# 2.2.2
+
+  This is an overdue bugfix release.  No new features were added, but several long-standing bugs fixed by the community
+  have been merged.  Many thanks to Edson de Lima (edsonlima), Rudger (Rud5G), Ben Wolfe (bwolfe), CyberTech, PowerKiKi, and Philipp Riemer (ruderphilipp) for the pull requests.
+
+  * Fixed an issue working with repositories that contained a space in the name (thanks edsonlima).
+  * Fixed an issue working with tags that contain a hyphen (thanks Rud5G).
+  * Fixed an issue with fixing tags during a rebase (thanks PowerKiKi).
+  * Double-quote git-svn commands working with tags to avoid issues with special strings (thanks CyberTech).
+  * Improved the documentation example of fetching the author list for an SVN repository (thanks bwolfe).
+  * Set the git committer date for tags in a more cross-platform manner (thanks CyberTech).
+  * Improved documentation formatting (thanks ruderphilipp).
+
+# 2.2.1 - 2012-02-25
 
   This is a critical bugfix release if your repository has tags.  Thanks to David Zülke (dzuelke) for the patches making up this release.
 

data/README.markdown

@@ -156,11 +156,11 @@ 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:
+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
+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.
@@ -171,10 +171,14 @@ 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
+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]+ \| .+ \|" | awk '{print $3}' | sort | uniq
+    $ svn log --quiet | grep -E "r[0-9]+ \| .+ \|" | awk '{print $3}' | sort | uniq
+
+Or, for a remote URL:
+
+    $ svn log --quiet http://path/to/root/of/project | grep -E "r[0-9]+ \| .+ \|" | awk '{print $3}' | sort | uniq
 
 Debugging
 ---------
@@ -183,7 +187,7 @@ If you're having problems with converting your repository and you're not sure wh
 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:
+You can turn on verbose logging with the `-v` or `--verbose` flags, like so:
 
     $ svn2git http://svn.yoursite.com/path/to/repo --verbose
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 2
 :minor: 2
-:patch: 1
+:patch: 2
 :build: 

data/lib/svn2git/migration.rb

@@ -16,7 +16,7 @@ module Svn2Git
       else
          show_help_message('Missing SVN_URL parameter') if args.empty?
          show_help_message('Too many arguments') if args.size > 1
-         @url = args.first
+         @url = args.first.gsub(' ', "\\ ")
       end
     end
 
@@ -26,8 +26,8 @@ module Svn2Git
       else
         clone!
       end
-      fix_tags
       fix_branches
+      fix_tags
       fix_trunk
       optimize_repos
     end
@@ -221,14 +221,22 @@ module Svn2Git
       @tags.each do |tag|
         tag = tag.strip
         id      = tag.gsub(%r{^svn\/tags\/}, '').strip
-        subject = run_command("git log -1 --pretty=format:'%s' '#{escape_quotes(tag)}'")
-        date    = run_command("git log -1 --pretty=format:'%ci' '#{escape_quotes(tag)}'")
-        author  = run_command("git log -1 --pretty=format:'%an' '#{escape_quotes(tag)}'")
-        email   = run_command("git log -1 --pretty=format:'%ae' '#{escape_quotes(tag)}'")
-        run_command("git config --local user.name '#{escape_quotes(author)}'")
-        run_command("git config --local user.email '#{escape_quotes(email)}'")
-        run_command("GIT_COMMITTER_DATE='#{escape_quotes(date)}' git tag -a -m '#{escape_quotes(subject)}' '#{escape_quotes(id)}' '#{escape_quotes(tag)}'")
-        run_command("git branch -d -r '#{escape_quotes(tag)}'")
+        subject = run_command("git log -1 --pretty=format:'%s' \"#{escape_quotes(tag)}\"").chomp("'").reverse.chomp("'").reverse
+        date    = run_command("git log -1 --pretty=format:'%ci' \"#{escape_quotes(tag)}\"").chomp("'").reverse.chomp("'").reverse
+        author  = run_command("git log -1 --pretty=format:'%an' \"#{escape_quotes(tag)}\"").chomp("'").reverse.chomp("'").reverse
+        email   = run_command("git log -1 --pretty=format:'%ae' \"#{escape_quotes(tag)}\"").chomp("'").reverse.chomp("'").reverse
+        run_command("git config --local user.name \"#{escape_quotes(author)}\"")
+        run_command("git config --local user.email \"#{escape_quotes(email)}\"")
+
+        begin
+          original_git_committer_date = ENV['GIT_COMMITTER_DATE']
+          ENV['GIT_COMMITTER_DATE'] = escape_quotes(date)
+          run_command("git tag -a -m \"#{escape_quotes(subject)}\" \"#{escape_quotes(id)}\" \"#{escape_quotes(tag)}\"")
+        ensure
+          ENV['GIT_COMMITTER_DATE'] = original_git_committer_date
+        end
+        
+        run_command("git branch -d -r \"#{escape_quotes(tag)}\"")
       end
 
     ensure
@@ -238,7 +246,7 @@ module Svn2Git
           # If a line was read, then there was a config value so restore it.
           # Otherwise unset the value because originally there was none.
           if value.strip != ''
-            run_command("git config --local #{name} '#{value.strip}'")
+            run_command("git config --local #{name} \"#{value.strip}\"")
           else
             run_command("git config --local --unset #{name}")
           end

data/svn2git.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "svn2git"
-  s.version = "2.2.1"
+  s.version = "2.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Coglan", "Kevin Menard"]
-  s.date = "2012-02-25"
+  s.date = "2012-10-07"
   s.email = "nirvdrum@gmail.com"
   s.executables = ["svn2git"]
   s.extra_rdoc_files = [
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://www.negativetwenty.net/redmine/projects/svn2git"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.23"
   s.summary = "A tool for migrating svn projects to git"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svn2git
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-25 00:00:00.000000000 Z
+date: 2012-10-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nirvdrum@gmail.com
@@ -51,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A tool for migrating svn projects to git