Added --no-minimize-url option, same as git-svn option

François Rey · François Rey · commit 5a73de8f9bb5 · 2011-03-29T18:14:35.000+02:00
diff --git a/lib/svn2git/migration.rb b/lib/svn2git/migration.rb
@@ -37,6 +37,7 @@ def parse(args)
       options = {}
       options[:verbose] = false
       options[:metadata] = false
+      options[:nominimizeurl] = false
       options[:rootistrunk] = false
       options[:trunk] = 'trunk'
       options[:branches] = 'branches'
@@ -89,6 +90,10 @@ def parse(args)
           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('-m', '--metadata', 'Include metadata in git logs (git-svn-id)') do
           options[:metadata] = true
         end
@@ -126,6 +131,7 @@ def clone!
       branches = @options[:branches]
       tags = @options[:tags]
       metadata = @options[:metadata]
+      nominimizeurl = @options[:nominimizeurl]
       rootistrunk = @options[:rootistrunk]
       authors = @options[:authors]
       exclude = @options[:exclude]
@@ -134,6 +140,9 @@ def clone!
         # Non-standard repository layout.  The repository root is effectively 'trunk.'
         cmd = "git svn init "
         cmd += "--no-metadata " unless metadata
+        if nominimizeurl
+          cmd += "--no-minimize-url "
+        end
         cmd += "--trunk=#{@url}"
         run_command(cmd)
 
@@ -142,6 +151,9 @@ def clone!
 
         # Add each component to the command that was passed as an argument.
         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?
