Updated Nathaniel's patch to match existing code style.

nirvdrum · nirvdrum · commit 2bd075bd48b9 · 2010-05-29T09:49:36.000-04:00
diff --git a/lib/svn2git/migration.rb b/lib/svn2git/migration.rb
@@ -10,17 +10,17 @@ class Migration
 
     def initialize(args)
       @options = parse(args)
-      if @options.fetch(:rebase, false)
+      if @options[:rebase]
          show_help_message('Too many arguments') if args.size > 0
       else
-         show_help_message("Missing SVN_URL parameter") if args.empty?
+         show_help_message('Missing SVN_URL parameter') if args.empty?
          show_help_message('Too many arguments') if args.size > 1
          @url = args.first
       end
     end
 
     def run!
-      if @options.fetch(:rebase, false)
+      if @options[:rebase]
         get_branches
       else
         clone!
@@ -53,7 +53,7 @@ def parse(args)
         opts.separator ''
         opts.separator 'Specific options:'
 
-        opts.on('--rebase', 'Instead of cloning a new project, rebase an existing one against svn') do
+        opts.on('--rebase', 'Instead of cloning a new project, rebase an existing one against SVN') do
           options[:rebase] = true
         end
 
@@ -189,7 +189,7 @@ def fix_branches
       svn_branches.each do |branch|
         branch = branch.strip
 
-        if @options.fetch(:rebase, false) and (@local.index(branch) != nil or branch == 'trunk')
+        if @options[:rebase] && (@local.include?(branch) || branch == 'trunk')
            branch = 'master' if branch == 'trunk'
            run_command("git checkout -f #{branch}")
            run_command("git svn rebase")
@@ -204,7 +204,7 @@ def fix_branches
 
     def fix_trunk
       trunk = @remote.find { |b| b.strip == 'trunk' }
-      if trunk and not @options.fetch(:rebase, false)
+      if trunk && ! @options[:rebase]
         run_command("git checkout trunk")
         run_command("git branch -D master")
         run_command("git checkout -f -b master")
