svn2git 2.2.2 → 2.2.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 14294b9fe3b9c678bde246f6312efa2e32721bdb
+  data.tar.gz: 72b0efbcca461dc3e9f73bb2c60d87e627b1cff8
+SHA512:
+  metadata.gz: 55d42fb0ac0c9d0da5d98dfac0554ac30151eb418e2a1303a014c3b6278c7bfc1f81444d4116247204233fe0e2751260d30aa83cee995b31070bdd868f4a9ead
+  data.tar.gz: 5dae5756b74582e831bd9eed0e8dc85348b99afc16ced0a4dcd776a11afbe537e2c2a766d89a73cb8815ea7af2c0f984133831407ecb9fc95eaf4dbda04d1800

data/ChangeLog.markdown

@@ -1,4 +1,19 @@
-# 2.2.2
+# 2.2.4 - 2014-04-08
+
+  There was a permissions problem with some of the files packed in 2.2.3.  This was caught immediately after the gem
+  was pushed, so it was yanked as it simply wouldn't work for anyone.  2.2.4 contains everything 2.2.3 did, but with
+  proper packaging.
+
+# 2.2.3 - 2014-04-08
+
+  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.
+  * Fixed an issue with using the `--local` flag for `git config` in git versions < 1.7.4.
+
+
+# 2.2.2 - 2012-10-07
 
   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.

data/README.markdown

@@ -64,13 +64,11 @@ the svn repo.
 Installation
 ------------
 
-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:
+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 look like:
 
     $ sudo apt-get install git-core git-svn ruby rubygems
 
-Once you have the necessary software your system, you can install svn2git through rubygems, which will add the `svn2git` command to your PATH.    
+Once you have the necessary software on your system, you can install svn2git through rubygems, which will add the `svn2git` command to your PATH.    
 
     $ sudo gem install svn2git
 
@@ -128,6 +126,10 @@ one of them.
 
         $ svn2git http://svn.example.com/path/to/repo --revision <<starting_revision_number>>:<<ending_revision_number>>
 
+10. Include metadata (git-svn-id) in git logs.
+
+        $ svn2git http://svn.example.com/path/to/repo --metadata
+
 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
@@ -174,11 +176,11 @@ 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
 a very good starting point for your mapping.
 
-    $ svn log --quiet | grep -E "r[0-9]+ \| .+ \|" | awk '{print $3}' | sort | uniq
+    $ svn log --quiet | grep -E "r[0-9]+ \| .+ \|" | cut -d'|' -f2 | sed 's/^ //' | 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
+    $ svn log --quiet http://path/to/root/of/project | grep -E "r[0-9]+ \| .+ \|" | cut -d'|' -f2 | sed 's/^ //' | sort | uniq
 
 Debugging
 ---------
@@ -191,6 +193,32 @@ You can turn on verbose logging with the `-v` or `--verbose` flags, like so:
 
     $ svn2git http://svn.yoursite.com/path/to/repo --verbose
 
+Options Reference
+-----------------
+
+    $ svn2git --help
+    Usage: svn2git SVN_URL [options]
+    
+    Specific options:
+            --rebase                     Instead of cloning a new project, rebase an existing one against SVN
+            --username NAME              Username for transports that needs it (http(s), svn)
+            --trunk TRUNK_PATH           Subpath to trunk from repository URL (default: trunk)
+            --branches BRANCHES_PATH     Subpath to branches from repository URL (default: branches)
+            --tags TAGS_PATH             Subpath to tags from repository URL (default: tags)
+            --rootistrunk                Use this if the root level of the repo is equivalent to the trunk and there are no tags or branches
+            --notrunk                    Do not import anything from trunk
+            --nobranches                 Do not try to import any branches
+            --notags                     Do not try to import any tags
+            --no-minimize-url            Accept URLs as-is without attempting to connect to a higher level directory
+            --revision START_REV[:END_REV]
+                                         Start importing from SVN revision START_REV; optionally end at END_REV
+        -m, --metadata                   Include metadata in git logs (git-svn-id)
+            --authors AUTHORS_FILE       Path to file containing svn-to-git authors mapping (default: ~/.svn2git/authors)
+            --exclude REGEX              Specify a Perl regular expression to filter paths when fetching; can be used multiple times
+        -v, --verbose                    Be verbose in logging -- useful for debugging issues
+    
+        -h, --help                       Show this message
+
 FAQ
 ---
 
