nirvdrum-svn2git 1.2.4 → 1.3.0

data/.gitignore

@@ -0,0 +1 @@
+pkg

data/ChangeLog.markdown

@@ -1,3 +1,24 @@
+# 1.3.0 - 2009-06-09
+
+  Many thanks to mss for the patches making up most of this release.
+
+  * 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.
+
+# 1.2.3 - 2009-05-04
+
+  * Yanked out the code referencing the gem by name.  This shouldn't be necessary at all.
+
+# 1.2.2 - 2009-05-04
+
+  * Updated the reference gem in the binary to use this one and not the one on RubyForge.
+
 # 1.2.1 - 2009-04-19
 
   * Fixed a problem with the svn2git binary not loading command-line args properly.

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008 James Coglan, Kevin Menard
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+

data/README.markdown

@@ -13,50 +13,50 @@ Examples
 
 Say I have this code in svn:
 
-  trunk
-    ...
-  branches
-    1.x
-    2.x
-  tags
-    1.0.0
-    1.0.1
-    1.0.2
-    1.1.0
-    2.0.0
+    trunk
+      ...
+    branches
+      1.x
+      2.x
+    tags
+      1.0.0
+      1.0.1
+      1.0.2
+      1.1.0
+      2.0.0
 
 git-svn will go through the commit history to build a new git repo. It will
 import all branches and tags as remote svn branches, whereas what you really
 want is git-native local branches and git tag objects. So after importing this
 project I'll get:
 
-  $ git branch
-  * master
-  $ git branch -a
-  * master
-    1.x
-    2.x
-    tags/1.0.0
-    tags/1.0.1
-    tags/1.0.2
-    tags/1.1.0
-    tags/2.0.0
-    trunk
-  $ git tag -l
-  [ empty ]
+    $ git branch
+    * master
+    $ git branch -a
+    * master
+      1.x
+      2.x
+      tags/1.0.0
+      tags/1.0.1
+      tags/1.0.2
+      tags/1.1.0
+      tags/2.0.0
+      trunk
+    $ git tag -l
+    [ empty ]
 
 After svn2git is done with your project, you'll get this instead:
 
-  $ git branch
-  * master
-    1.x
-    2.x
-  $ git tag -l
-    1.0.0
-    1.0.1
-    1.0.2
-    1.1.0
-    2.0.0
+    $ git branch
+    * master
+      1.x
+      2.x
+    $ git tag -l
+      1.0.0
+      1.0.1
+      1.0.2
+      1.1.0
+      2.0.0
 
 Finally, it makes sure the HEAD of master is the same as the current trunk of
 the svn repo.
@@ -80,28 +80,28 @@ create a git repo from a svn repo in the specified layout.
 1. The svn repo is in the standard layout of (trunk, branches, tags) at the
 root level of the repo.
 
-    $ svn2git http://svn.yoursite.com/path/to/repo --trunk trunk --branches branches --tags tags
+        $ svn2git http://svn.example.com/path/to/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.yoursite.com/path/to/repo --trunk trunk --tags tags
-
-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 dev --tags rel --nobranches
 
-    $ svn2git http://svn.yoursite.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.yoursite.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.yoursite.com/path/to/repo --rootistrunk
+        $ 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
@@ -109,8 +109,8 @@ want your new git repo to exist in, change into it and then run one of the
 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.yoursite.com/path/to/repo/foo as your trunk, and so on. However, in
-case 5 it references the root of the repo as trunk.
+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.
 
 Authors
 -------
@@ -118,12 +118,12 @@ Authors
 To convert all your svn authors to git format, create a file somewhere on your
 system with the list of conversions to make, one per line, for example:
 
-  jcoglan = James Coglan <jcoglan@never-you-mind.com>
-  stnick = Santa Claus <nicholas@lapland.com>
+    jcoglan = James Coglan <jcoglan@never-you-mind.com>
+    stnick = Santa Claus <nicholas@lapland.com>
 
 Then pass an +authors+ option to +svn2git+ pointing to your file:
 
-  svn2git http://repos.com/myproject --authors ~/authors.txt
+    $ svn2git http://svn.example.com/path/to/repo --authors ~/authors.txt
 
 Alternatively, you can place the authors file into ~/.svn2git/authors and
 svn2git will load it out of there. This allows you to build up one authors
