nirvdrum-svn2git 1.1.1 → 1.2.0

data/ChangeLog.markdown

@@ -0,0 +1,22 @@
+# 1.2.0 - 2009-04-17
+
+  * Reworked command-line options so they work similarly to every other app in the world.
+  * Better error messaging when no URL provided.
+  * Improved docs.
+
+# 1.1.1 - 2009-04-15
+  
+  * Started using Jeweler for gem management.
+  * Fixed issue with not loading up RubyGems appropriately.
+
+# 1.1.0 - 2009-01-02
+
+  * First release since nirvdrum fork.
+  
+  * Fixed issues with handling of tags and branches.
+  * Added better logging of output from git-svn.
+  * Wrap external command processing to capture failures.
+
+# 1.0.0 - 2008-07-19
+
+  * Forked version from jcoglan.

data/{README → README.markdown}

@@ -1,13 +1,15 @@
-== svn2git
+svn2git
+=======
 
-+svn2git+ is a tiny utility for migrating projects from Subversion to Git
+_svn2git_ is a tiny utility for migrating projects from Subversion to Git
 while keeping the trunk, branches and tags where they should be. It uses
 git-svn to clone an svn repository and does some clean-up to make sure
 branches and tags are imported in a meaningful way, and that the code checked
 into master ends up being what's currently in your svn trunk rather than
 whichever svn branch your last commit was in.
 
-=== Examples
+Examples
+--------
 
 Say I have this code in svn:
 
@@ -59,14 +61,16 @@ After svn2git is done with your project, you'll get this instead:
 Finally, it makes sure the HEAD of master is the same as the current trunk of
 the svn repo.
 
-=== Installation
+Installation
+------------
 
 Make sure you have git installed, then install the gem:
 
-  $ sudo apt-get install git-core git-svn
-  $ sudo gem install svn2git
+    $ sudo apt-get install git-core git-svn
+    $ sudo gem install nirvdrum-svn2git
 
-=== Usage
+Usage
+-----
 
 There are a number of ways in which you can create a git repo from an existing
 svn repo. The differentiating factor is the svn repo layout. Below is an
@@ -76,28 +80,28 @@ create a git repo from a svn repo in the specified layout.
 1. The svn repo is in the standard layout of (trunk, branches, tags) at the
 root level of the repo.
 
-  $ svn2git http://svn.yoursite.com/path/to/repo trunk=trunk branches=branches tags=tags
+    $ svn2git http://svn.yoursite.com/path/to/repo --trunk trunk --branches branches --tags tags
 
 2. The svn repo is NOT in standard layout and has only a trunk and tags at the
 root level of the repo.
 
-  $ svn2git http://svn.yoursite.com/path/to/repo trunk=trunk tags=tags
+    $ svn2git http://svn.yoursite.com/path/to/repo --trunk trunk --tags tags
 
 3. The svn repo is NOT in standard layout and has only a trunk and branches at
 the root level of the repo.
 
-  $ svn2git http://svn.yoursite.com/path/to/repo trunk=trunk branches=branches
+    $ svn2git http://svn.yoursite.com/path/to/repo --trunk trunk --branches branches
 
 4. The svn repo is NOT in standard layout and has only a trunk at the root
 level of the repo.
 
-  $ svn2git http://svn.yoursite.com/path/to/repo trunk=trunk
+    $ svn2git http://svn.yoursite.com/path/to/repo --trunk trunk
 
 5. The svn repo is NOT in standard layout and has no trunk, branches, or tags
 at the root level of the repo. Instead the root level of the repo is
 equivalent to the trunk and there are no tags or branches.
 
-  $ svn2git http://svn.yoursite.com/path/to/repo rootistrunk=true
+    $ svn2git http://svn.yoursite.com/path/to/repo --rootistrunk
 
 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
@@ -108,7 +112,8 @@ specified trunk=foo branches=bar and tags=foobar it would be referencing
 http://svn.yoursite.com/path/to/repo/foo as your trunk, and so on. However, in
 case 5 it references the root of the repo as trunk.
 
-=== Authors
+Authors
+-------
 
 To convert all your svn authors to git format, create a file somewhere on your
 system with the list of conversions to make, one per line, for example:
@@ -118,9 +123,20 @@ system with the list of conversions to make, one per line, for example:
 
 Then pass an +authors+ option to +svn2git+ pointing to your file:
 
-  svn2git http://repos.com/myproject authors=~/authors.txt
+  svn2git http://repos.com/myproject --authors ~/authors.txt
 
 Alternatively, you can place the authors file into ~/.svn2git/authors and
 svn2git will load it out of there. This allows you to build up one authors
 file for all your projects and have it loaded for each repository that you
-migrate.
+migrate.
+
+Debugging
+---------
+
+If you're having problems with converting your repository and you're not sure why,
+try turning on verbose logging.  This will print out more information from the
+underlying git-svn process.
+
+You can turn on verbose logging with the '-v' or '--verbose' flags, like so:
+
+  $ svn2git http://svn.yoursite.com/path/to/repo --verbose

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:minor: 2
+:patch: 0
 :major: 1
-:minor: 1

data/lib/svn2git/migration.rb

@@ -1,25 +1,21 @@
+require 'optparse'
+require 'pp'
+
 module Svn2Git
   DEFAULT_AUTHORS_FILE = "~/.svn2git/authors"
-  
+
   class Migration
-  
+
     attr_reader :dir
-    
-    def initialize(url, options = {})
-      @url = url
-      @dir = @url.scan(/[^\/]+/).last
-      
-      @options = options
-      @options[:trunk] ||= 'trunk'
-      @options[:branches] ||= 'branches'
-      @options[:tags] ||= 'tags'
-      
-      @authors = options[:authors]
-      if @authors.nil? && File.exists?(File.expand_path(DEFAULT_AUTHORS_FILE))
-        @authors = DEFAULT_AUTHORS_FILE
-      end
+
+    def initialize(args)
+      @options = parse(args)
+      show_help_message("Missing SVN_URL parameter") if args.empty?
+      show_help_message('Too many arguments') if args.size > 1
+
+      @url = args.first
     end
-    
+
     def run!
       clone!
       fix_tags
@@ -27,43 +23,103 @@ module Svn2Git
       fix_trunk
       optimize_repos
     end
-    
+
+    def parse(args)
+      # Set up reasonable defaults for options.
+      options = {}
+      options[:verbose] = false
+      options[:rootistrunk] = false
+      options[:trunk] = 'trunk'
+      options[:branches] = 'branches'
+      options[:tags] = 'tags'
+
+      if File.exists?(File.expand_path(DEFAULT_AUTHORS_FILE))
+        options[:authors] = DEFAULT_AUTHORS_FILE
+      end
+
+
+      # Parse the command-line arguments.
+      @opts = OptionParser.new do |opts|
+        opts.banner = 'Usage: svn2git SVN_URL [options]'
+
+        opts.separator ''
+        opts.separator 'Specific options:'
+
+        opts.on('--trunk TRUNK_PATH', 'Subpath to trunk from repository URL (default: trunk)') do |trunk|
+          options[:trunk] = trunk
+        end
+
+        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
+
+        opts.on('--authors AUTHORS_FILE', "Path to file containing svn-to-git authors mapping (default: #{DEFAULT_AUTHORS_FILE})") do |authors|
+          options[:authors] = authors
+        end
+
+        opts.on('--rootistrunk', 'Use this if the root level of the repo isequivalent to the trunk and there are no tags or branches') do
+          options[:rootistrunk] = true
+        end
+
+        opts.on('-v', '--verbose', 'Be verbose in logging -- useful for debugging issues') do
+          options[:verbose] = true
+        end
+
+        opts.separator ""
+
+        # No argument, shows at tail.  This will print an options summary.
+        # Try it and see!
+        opts.on_tail('-h', '--help', 'Show this message') do
+          puts opts
+          exit
+        end
+      end
+
+      @opts.parse! args
+      options
+    end
+
   private
-    
+
     def clone!
       trunk = @options[:trunk]
       branches = @options[:branches]
       tags = @options[:tags]
       rootistrunk = @options[:rootistrunk]
-      
-      if (!rootistrunk.nil?)
+      authors = @options[:authors]
+
+      if rootistrunk
         # Non-standard repository layout.  The repository root is effectively 'trunk.'
         run_command("git svn init --no-metadata --trunk=#{@url}")
-      
+
       else
         cmd = "git svn init --no-metadata "
-        
+
         # Add each component to the command that was passed as an argument.
         cmd += "--trunk=#{trunk} " unless trunk.nil?
         cmd += "--tags=#{tags} " unless tags.nil?
         cmd += "--branches=#{branches} " unless branches.nil?
-        
+
         cmd += @url
-        
+
         run_command(cmd)
       end
-      
-      run_command("git config svn.authorsfile #{@authors}") if @authors
+
+      run_command("git config svn.authorsfile #{authors}") if authors
       run_command("git svn fetch")
-      
+
       get_branches
     end
-    
+
     def get_branches
       @remote = `git branch -r`.split(/\n/)
       @tags = @remote.find_all { |b| b.strip =~ %r{^#{@options[:tags]}\/} }
     end
-    
+
     def fix_tags
       @tags.each do |tag|
         id = tag.strip.gsub(%r{^#{@options[:tags]}\/}, '')
@@ -74,7 +130,7 @@ module Svn2Git
         run_command("git branch -d -r #{tag.strip()}")
       end
     end
-    
+
     def fix_branches
       svn_branches = @remote.find_all { |b| not @tags.include?(b) }
       svn_branches.each do |branch|
@@ -84,7 +140,7 @@ module Svn2Git
         run_command("git checkout -b #{branch}")
       end
     end
-    
+
     def fix_trunk
       trunk = @remote.find { |b| b.strip == 'trunk' }
       if trunk
@@ -94,14 +150,14 @@ module Svn2Git
         run_command("git branch -d -r trunk")
       end
     end
-    
+
     def optimize_repos
       run_command("git gc")
     end
-    
+
     def run_command(cmd)
       log "Running command: #{cmd}"
-      
+
       IO.popen(cmd) do |stdout|
         stdout.each do |line|
           log line
@@ -109,12 +165,16 @@ module Svn2Git
       end
     end
 
-    private
-    
     def log(msg)
       puts msg if @options[:verbose]
     end
 
+    def show_help_message(msg)
+      puts "Error starting script: #{msg}\n\n"
+      puts @opts.help
+      exit
+    end
+
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nirvdrum-svn2git
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors: 
 - James Coglan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-15 00:00:00 -07:00
+date: 2009-04-17 00:00:00 -07:00
 default_executable: svn2git
 dependencies: []
 
@@ -21,14 +21,16 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README
+- ChangeLog.markdown
+- README.markdown
 files: 
+- ChangeLog.markdown
+- README.markdown
 - Rakefile
 - VERSION.yml
 - bin/svn2git
 - lib/svn2git.rb
 - lib/svn2git/migration.rb
-- README
 has_rdoc: true
 homepage: https://www.negativetwenty.net/redmine/projects/svn2git
 post_install_message: 
@@ -53,7 +55,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A tool for migrating svn projects to git
 test_files: []