svn2git 2.1.0 → 2.1.2

data/ChangeLog.markdown

@@ -1,3 +1,13 @@
+# 2.1.2 - 2011-12-28
+
+  * Fixed a regression in improperly quoting branch names (thanks ziangsong)
+
+# 2.1.1 - 2011-12-27
+
+  * Fixed SVN branch detection (thanks thinkerbot)
+  * Stop processing when a git subprocess fails (thanks thinkerbot)
+  * Fixed an issue with SVN branches containing shell special characters (thanks sleicht)
+
 # 2.1.0 - 2011-04-03
 
   Thanks to Francois Rey (fmjrey), Sven Axelsson (svenax), and Julian Taylor (juliantaylor) for submitting all the patches

data/README.markdown

@@ -64,12 +64,16 @@ the svn repo.
 Installation
 ------------
 
-Make sure you have git, ruby and rubygems installed, then install the gem:
+Make sure you have git, git-svn, and ruby installed.  svn2git is a ruby wrapper around git's native SVN support through git-svn.  It is possible to have git
+installed without git-svn installed, so please do verify that you can run `$ git svn` successfully.  For a Debian-based system, the installation of the
+prerequisites would like like:
 
     $ 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.*
+
+Once you have the necessary software your system, you can install svn2git through rubygems, which will add the `svn2git` command to your PATH.    
+
+    $ sudo gem install svn2git
+
 
 Usage
 -----
@@ -204,7 +208,7 @@ FAQ
     
     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
+    and the resulting code base would be different than 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/VERSION.yml

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

data/lib/svn2git/migration.rb

@@ -178,7 +178,7 @@ module Svn2Git
         run_command(cmd)
       end
 
-      run_command("git config svn.authorsfile #{authors}") unless authors.nil?
+      run_command("git config --local svn.authorsfile #{authors}") unless authors.nil?
 
       cmd = "git svn fetch "
       cmd += "-r #{revision}:HEAD " unless revision.nil?
@@ -224,8 +224,8 @@ module Svn2Git
     end
 
     def fix_branches
-      svn_branches = @remote.find_all { |b| not @tags.include?(b) }
-      svn_branches = @remote.find_all { |b| b.strip =~ %r{^svn\/} }
+      svn_branches = @remote - @tags
+      svn_branches.delete_if { |b| b.strip !~ %r{^svn\/} }
 
       if @options[:rebase]
          run_command("git svn fetch")
@@ -236,14 +236,14 @@ module Svn2Git
         if @options[:rebase] && (@local.include?(branch) || branch == 'trunk')
            lbranch = branch
            lbranch = 'master' if branch == 'trunk'
-           run_command("git checkout -f #{lbranch}")
-           run_command("git rebase remotes/svn/#{branch}")
+           run_command("git checkout -f \"#{lbranch}\"")
+           run_command("git rebase \"remotes/svn/#{branch}\"")
            next
         end
 
         next if branch == 'trunk' || @local.include?(branch)
-        run_command("git branch --track #{branch} remotes/svn/#{branch}")
-        run_command("git checkout #{branch}")
+        run_command("git branch --track \"#{branch}\" \"remotes/svn/#{branch}\"")
+        run_command("git checkout \"#{branch}\"")
       end
     end
 
@@ -267,6 +267,7 @@ module Svn2Git
 
       ret = ''
 
+      cmd = "2>&1 #{cmd}"
       IO.popen(cmd) do |stdout|
         stdout.each do |line|
           log line
@@ -274,6 +275,11 @@ module Svn2Git
         end
       end
 
+      unless $?.exitstatus == 0
+        $stderr.puts "command failed:\n#{cmd}"
+        exit -1
+      end
+
       ret
     end
 

data/svn2git.gemspec

@@ -4,14 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{svn2git}
-  s.version = "2.1.0"
+  s.name = "svn2git"
+  s.version = "2.1.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{2011-04-03}
-  s.default_executable = %q{svn2git}
-  s.email = %q{nirvdrum@gmail.com}
+  s.date = "2011-12-28"
+  s.email = "nirvdrum@gmail.com"
   s.executables = ["svn2git"]
   s.extra_rdoc_files = [
     "ChangeLog.markdown",
@@ -29,10 +28,10 @@ Gem::Specification.new do |s|
     "lib/svn2git/migration.rb",
     "svn2git.gemspec"
   ]
-  s.homepage = %q{https://www.negativetwenty.net/redmine/projects/svn2git}
+  s.homepage = "https://www.negativetwenty.net/redmine/projects/svn2git"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.3}
-  s.summary = %q{A tool for migrating svn projects to git}
+  s.rubygems_version = "1.8.13"
+  s.summary = "A tool for migrating svn projects to git"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,35 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: svn2git
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 2.1.2
   prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 0
-  version: 2.1.0
 platform: ruby
-authors: 
+authors:
 - James Coglan
 - Kevin Menard
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-03 00:00:00 -04:00
-default_executable: svn2git
+date: 2011-12-28 00:00:00.000000000Z
 dependencies: []
-
 description: 
 email: nirvdrum@gmail.com
-executables: 
+executables:
 - svn2git
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - ChangeLog.markdown
 - README.markdown
-files: 
+files:
 - ChangeLog.markdown
 - MIT-LICENSE
 - README.markdown
@@ -40,39 +31,28 @@ files:
 - lib/svn2git/blah.rb
 - lib/svn2git/migration.rb
 - svn2git.gemspec
-has_rdoc: true
 homepage: https://www.negativetwenty.net/redmine/projects/svn2git
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: A tool for migrating svn projects to git
 test_files: []
-