@@ -139,4 +139,34 @@ underlying git-svn process.
 
 You can turn on verbose logging with the '-v' or '--verbose' flags, like so:
 
-  $ svn2git http://svn.yoursite.com/path/to/repo --verbose
+    $ svn2git http://svn.yoursite.com/path/to/repo --verbose
+
+FAQ
+---
+
+1. Why don't the tags show up in the master branch?
+
+    The tags won't show up in the master branch because the tags are actually
+    tied to the commits that were created in svn when the user made the tag.
+    Those commits are the first (head) commit of branch in svn that is
+    associated with that tag. If you want to see all the branches and tags
+    and their relationships in gitk you can run the following: gitk --all
+    
+    For further details please refer to FAQ #2.
+    
+2. Why don't you reference the parent of the tag commits instead?
+
+    In svn you are forced to create what are known in git as annotated tags.
+    It just so happens that svn annotated tags allow you to commit change
+    sets along with the tagging action. This means that the svn annotated tag
+    is a bit more complex then just an annotated tag it is a commit which is
+    treated as an annotated tag. Hence, for there to be a true 1-to-1 mapping
+    between git and svn we have to transfer over the svn commit which acts as
+    an annotated tag and then tag that commit in git using an annotated tag.
+    
+    If we were to reference the parent of this svn tagged commit there could
+    potentially be situations where a developer would checkout a tag in git
+    and the resulting code base would be different then if they checked out
+    that very same tag in the original svn repo. This is only due to the fact
+    that the svn tags allow changesets in them, making them not just annotated
+    tags.

data/VERSION.yml

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

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 isequivalent 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,6 +110,7 @@ module Svn2Git
       tags = @options[:tags]
       rootistrunk = @options[:rootistrunk]
       authors = @options[:authors]
+      exclude = @options[:exclude]
 
       if rootistrunk
         # Non-standard repository layout.  The repository root is effectively 'trunk.'
@@ -110,7 +130,21 @@ module Svn2Git
       end
 
       run_command("git config svn.authorsfile #{authors}") if authors
-      run_command("git svn fetch")
+
+      cmd = "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
@@ -125,8 +159,7 @@ module Svn2Git
         id = tag.strip.gsub(%r{^#{@options[:tags]}\/}, '')
         subject = `git log -1 --pretty=format:"%s" #{tag.strip()}`
         date = `git log -1 --pretty=format:"%ci" #{tag.strip()}`
-        `export GIT_COMMITER_DATE="#{date}"`
-        run_command("git tag -a -m '#{subject}' '#{id.strip()}' '#{tag.strip()}'")
+        run_command("GIT_COMMITTER_DATE='#{date}' git tag -a -m '#{subject}' '#{id.strip()}' '#{tag.strip()}'")
         run_command("git branch -d -r #{tag.strip()}")
       end
     end

data/svn2git.gemspec

@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{svn2git}
+  s.version = "1.3.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{2009-06-09}
+  s.default_executable = %q{svn2git}
+  s.email = %q{nirvdrum@gmail.com}
+  s.executables = ["svn2git"]
+  s.extra_rdoc_files = [
+    "ChangeLog.markdown",
+     "README.markdown"
+  ]
+  s.files = [
+    ".gitignore",
+     "ChangeLog.markdown",
+     "MIT-LICENSE",
+     "README.markdown",
+     "Rakefile",
+     "VERSION.yml",
+     "bin/svn2git",
+     "lib/svn2git.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.4}
+  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
+    else
+    end
+  else
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nirvdrum-svn2git
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  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-06-09 00:00:00 -07:00
 default_executable: svn2git
 dependencies: []
 
@@ -24,14 +24,17 @@ extra_rdoc_files:
 - ChangeLog.markdown
 - README.markdown
 files: 
+- .gitignore
 - ChangeLog.markdown
+- MIT-LICENSE
 - README.markdown
 - Rakefile
 - VERSION.yml
 - bin/svn2git
 - lib/svn2git.rb
 - lib/svn2git/migration.rb
-has_rdoc: true
+- svn2git.gemspec
+has_rdoc: false
 homepage: https://www.negativetwenty.net/redmine/projects/svn2git
 post_install_message: 
 rdoc_options: