svn2git 2.0.0 → 2.1.0

data/ChangeLog.markdown

@@ -1,3 +1,13 @@
+# 2.1.0 - 2011-04-03
+
+  Thanks to Francois Rey (fmjrey), Sven Axelsson (svenax), and Julian Taylor (juliantaylor) for submitting all the patches
+  that comprise this release.  svn2git now works with a much wider array SVN repositories because of their efforts.
+  
+  * Added --no-minimize-url option for migrating specific subprojects from an SVN repo containing several projects (thanks fmjrey).
+  * Added --username option for migrating password-protected repositories (thanks svenax).
+  * Added --revision option for specifying the revision to start importing from (thanks svenax).
+  * Fixed compatibility with older versions of git (thanks juliantaylor).
+
 # 2.0.0 - 2010-05-29
 
   This release adds the oft requested incremental SVN update support.  If you run svn2git with the `--rebase` option on an existing

data/README.markdown

@@ -107,6 +107,19 @@ doc directory and the backup files you once accidently added.
 
         $ svn2git http://svn.example.com/path/to/repo --exclude doc --exclude '.*~$'
 
+6. The svn repo actually tracks several projects and you only want to migrate
+one of them.
+
+        $ svn2git http://svn.example.com/path/to/repo/nested_project --no-minimize-url
+
+7. The svn repo is password protected.
+
+        $ svn2git http://svn.example.com/path/to/repo --username <<user_with_perms>>
+
+8. You need to migrate starting at a specific svn revision number.
+
+        $ svn2git http://svn.example.com/path/to/repo --revision <<starting_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
@@ -153,7 +166,7 @@ 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 | grep -E "r[0-9]+ \| [a-z]+ \|" | awk '{print $3}' | sort | uniq
+    $ svn log | grep -E "r[0-9]+ \| .+ \|" | awk '{print $3}' | sort | uniq
 
 Debugging
 ---------

data/VERSION.yml

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

data/lib/svn2git/migration.rb

@@ -36,11 +36,15 @@ module Svn2Git
       # Set up reasonable defaults for options.
       options = {}
       options[:verbose] = false
+      options[:metadata] = false
+      options[:nominimizeurl] = false
       options[:rootistrunk] = false
       options[:trunk] = 'trunk'
       options[:branches] = 'branches'
       options[:tags] = 'tags'
       options[:exclude] = []
+      options[:revision] = nil
+      options[:username] = nil
 
       if File.exists?(File.expand_path(DEFAULT_AUTHORS_FILE))
         options[:authors] = DEFAULT_AUTHORS_FILE
@@ -58,6 +62,10 @@ module Svn2Git
           options[:rebase] = true
         end
 
+        opts.on('--username NAME', 'Username for transports that needs it (http(s), svn)') do |username|
+          options[:username] = username
+        end
+
         opts.on('--trunk TRUNK_PATH', 'Subpath to trunk from repository URL (default: trunk)') do |trunk|
           options[:trunk] = trunk
         end
@@ -65,6 +73,7 @@ module Svn2Git
         opts.on('--branches BRANCHES_PATH', 'Subpath to branches from repository URL (default: branches)') do |branches|
           options[:branches] = branches
         end
+
         opts.on('--tags TAGS_PATH', 'Subpath to tags from repository URL (default: tags)') do |tags|
           options[:tags] = tags
         end
@@ -88,6 +97,18 @@ module Svn2Git
           options[:tags] = nil
         end
 
+        opts.on('--no-minimize-url', 'Accept URLs as-is without attempting to connect to a higher level directory') do
+          options[:nominimizeurl] = true
+        end
+
+        opts.on('--revision REV', 'Start importing from SVN revision') do |revision|
+          options[:revision] = revision
+        end
+
+        opts.on('-m', '--metadata', 'Include metadata in git logs (git-svn-id)') do
+          options[:metadata] = true
+        end
+
         opts.on('--authors AUTHORS_FILE', "Path to file containing svn-to-git authors mapping (default: #{DEFAULT_AUTHORS_FILE})") do |authors|
           options[:authors] = authors
         end
@@ -120,18 +141,34 @@ module Svn2Git
       trunk = @options[:trunk]
       branches = @options[:branches]
       tags = @options[:tags]
+      metadata = @options[:metadata]
+      nominimizeurl = @options[:nominimizeurl]
       rootistrunk = @options[:rootistrunk]
       authors = @options[:authors]
       exclude = @options[:exclude]
+      revision = @options[:revision]
+      username = @options[:username]
 
       if rootistrunk
         # Non-standard repository layout.  The repository root is effectively 'trunk.'
-        run_command("git svn init --no-metadata --trunk=#{@url}")
+        cmd = "git svn init --prefix=svn/ "
+        cmd += "--username=#{username} " unless username.nil?
+        cmd += "--no-metadata " unless metadata
+        if nominimizeurl
+          cmd += "--no-minimize-url "
+        end
+        cmd += "--trunk=#{@url}"
+        run_command(cmd)
 
       else
-        cmd = "git svn init --no-metadata "
+        cmd = "git svn init --prefix=svn/ "
 
         # Add each component to the command that was passed as an argument.
+        cmd += "--username=#{username} " unless username.nil?
+        cmd += "--no-metadata " unless metadata
+        if nominimizeurl
+          cmd += "--no-minimize-url "
+        end
         cmd += "--trunk=#{trunk} " unless trunk.nil?
         cmd += "--tags=#{tags} " unless tags.nil?
         cmd += "--branches=#{branches} " unless branches.nil?
