Add --fetch option

kpruden · kpruden · commit 170ad8803955 · 2010-11-10T21:13:58.000-08:00
In rebase mode, specifying the --fetch option will cause a call to
'git svn fetch' to pull in new branches from the svn repository
diff --git a/lib/svn2git/migration.rb b/lib/svn2git/migration.rb
@@ -22,6 +22,7 @@ def initialize(args)
 
     def run!
       if @options[:rebase]
+        do_fetch if @options[:fetch]
         get_branches
       else
         clone!
@@ -43,6 +44,7 @@ def parse(args)
       options[:tags] = 'tags'
       options[:exclude] = []
       options[:revision] = nil
+      options[:fetch] = nil
 
       if File.exists?(File.expand_path(DEFAULT_AUTHORS_FILE))
         options[:authors] = DEFAULT_AUTHORS_FILE
@@ -110,6 +112,10 @@ def parse(args)
           options[:revision] = revision
         end
 
+        opts.on('--fetch', 'Before rebasing, do a git svn --fetch to pull in new branches (only valid when --rebase is specified)') do
+          options[:fetch] = true
+        end
+
         opts.separator ""
 
         # No argument, shows at tail.  This will print an options summary.
@@ -178,6 +184,10 @@ def clone!
       get_branches
     end
 
+    def do_fetch
+      run_command("git svn fetch")
+    end
+
     def get_branches
       # Get the list of local and remote svn branches, taking care to ignore console color codes and ignoring
       # the '*' character used to indicate the currently selected branch.
