mss-svn2git 1.2.4 → 1.2.4.1

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
+        $ svn2git http://svn.example.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.yoursite.com/path/to/repo --trunk trunk --branches branches
+        $ 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
 level of the repo.
 
-    $ svn2git http://svn.yoursite.com/path/to/repo --trunk trunk
+        $ svn2git http://svn.example.com/path/to/repo --trunk trunk
 
 5. 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
 
 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,7 +109,7 @@ 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
+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.
 
 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,5 @@ 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
+

data/lib/svn2git/migration.rb

@@ -61,7 +61,7 @@ module Svn2Git
           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
+        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
         end
 
@@ -92,22 +92,20 @@ module Svn2Git
       rootistrunk = @options[:rootistrunk]
       authors = @options[:authors]
 
+      cmd = %w{git svn init --no-metadata}
       if rootistrunk
         # Non-standard repository layout.  The repository root is effectively 'trunk.'
-        run_command("git svn init --no-metadata --trunk=#{@url}")
+        cmd << "--trunk=#{@url}"
 
       else
-        cmd = "git svn init --no-metadata "
-
         # 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
+        cmd << "--trunk=#{trunk}" unless trunk.nil?
+        cmd << "--tags=#{tags}" unless tags.nil?
+        cmd << "--branches=#{branches}" unless branches.nil?
 
-        run_command(cmd)
+        cmd << @url
       end
+      run_command(cmd)
 
       run_command("git config svn.authorsfile #{authors}") if authors
       run_command("git svn fetch")
@@ -125,8 +123,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
@@ -156,6 +153,8 @@ module Svn2Git
     end
 
     def run_command(cmd)
+      cmd = cmd.join(' ') if cmd.kind_of? Array
+
       log "Running command: #{cmd}"
 
       IO.popen(cmd) do |stdout|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mss-svn2git
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  version: 1.2.4.1
 platform: ruby
 authors: 
 - James Coglan