svn2git 2.2.0 → 2.2.1

data/ChangeLog.markdown

@@ -1,3 +1,10 @@
+# 2.2.1
+
+  This is a critical bugfix release if your repository has tags.  Thanks to David Zülke (dzuelke) for the patches making up this release.
+
+  * Added the ability to specify an end revision for migration (thanks dzuelke).
+  * Fixed an issue with initial conversion if the repo had tags (thanks dzuelke).
+
 # 2.2.0 - 2012-01-25
 
   Thanks to Craig Hobbs (craigahobbs) and Simon Chiang (thinkerbot) for the patches making up this release.
@@ -9,13 +16,13 @@
 
 # 2.1.2 - 2011-12-28
 
-  * Fixed a regression in improperly quoting branch names (thanks ziangsong)
+  * 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)
+  * 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
 

data/README.markdown

@@ -124,6 +124,10 @@ one of them.
 
         $ svn2git http://svn.example.com/path/to/repo --revision <<starting_revision_number>>
 
+9. You need to migrate starting at a specific svn revision number, ending at a specific revision number.
+
+        $ svn2git http://svn.example.com/path/to/repo --revision <<starting_revision_number>>:<<ending_revision_number>>
+
 The above will create a git repository in the current directory with the git
 version of the svn repository. Hence, you need to make a directory that you
 want your new git repo to exist in, change into it and then run one of the

data/VERSION.yml

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

data/lib/svn2git/migration.rb

@@ -101,7 +101,7 @@ module Svn2Git
           options[:nominimizeurl] = true
         end
 
-        opts.on('--revision REV', 'Start importing from SVN revision') do |revision|
+        opts.on('--revision START_REV[:END_REV]', 'Start importing from SVN revision START_REV; optionally end at END_REV') do |revision|
           options[:revision] = revision
         end
 
@@ -181,7 +181,11 @@ module Svn2Git
       run_command("git config --local svn.authorsfile #{authors}") unless authors.nil?
 
       cmd = "git svn fetch "
-      cmd += "-r #{revision}:HEAD " unless revision.nil?
+      unless revision.nil?
+        range = revision.split(":")
+        range[1] = "HEAD" unless range[1]
+        cmd += "-r #{range[0]}:#{range[1]} "
+      end
       unless exclude.empty?
         # Add exclude paths to the command line; some versions of git support
         # this for fetch only, later also for init.
@@ -211,8 +215,8 @@ module Svn2Git
 
     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")
+      current['user.name']  = run_command("git config --local --get user.name", false)
+      current['user.email'] = run_command("git config --local --get user.email", false)
 
       @tags.each do |tag|
         tag = tag.strip
@@ -228,13 +232,16 @@ module Svn2Git
       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}")
+      # We only change the git config values if there are @tags available.  So it stands to reason we should revert them only in that case.
+      unless @tags.empty?
+        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.strip != ''
+            run_command("git config --local #{name} '#{value.strip}'")
+          else
+            run_command("git config --local --unset #{name}")
+          end
         end
       end
     end
@@ -278,7 +285,7 @@ module Svn2Git
       run_command("git gc")
     end
 
-    def run_command(cmd)
+    def run_command(cmd, exit_on_error=true)
       log "Running command: #{cmd}"
 
       ret = ''
@@ -291,7 +298,7 @@ module Svn2Git
         end
       end
 
-      unless $?.exitstatus == 0
+      if exit_on_error && ($?.exitstatus != 0)
         $stderr.puts "command failed:\n#{cmd}"
         exit -1
       end

data/svn2git.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "svn2git"
-  s.version = "2.2.0"
+  s.version = "2.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Coglan", "Kevin Menard"]
-  s.date = "2012-01-25"
+  s.date = "2012-02-25"
   s.email = "nirvdrum@gmail.com"
   s.executables = ["svn2git"]
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svn2git
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-02-25 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nirvdrum@gmail.com