mss-svn2git 1.2.4.1 → 1.3.0

data/ChangeLog.markdown

@@ -1,3 +1,10 @@
+# 1.3.0 - 2009-05-06
+
+  * Fixed a problem where tags didn't get the original date and time.
+  * New switch --exclude which can be used to specify a PCRE pattern to exclude paths from the import.
+  * New switches --no{trunk,branches,tags} to skip import of those.
+  * Improved docs.
+
 # 1.2.4 - 2009-05-04
 
   * No changes.  I ran the jeweler command twice inadvertently.  Tearing down the release would be more harmful than helpful.
@@ -35,4 +42,5 @@
 
 # 1.0.0 - 2008-07-19
 
-  * Forked version from jcoglan.
+  * Forked version from jcoglan.
+

data/README.markdown

@@ -85,24 +85,24 @@ root level of the repo.
 2. The svn repo is NOT in standard layout and has only a trunk and tags at the
 root level of the repo.
 
-        $ svn2git http://svn.example.com/path/to/repo --trunk trunk --tags tags
+        $ svn2git http://svn.example.com/path/to/repo --trunk dev --tags rel --nobranches
 
-3. The svn repo is NOT in standard layout and has only a trunk and branches at
-the root level of the repo.
-
-        $ svn2git http://svn.example.com/path/to/repo --trunk trunk --branches branches
-
-4. The svn repo is NOT in standard layout and has only a trunk at the root
+3. The svn repo is NOT in standard layout and has only a trunk at the root
 level of the repo.
 
-        $ svn2git http://svn.example.com/path/to/repo --trunk trunk
+        $ svn2git http://svn.example.com/path/to/repo --trunk trunk --nobranches --notags
 
-5. The svn repo is NOT in standard layout and has no trunk, branches, or tags
+4. The svn repo is NOT in standard layout and has no trunk, branches, or tags
 at the root level of the repo. Instead the root level of the repo is
 equivalent to the trunk and there are no tags or branches.
 
         $ svn2git http://svn.example.com/path/to/repo --rootistrunk
 
+5. The svn repo is in the standard layout but you want to exclude the massive
+doc directory and the backup files you once accidently added.
+
+        $ svn2git http://svn.example.com/path/to/repo --exclude doc --exclude '.*~$'
+
 The above will create a git repository in the current directory with the git
 version of the svn repository. Hence, you need to make a directory that you
 want your new git repo to exist in, change into it and then run one of the
@@ -110,7 +110,7 @@ above commands. Note that in the above cases the trunk, branches, tags options
 are simply folder names relative to the provided repo path. For example if you
 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 5 it references the root of the repo as trunk.
+case 4 it references the root of the repo as trunk.
 
 Authors
 -------

data/VERSION.yml

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

data/lib/svn2git/migration.rb

@@ -32,6 +32,7 @@ module Svn2Git
       options[:trunk] = 'trunk'
       options[:branches] = 'branches'
       options[:tags] = 'tags'
+      options[:exclude] = []
 
       if File.exists?(File.expand_path(DEFAULT_AUTHORS_FILE))
         options[:authors] = DEFAULT_AUTHORS_FILE
@@ -52,17 +53,35 @@ module Svn2Git
         opts.on('--branches BRANCHES_PATH', 'Subpath to branches from repository URL (default: branches)') do |branches|
           options[:branches] = branches
         end
-
         opts.on('--tags TAGS_PATH', 'Subpath to tags from repository URL (default: tags)') do |tags|
           options[:tags] = tags
         end
 
+        opts.on('--rootistrunk', 'Use this if the root level of the repo is equivalent to the trunk and there are no tags or branches') do
+          options[:rootistrunk] = true
+          options[:trunk] = nil
+          options[:branches] = nil
+          options[:tags] = nil
+        end
+
+        opts.on('--notrunk', 'Do not import anything from trunk') do
+          options[:trunk] = nil
+        end
+
+        opts.on('--nobranches', 'Do not try to import any branches') do
+          options[:branches] = nil
+        end
+
+        opts.on('--notags', 'Do not try to import any tags') do
+          options[:tags] = nil
+        end
+
         opts.on('--authors AUTHORS_FILE', "Path to file containing svn-to-git authors mapping (default: #{DEFAULT_AUTHORS_FILE})") do |authors|
           options[:authors] = authors
         end
 
-        opts.on('--rootistrunk', 'Use this if the root level of the repo is equivalent to the trunk and there are no tags or branches') do
-          options[:rootistrunk] = true
+        opts.on('--exclude REGEX', 'Specify a Perl regular expression to filter paths when fetching; can be used multiple times') do |regex|
+          options[:exclude] << regex
         end
 
         opts.on('-v', '--verbose', 'Be verbose in logging -- useful for debugging issues') do
@@ -91,24 +110,37 @@ module Svn2Git
       tags = @options[:tags]
       rootistrunk = @options[:rootistrunk]
       authors = @options[:authors]
+      exclude = @options[:exclude]
 
       cmd = %w{git svn init --no-metadata}
       if rootistrunk
         # Non-standard repository layout.  The repository root is effectively 'trunk.'
         cmd << "--trunk=#{@url}"
-
       else
         # Add each component to the command that was passed as an argument.
         cmd << "--trunk=#{trunk}" unless trunk.nil?
         cmd << "--tags=#{tags}" unless tags.nil?
         cmd << "--branches=#{branches}" unless branches.nil?
-
         cmd << @url
       end
       run_command(cmd)
 
       run_command("git config svn.authorsfile #{authors}") if authors
-      run_command("git svn fetch")
+
+      cmd = %w{git svn fetch}
+      unless exclude.empty?
+        # Add exclude paths to the command line; some versions of git support
+        # this for fetch only, later also for init.
+        regex = []
+        unless rootistrunk
+          regex << "#{trunk}[/]" unless trunk.nil?
+          regex << "#{tags}[/][^/]+[/]" unless tags.nil?
+          regex << "#{branches}[/][^/]+[/]" unless branches.nil?
+        end
+        regex = '^(?:' + regex.join('|') + ')(?:' + exclude.join('|') + ')'
+        cmd << "'--ignore-paths=#{regex}'"
+      end
+      run_command(cmd)
 
       get_branches
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mss-svn2git
 version: !ruby/object:Gem::Version 
-  version: 1.2.4.1
+  version: 1.3.0
 platform: ruby
 authors: 
 - James Coglan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-04 00:00:00 -07:00
+date: 2009-05-06 00:00:00 -07:00
 default_executable: svn2git
 dependencies: []