svn2git 2.3.0 → 2.3.1

data/ChangeLog.markdown

@@ -1,4 +1,27 @@
+# 2.3.1 - 2014-05-14
+
+  This is a critical bugfix release if you're running git >= 1.8.3.2.  In the days of svn2git 1.x we supported syncing
+  local branches with upstream by tracking the branch as we set them up.  This allowed one to checkout the branch and
+  issue a "git pull" to fetch the changes.  git-svn ceased allowing this in 1.8.3.2, which broke svn2git with that
+  version of git and all subsequent versions.  The rationale seemed to be in order to prevent pushing changes from
+  git-svn back up and breaking the remote link, but this was never something svn2git supported anyway.
+  
+  Acknowledging the new reality of upstream, the old behavior is retained but deprecated for users of git < 1.8.3.2.
+  We'll be removing the establishment of remote tracking SVN branches in the 2.5.0 release.  If you wish to sync back
+  with upstream, run `svn2git --rebase`.  If you're on git >= 1.8.3.2 your only option for resynchronizing is to
+  use `svn2git --rebase`.
+  
+  Many thanks to ktdreyer for modernizing the test suite and Daniel Ruf (DanielRuf) for pushing on the git compatibility
+  issue.
+  
+  * Fixed creating local branches for remote SVN branches in git >= 1.8.3.2.
+  * Fixed verbose logging of sub-process STDERR stream.
+  * Added MIT license metadata to gemspec.
+  * Switched to minitest to get tests working on Ruby 1.9+ with minitest 5+ installed.
+  
+
 # 2.3.0 - 2014-05-14
+
   This release passes STDIN through to the underlying git-svn process, allowing users to interact with the
   git-svn prompt.  Principally, it will allow users to choose what to do when prompted about unverified
   SSL certificates.
@@ -6,6 +29,7 @@
   * Pass STDIN through to the underlying git-svn process so users can respond to prompts.
 
 # 2.2.5 - 2014-03-09
+
   This is a bugfix release. It improves handling of quotes in SVN commit messages.
 
 
@@ -20,7 +44,7 @@
 
 # 2.2.3 - 2014-03-08
 
-  This is a bugfix release. First change done by FeeJai
+  This is a bugfix release. First change done by FeeJai.
 
   * Fixed an issue with password protected svn-repositories. The prompt to enter the password is now displayed.
   * Fixed an issue with server certificates. If the certificate is untrusted, the prompt to confirm or deny the certificate is now shown.

data/Rakefile

@@ -10,7 +10,8 @@ begin
     spec.authors = ["James Coglan", "Kevin Menard"]
     spec.homepage = "https://github.com/nirvdrum/svn2git"
     spec.email = "nirvdrum@gmail.com"
-    spec.add_development_dependency 'test-unit'
+    spec.license = 'MIT'
+    spec.add_development_dependency 'minitest'
     spec.add_dependency 'open4'
   end
   Jeweler::GemcutterTasks.new

data/VERSION.yml

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

data/lib/svn2git/migration.rb

@@ -155,6 +155,10 @@ module Svn2Git
       Svn2Git::Migration.escape_quotes(str)
     end
 
+    def self.checkout_svn_branch(branch)
+      "git checkout -b \"#{branch}\" \"remotes/svn/#{branch}\""
+    end
+
   private
 
     def clone!
@@ -318,8 +322,36 @@ module Svn2Git
         end
 
         next if branch == 'trunk' || @local.include?(branch)
-        run_command("git branch --track \"#{branch}\" \"remotes/svn/#{branch}\"")
-        run_command("git checkout \"#{branch}\"")
+
+        if @cannot_setup_tracking_information
+          run_command(Svn2Git::Migration.checkout_svn_branch(branch))
+        else
+          status = run_command("git branch --track \"#{branch}\" \"remotes/svn/#{branch}\"", false)
+
+          # As of git 1.8.3.2, tracking information cannot be set up for remote SVN branches:
+          # http://git.661346.n2.nabble.com/git-svn-Use-prefix-by-default-td7594288.html#a7597159
+          #
+          # Older versions of git can do it and it should be safe as long as remotes aren't pushed.
+          # Our --rebase option obviates the need for read-only tracked remotes, however.  So, we'll
+          # deprecate the old option, informing those relying on the old behavior that they should
+          # use the newer --rebase otion.
+          if status =~ /Cannot setup tracking information/m
+            @cannot_setup_tracking_information = true
+            run_command(Svn2Git::Migration.checkout_svn_branch(branch))
+          else
+            unless @legacy_svn_branch_tracking_message_displayed
+              warn '*' * 68
+              warn "svn2git warning: Tracking remote SVN branches is deprecated."
+              warn "In a future release local branches will be created without tracking."
+              warn "If you must resync your branches, run: svn2git --rebase"
+              warn '*' * 68
+            end
+
+            @legacy_svn_branch_tracking_message_displayed = true
+
+            run_command("git checkout \"#{branch}\"")
+          end
+        end
       end
     end
 
@@ -339,7 +371,7 @@ module Svn2Git
     end
 
     def run_command(cmd, exit_on_error=true, printout_output=false)