@@ -143,7 +180,8 @@ module Svn2Git
 
       run_command("git config svn.authorsfile #{authors}") unless authors.nil?
 
-      cmd = "git svn fetch"
+      cmd = "git svn fetch "
+      cmd += "-r #{revision}:HEAD " unless revision.nil?
       unless exclude.empty?
         # Add exclude paths to the command line; some versions of git support
         # this for fetch only, later also for init.
@@ -154,7 +192,7 @@ module Svn2Git
           regex << "#{branches}[/][^/]+[/]" unless branches.nil?
         end
         regex = '^(?:' + regex.join('|') + ')(?:' + exclude.join('|') + ')'
-        cmd += " '--ignore-paths=#{regex}'"
+        cmd += "'--ignore-paths=#{regex}'"
       end
       run_command(cmd)
 
@@ -168,13 +206,13 @@ module Svn2Git
       @remote = run_command("git branch -r --no-color").split(/\n/).collect{ |b| b.gsub(/\*/,'').strip }
 
       # Tags are remote branches that start with "tags/".
-      @tags = @remote.find_all { |b| b.strip =~ %r{^tags\/} }
+      @tags = @remote.find_all { |b| b.strip =~ %r{^svn\/tags\/} }
     end
 
     def fix_tags
       @tags.each do |tag|
         tag = tag.strip
-        id = tag.gsub(%r{^tags\/}, '').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)
@@ -187,18 +225,24 @@ module Svn2Git
 
     def fix_branches
       svn_branches = @remote.find_all { |b| not @tags.include?(b) }
-      svn_branches.each do |branch|
-        branch = branch.strip
+      svn_branches = @remote.find_all { |b| b.strip =~ %r{^svn\/} }
 
+      if @options[:rebase]
+         run_command("git svn fetch")
+      end
+
+      svn_branches.each do |branch|
+        branch = branch.gsub(/^svn\//,'').strip
         if @options[:rebase] && (@local.include?(branch) || branch == 'trunk')
-           branch = 'master' if branch == 'trunk'
-           run_command("git checkout -f #{branch}")
-           run_command("git svn rebase")
+           lbranch = branch
+           lbranch = 'master' if branch == 'trunk'
+           run_command("git checkout -f #{lbranch}")
+           run_command("git rebase remotes/svn/#{branch}")
            next
         end
 
-        next if branch == 'trunk'
-        run_command("git branch -t #{branch} remotes/#{branch}")
+        next if branch == 'trunk' || @local.include?(branch)
+        run_command("git branch --track #{branch} remotes/svn/#{branch}")
         run_command("git checkout #{branch}")
       end
     end
@@ -206,7 +250,7 @@ module Svn2Git
     def fix_trunk
       trunk = @remote.find { |b| b.strip == 'trunk' }
       if trunk && ! @options[:rebase]
-        run_command("git checkout trunk")
+        run_command("git checkout svn/trunk")
         run_command("git branch -D master")
         run_command("git checkout -f -b master")
       else
@@ -229,7 +273,7 @@ module Svn2Git
           ret << line
         end
       end
-      
+
       ret
     end
 
@@ -242,12 +286,12 @@ module Svn2Git
       puts @opts.help
       exit
     end
-    
+
     def verify_working_tree_is_clean
       status = run_command('git status --porcelain --untracked-files=no')
       unless status.strip == ''
         puts 'You have local pending changes.  The working tree must be clean in order to continue.'
-        exit
+        exit -1
       end
     end
 

data/svn2git.gemspec

@@ -1,43 +1,40 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{svn2git}
-  s.version = "2.0.0"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Coglan", "Kevin Menard"]
-  s.date = %q{2010-05-29}
+  s.date = %q{2011-04-03}
   s.default_executable = %q{svn2git}
   s.email = %q{nirvdrum@gmail.com}
   s.executables = ["svn2git"]
   s.extra_rdoc_files = [
     "ChangeLog.markdown",
-     "README.markdown"
+    "README.markdown"
   ]
   s.files = [
-    ".gitignore",
-     "ChangeLog.markdown",
-     "MIT-LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION.yml",
-     "bin/svn2git",
-     "lib/svn2git.rb",
-     "lib/svn2git/blah.rb",
-     "lib/svn2git/migration.rb",
-     "svn2git.gemspec"
+    "ChangeLog.markdown",
+    "MIT-LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "VERSION.yml",
+    "bin/svn2git",
+    "lib/svn2git.rb",
+    "lib/svn2git/blah.rb",
+    "lib/svn2git/migration.rb",
+    "svn2git.gemspec"
   ]
   s.homepage = %q{https://www.negativetwenty.net/redmine/projects/svn2git}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{A tool for migrating svn projects to git}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: svn2git
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 2
+  - 1
   - 0
-  - 0
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - James Coglan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-29 00:00:00 -04:00
+date: 2011-04-03 00:00:00 -04:00
 default_executable: svn2git
 dependencies: []
 
@@ -30,7 +30,6 @@ extra_rdoc_files:
 - ChangeLog.markdown
 - README.markdown
 files: 
-- .gitignore
 - ChangeLog.markdown
 - MIT-LICENSE
 - README.markdown
@@ -46,8 +45,8 @@ homepage: https://www.negativetwenty.net/redmine/projects/svn2git
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -71,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: A tool for migrating svn projects to git

data/.gitignore

@@ -1,2 +0,0 @@
-pkg
-.idea