@@ -220,3 +248,4 @@ FAQ
     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/Rakefile

@@ -1,5 +1,5 @@
 require 'rake'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 begin
   require 'jeweler'

data/VERSION.yml

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

data/bin/svn2git

@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'rubygems'
 require 'svn2git'
 
 migration = Svn2Git::Migration.new(ARGV)

data/lib/svn2git/migration.rb

@@ -13,6 +13,9 @@ module Svn2Git
       if @options[:rebase]
          show_help_message('Too many arguments') if args.size > 0
          verify_working_tree_is_clean
+      elsif @options[:rebasebranch]
+         show_help_message('Too many arguments') if args.size > 0
+         verify_working_tree_is_clean
       else
          show_help_message('Missing SVN_URL parameter') if args.empty?
          show_help_message('Too many arguments') if args.size > 1
@@ -23,6 +26,8 @@ module Svn2Git
     def run!
       if @options[:rebase]
         get_branches
+      elsif @options[:rebasebranch]
+        get_rebasebranch
       else
         clone!
       end
@@ -45,6 +50,7 @@ module Svn2Git
       options[:exclude] = []
       options[:revision] = nil
       options[:username] = nil
+      options[:rebasebranch] = false
 
       if File.exists?(File.expand_path(DEFAULT_AUTHORS_FILE))
         options[:authors] = DEFAULT_AUTHORS_FILE
@@ -121,6 +127,10 @@ module Svn2Git
           options[:verbose] = true
         end
 
+        opts.on('--rebasebranch REBASEBRANCH', 'Rebase specified branch.') do |rebasebranch|
+          options[:rebasebranch] = rebasebranch
+        end
+
         opts.separator ""
 
         # No argument, shows at tail.  This will print an options summary.
@@ -158,7 +168,7 @@ module Svn2Git
           cmd += "--no-minimize-url "
         end
         cmd += "--trunk=#{@url}"
-        run_command(cmd)
+        run_command(cmd, true, true)
 
       else
         cmd = "git svn init --prefix=svn/ "
@@ -175,10 +185,10 @@ module Svn2Git
 
         cmd += @url
 
-        run_command(cmd)
+        run_command(cmd, true, true)
       end
 
-      run_command("git config --local svn.authorsfile #{authors}") unless authors.nil?
+      run_command("#{git_config_command} svn.authorsfile #{authors}") unless authors.nil?
 
       cmd = "git svn fetch "
       unless revision.nil?
@@ -198,7 +208,7 @@ module Svn2Git
         regex = '^(?:' + regex.join('|') + ')(?:' + exclude.join('|') + ')'
         cmd += "'--ignore-paths=#{regex}'"
       end
-      run_command(cmd)
+      run_command(cmd, true, true)
 
       get_branches
     end
@@ -211,12 +221,40 @@ module Svn2Git
 
       # Tags are remote branches that start with "tags/".
       @tags = @remote.find_all { |b| b.strip =~ %r{^svn\/tags\/} }
+
+    end
+
+    def get_rebasebranch
+	  get_branches 
+	  @local = @local.find_all{|l| l == @options[:rebasebranch]}
+	  @remote = @remote.find_all{|r| r.include? @options[:rebasebranch]}
+
+      if @local.count > 1 
+        pp "To many matching branches found (#{@local})."
+        exit 1
+      elsif @local.count == 0
+	    pp "No local branch named \"#{@options[:rebasebranch]}\" found."
+        exit 1
+      end
+
+      if @remote.count > 2 # 1 if remote is not pushed, 2 if its pushed to remote
+        pp "To many matching remotes found (#{@remotes})"
+        exit 1
+      elsif @remote.count == 0
+	    pp "No remote branch named \"#{@options[:rebasebranch]}\" found."
+        exit 1
+      end
+	  pp "Local branches \"#{@local}\" found"
+	  pp "Remote branches \"#{@remote}\" found"
+
+      @tags = [] # We only rebase the specified branch
+
     end
 
     def fix_tags
       current = {}
