svn2git 1.3.3 → 2.0.0

data/ChangeLog.markdown

@@ -1,3 +1,16 @@
+# 2.0.0 - 2010-05-29
+
+  This release adds the oft requested incremental SVN update support.  If you run svn2git with the `--rebase` option on an existing
+  repository that you've converted with svn2git, it will fetch new branches & tags from SVN and update existing ones.  There are
+  two important things to note:
+
+  * This will not work on already converted repositories because the tracking information isn't set up correctly.  You could do that
+  yourself, but it's probably a lot easier to do the conversion over.
+  * svn2git now maintains remote tracking information.  If this is a problem for you because you don't want any links to the SVN server
+  you can either stick with a 1.x release of svn2git or simply clone the repo created with svn2git, which will lose the tracking information.
+
+  A great deal of thanks to Nathaniel McCallum (npmccallum) for coming up with an elegant solution and then providing the patch for this release.
+
 # 1.3.3 - 2010-03-31
 
   Thanks to Jeff Ramnani (jramnani) for finding a problem with with the --excludes tag and providing a patch.

data/README.markdown

@@ -74,7 +74,9 @@ Make sure you have git, ruby and rubygems installed, then install the gem:
 Usage
 -----
 
-There are a number of ways in which you can create a git repo from an existing
+### Initial Conversion ###
+
+There are several ways you can create a git repo from an existing
 svn repo. The differentiating factor is the svn repo layout. Below is an
 enumerated listing of the varying supported layouts and the proper way to
 create a git repo from a svn repo in the specified layout.
@@ -114,6 +116,16 @@ specified trunk=foo branches=bar and tags=foobar it would be referencing
 http://svn.example.com/path/to/repo/foo as your trunk, and so on. However, in
 case 4 it references the root of the repo as trunk.
 
+### Repository Updates ###
+
+As of svn2git 2.0 there is a new feature to pull in the latest changes from SVN into your
+git repository created with svn2git.  This is a one way sync, but allows you to use svn2git
+as a mirroring tool for your SVN repositories.
+
+The command to call is:
+
+        $ cd <EXISTING_REPO> && svn2git --rebase
+
 Authors
 -------
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:minor: 3
 :build: 
-:patch: 3
-:major: 1
+:patch: 0
+:major: 2
+:minor: 0

data/lib/svn2git/blah.rb

@@ -0,0 +1,4 @@
+require 'migration'
+
+migration = Svn2Git::Migration.new(ARGV)
+migration.run!

data/lib/svn2git/migration.rb

@@ -10,14 +10,22 @@ module Svn2Git
 
     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
+      if @options[:rebase]
+         show_help_message('Too many arguments') if args.size > 0
+         verify_working_tree_is_clean
+      else
+         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!
-      clone!
+      if @options[:rebase]
+        get_branches
+      else
+        clone!
+      end
       fix_tags
       fix_branches
       fix_trunk
@@ -46,6 +54,10 @@ module Svn2Git
         opts.separator ''
         opts.separator 'Specific options:'
 
+        opts.on('--rebase', 'Instead of cloning a new project, rebase an existing one against SVN') do
+          options[:rebase] = true
+        end
+
         opts.on('--trunk TRUNK_PATH', 'Subpath to trunk from repository URL (default: trunk)') do |trunk|
           options[:trunk] = trunk
         end
@@ -150,8 +162,12 @@ module Svn2Git
     end
 
     def get_branches
-      @local = run_command("git branch -l").split(/\n/).collect{ |b| b.strip }
-      @remote = run_command("git branch -r").split(/\n/).collect{ |b| b.strip }
+      # Get the list of local and remote branches, taking care to ignore console color codes and ignoring the
+      # '*' character used to indicate the currently selected branch.
+      @local = run_command("git branch -l --no-color").split(/\n/).collect{ |b| b.gsub(/\*/,'').strip }
+      @remote = run_command("git branch -r --no-color").split(/\n/).collect{ |b| b.gsub(/\*/,'').strip }
+
+      # Tags are remote branches that start with "tags/".
       @tags = @remote.find_all { |b| b.strip =~ %r{^tags\/} }
     end
 
@@ -173,20 +189,28 @@ module Svn2Git
       svn_branches = @remote.find_all { |b| not @tags.include?(b) }
       svn_branches.each do |branch|
         branch = branch.strip
-        next if 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")
+           next
+        end
+
+        next if branch == 'trunk'
+        run_command("git branch -t #{branch} remotes/#{branch}")
         run_command("git checkout #{branch}")
-        run_command("git checkout -b #{branch}")    
       end
     end
 
     def fix_trunk
       trunk = @remote.find { |b| b.strip == 'trunk' }
-      if trunk
+      if trunk && ! @options[:rebase]
         run_command("git checkout trunk")
         run_command("git branch -D master")
         run_command("git checkout -f -b master")
-        run_command("git branch -d -r trunk")
+      else
+        run_command("git checkout -f master")
       end
     end
 
@@ -218,6 +242,14 @@ module Svn2Git
       puts @opts.help
       exit
     end
+    
+    def verify_working_tree_is_clean
+      status = run_command('git status --porcelain --untracked-files=no')
+      unless status.strip == ''
+        puts 'You have local pending changes.  The working tree must be clean in order to continue.'
+        exit
+      end
+    end
 
     def escape_quotes(str)
       str.gsub("'", "'\\\\''")

data/svn2git.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{svn2git}
-  s.version = "1.3.3"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Coglan", "Kevin Menard"]
-  s.date = %q{2010-03-31}
+  s.date = %q{2010-05-29}
   s.default_executable = %q{svn2git}
   s.email = %q{nirvdrum@gmail.com}
   s.executables = ["svn2git"]
@@ -26,20 +26,21 @@ Gem::Specification.new do |s|
      "VERSION.yml",
      "bin/svn2git",
      "lib/svn2git.rb",
+     "lib/svn2git/blah.rb",
      "lib/svn2git/migration.rb",
      "svn2git.gemspec"
   ]
   s.homepage = %q{https://www.negativetwenty.net/redmine/projects/svn2git}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A tool for migrating svn projects to git}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: svn2git
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
-  - 1
-  - 3
-  - 3
-  version: 1.3.3
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - James Coglan
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 -04:00
+date: 2010-05-29 00:00:00 -04:00
 default_executable: svn2git
 dependencies: []
 
@@ -37,6 +38,7 @@ files:
 - VERSION.yml
 - bin/svn2git
 - lib/svn2git.rb
+- lib/svn2git/blah.rb
 - lib/svn2git/migration.rb
 - svn2git.gemspec
 has_rdoc: true
@@ -49,23 +51,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A tool for migrating svn projects to git