-      log "Running command: #{cmd}"
+      log "Running command: #{cmd}\n"
 
       ret = ''
       @mutex ||= Mutex.new
@@ -423,7 +455,7 @@ module Svn2Git
     end
 
     def log(msg)
-      puts msg if @options[:verbose]
+      print msg if @options[:verbose]
     end
 
     def show_help_message(msg)

data/svn2git.gemspec

@@ -2,17 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: svn2git 2.3.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "svn2git"
-  s.version = "2.3.0"
+  s.name = %q{svn2git}
+  s.version = "2.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
   s.authors = ["James Coglan", "Kevin Menard"]
-  s.date = "2014-05-14"
-  s.email = "nirvdrum@gmail.com"
+  s.date = %q{2014-05-15}
+  s.default_executable = %q{svn2git}
+  s.email = %q{nirvdrum@gmail.com}
   s.executables = ["svn2git"]
   s.extra_rdoc_files = [
     "ChangeLog.markdown",
@@ -28,25 +27,28 @@ Gem::Specification.new do |s|
     "lib/svn2git.rb",
     "lib/svn2git/migration.rb",
     "svn2git.gemspec",
+    "test/commands_test.rb",
     "test/escape_quotes_test.rb",
     "test/test_helper.rb"
   ]
-  s.homepage = "https://github.com/nirvdrum/svn2git"
-  s.rubygems_version = "2.2.2"
-  s.summary = "A tool for migrating svn projects to git"
+  s.homepage = %q{https://github.com/nirvdrum/svn2git}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{A tool for migrating svn projects to git}
 
   if s.respond_to? :specification_version then
-    s.specification_version = 4
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<test-unit>, [">= 0"])
+      s.add_development_dependency(%q<minitest>, [">= 0"])
       s.add_runtime_dependency(%q<open4>, [">= 0"])
     else
-      s.add_dependency(%q<test-unit>, [">= 0"])
+      s.add_dependency(%q<minitest>, [">= 0"])
       s.add_dependency(%q<open4>, [">= 0"])
     end
   else
-    s.add_dependency(%q<test-unit>, [">= 0"])
+    s.add_dependency(%q<minitest>, [">= 0"])
     s.add_dependency(%q<open4>, [">= 0"])
   end
 end

data/test/commands_test.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.join(__FILE__, '..', 'test_helper'))
+
+class CommandsTest < Minitest::Test
+  def test_checkout_svn_branch
+    actual = Svn2Git::Migration.checkout_svn_branch('blah')
+
+    assert_equal 'git checkout -b "blah" "remotes/svn/blah"', actual
+  end
+end

data/test/escape_quotes_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(__FILE__, '..', 'test_helper'))
 
-class EscapeQuotesTest < Test::Unit::TestCase
+class EscapeQuotesTest < Minitest::Test
   def test_identity
     expected = 'A string without any need to escape.'
     actual = Svn2Git::Migration.escape_quotes(expected)

data/test/test_helper.rb

@@ -1,4 +1,12 @@
 $:.unshift "#{File.dirname(__FILE__)}/../lib"
 
+require 'rubygems'
 require 'svn2git'
-require 'test/unit'
+require 'minitest/autorun'
+
+if Minitest.const_defined?('Test')
+  # We're on Minitest 5+. Nothing to do here.
+else
+  # Minitest 4 doesn't have Minitest::Test yet.
+  Minitest::Test = MiniTest::Unit::TestCase
+end

metadata

@@ -1,53 +1,62 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: svn2git
-version: !ruby/object:Gem::Version
-  version: 2.3.0
+version: !ruby/object:Gem::Version 
+  hash: 1
+  prerelease: 
+  segments: 
+  - 2
+  - 3
+  - 1
+  version: 2.3.1
 platform: ruby
-authors:
+authors: 
 - James Coglan
 - Kevin Menard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+
+date: 2014-05-15 00:00:00 -04:00
+default_executable: svn2git
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: minitest
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: open4
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 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
@@ -57,29 +66,42 @@ files:
 - lib/svn2git.rb
 - lib/svn2git/migration.rb
 - svn2git.gemspec
+- test/commands_test.rb
 - test/escape_quotes_test.rb
 - test/test_helper.rb
+has_rdoc: true
 homepage: https://github.com/nirvdrum/svn2git
-licenses: []
-metadata: {}
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A tool for migrating svn projects to git
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 2b945b1a4df0af0d51a1c7d5662528c79975bf8c
-  data.tar.gz: 0ce18a7123508f6368250867884714cfa0589865
-SHA512:
-  metadata.gz: 7262ee9fedddbdc47119bfba8e4aee8373bac52c6dec3ffccb50346697936ed6e2cc65a9a0d9b4aef16b0975dc1c545412d77b40dec750e85838bc2ce7980299
-  data.tar.gz: aa518ed21531bc16d70ab39f48af4d78b4e2e651e1c2271c7f3d0b2f395b94d33c9393ea2e0cdd26af35cf46f0be61b077c2b708b61d887730f3926e696f8c82