svn2git 2.1.2 → 2.2.0

data/ChangeLog.markdown

@@ -1,3 +1,12 @@
+# 2.2.0 - 2012-01-25
+
+  Thanks to Craig Hobbs (craigahobbs) and Simon Chiang (thinkerbot) for the patches making up this release.
+  It rounds out our tag support by handling tags with special characters and preserving original tag author info.
+
+  * Fixed an issue with not quoting tag names (thanks craigahobbs and thinkerbot)
+  * Fixed an issue whereby the person running the svn2git conversion became the author of every tag (i.e., we lost the
+  original tag committer info) (thanks thinkerbot)
+
 # 2.1.2 - 2011-12-28
 
   * Fixed a regression in improperly quoting branch names (thanks ziangsong)

data/VERSION.yml

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

data/lib/svn2git/migration.rb

@@ -210,16 +210,32 @@ module Svn2Git
     end
 
     def fix_tags
+      current = {}
+      current['user.name']  = run_command("git config --local --get user.name")
+      current['user.email'] = run_command("git config --local --get user.email")
+
       @tags.each do |tag|
         tag = tag.strip
-        id = tag.gsub(%r{^svn\/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}")
+        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)}'")
+      end
+
+    ensure
+      current.each_pair do |name, value|
+        # 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[-1] == "\n"
+          run_command("git config --local #{name} '#{value.chomp("\n")}'")
+        else
+          run_command("git config --local --unset #{name}")
+        end
       end
     end
 

data/svn2git.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "svn2git"
-  s.version = "2.1.2"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Coglan", "Kevin Menard"]
-  s.date = "2011-12-28"
+  s.date = "2012-01-25"
   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.13"
+  s.rubygems_version = "1.8.15"
   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.1.2
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000Z
+date: 2012-01-25 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.13
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A tool for migrating svn projects to git