-      current['user.name']  = run_command("git config --local --get user.name", false)
-      current['user.email'] = run_command("git config --local --get user.email", false)
+      current['user.name']  = run_command("#{git_config_command} --get user.name", false)
+      current['user.email'] = run_command("#{git_config_command} --get user.email", false)
 
       @tags.each do |tag|
         tag = tag.strip
@@ -225,17 +263,14 @@ module Svn2Git
         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_config_command} user.name \"#{escape_quotes(author)}\"")
+        run_command("#{git_config_command} user.email \"#{escape_quotes(email)}\"")
+
+        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)}\"")
+        ENV['GIT_COMMITTER_DATE'] = original_git_committer_date
+
         run_command("git branch -d -r \"#{escape_quotes(tag)}\"")
       end
 
@@ -246,9 +281,9 @@ 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_command} #{name} \"#{value.strip}\"")
           else
-            run_command("git config --local --unset #{name}")
+            run_command("#{git_config_command} --unset #{name}")
           end
         end
       end
@@ -259,7 +294,7 @@ module Svn2Git
       svn_branches.delete_if { |b| b.strip !~ %r{^svn\/} }
 
       if @options[:rebase]
-         run_command("git svn fetch")
+         run_command("git svn fetch", true, true)
       end
 
       svn_branches.each do |branch|
@@ -293,16 +328,23 @@ module Svn2Git
       run_command("git gc")
     end
 
-    def run_command(cmd, exit_on_error=true)
+    def run_command(cmd, exit_on_error=true, printout_output=false)
       log "Running command: #{cmd}"
 
       ret = ''
 
       cmd = "2>&1 #{cmd}"
       IO.popen(cmd) do |stdout|
-        stdout.each do |line|
-          log line
-          ret << line
+        if printout_output
+          stdout.each_char do |character|
+            $stdout.print character
+            ret << character
+          end
+        else
+          stdout.each do |line|
+            log line
+            ret << line
+          end
         end
       end
 
@@ -336,6 +378,20 @@ module Svn2Git
       str.gsub("'", "'\\\\''")
     end
 
+    def git_config_command
+      if @git_config_command.nil?
+        status = run_command('git config --local --get user.name', false)
+
+        @git_config_command = if status =~ /unknown option/m
+                                'git config'
+                              else
+                                'git config --local'
+                              end
+      end
+
+      @git_config_command
+    end
+
   end
 end
 

data/svn2git.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: svn2git 2.2.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "svn2git"
-  s.version = "2.2.2"
+  s.version = "2.2.4"
 
   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 = "2012-10-07"
+  s.date = "2014-03-09"
   s.email = "nirvdrum@gmail.com"
   s.executables = ["svn2git"]
   s.extra_rdoc_files = [
@@ -29,17 +31,7 @@ Gem::Specification.new do |s|
     "svn2git.gemspec"
   ]
   s.homepage = "https://www.negativetwenty.net/redmine/projects/svn2git"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.2.0"
   s.summary = "A tool for migrating svn projects to git"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
 end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svn2git
 version: !ruby/object:Gem::Version
-  version: 2.2.2
-  prerelease: 
+  version: 2.2.4
 platform: ruby
 authors:
 - James Coglan
@@ -10,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-07 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nirvdrum@gmail.com
@@ -33,26 +32,25 @@ files:
 - svn2git.gemspec
 homepage: https://www.negativetwenty.net/redmine/projects/svn2git
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A tool for migrating svn projects to git
 test_files: []