Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions lib/svn2git/migration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ def parse(args)
options[:tags] = []
options[:exclude] = []
options[:revision] = nil
options[:stdlayout] = nil
options[:username] = nil
options[:password] = nil
options[:rebasebranch] = false
Expand Down Expand Up @@ -96,6 +97,15 @@ def parse(args)
options[:trunk] = nil
options[:branches] = nil
options[:tags] = nil
options[:stdlayout] = false
end

opts.on('--stdlayout', 'Use this when the standard layout applies to trunk, tags, and branches') do
options[:stdlayout] = true
options[:trunk] = nil
options[:branches] = nil
options[:tags] = nil
options[:rootistrunk] = false
end

opts.on('--notrunk', 'Do not import anything from trunk') do
Expand Down Expand Up @@ -173,6 +183,7 @@ def clone!
metadata = @options[:metadata]
nominimizeurl = @options[:nominimizeurl]
rootistrunk = @options[:rootistrunk]
stdlayout = @options[:stdlayout]
authors = @options[:authors]
exclude = @options[:exclude]
revision = @options[:revision]
Expand Down Expand Up @@ -201,6 +212,9 @@ def clone!
if nominimizeurl
cmd += "--no-minimize-url "
end
if stdlayout
cmd += "--stdlayout "
end
cmd += "--trunk='#{trunk}' " unless trunk.nil?
unless tags.nil?
# Fill default tags here so that they can be filtered later
Expand Down