0
@@ -14,6 +14,7 @@ module Braid
0
   WORK_BRANCH = "braid/track"
0
   CONFIG_FILE = ".braids"
0
   REQUIRED_GIT_VERSION = "1.5.4.5"
0
+  REQUIRED_GIT_SVN_VERSION = "1.5.4.5"
0
 end
0
 
0
 require 'braid/version'

0
@@ -8,7 +8,8 @@ module Braid
0
       include Operations::Git
0
 
0
       def run(command, *args)
0
-        raise Braid::Git::VersionTooLow unless verify_git_version(REQUIRED_GIT_VERSION)
0
+        raise Braid::Git::GitVersionTooLow    unless verify_version("git",     REQUIRED_GIT_VERSION)
0
+        raise Braid::Git::GitSvnVersionTooLow unless verify_version("git svn", REQUIRED_GIT_SVN_VERSION)
0
 
0
         klass = Braid::Commands.const_get(command.to_s.capitalize)
0
         klass.new.run(*args)
0
@@ -17,8 +18,12 @@ module Braid
0
         msg "Local changes are present. You have to commit or stash them before running braid commands."
0
         msg "Exiting."
0
 
0
-      rescue Braid::Git::VersionTooLow => e
0
-        msg "This version of braid requires at least git #{REQUIRED_GIT_VERSION}. You have #{extract_git_version}."
0
+      rescue Braid::Git::GitVersionTooLow => e
0
+        msg "This version of braid requires at least git #{REQUIRED_GIT_VERSION}. You have #{extract_version("git")}."
0
+        msg "Exiting."
0
+
0
+      rescue Braid::Git::GitSvnVersionTooLow => e
0
+        msg "This version of braid requires at least git svn #{REQUIRED_GIT_SVN_VERSION}. You have #{extract_version("git svn")}."
0
         msg "Exiting."
0
 
0
       rescue => e

0
@@ -23,7 +23,8 @@ module Braid
0
 
0
   class Git
0
     class UnknownRevision < Braid::Exception; end
0
-    class VersionTooLow < Braid::Exception; end
0
+    class GitVersionTooLow < Braid::Exception; end
0
+    class GitSvnVersionTooLow < Braid::Exception; end
0
     class LocalChangesPresent < Braid::Exception; end
0
   end
0
 

0
@@ -116,14 +116,14 @@ module Braid
0
         end
0
       end
0
 
0
-      def extract_git_version
0
-        status, out, err = exec!("git --version")
0
-        return out.sub(/^git version/, "").strip
0
+      def extract_version(cmd)
0
+        status, out, err = exec!("#{cmd} --version")
0
+        return out.sub(/^.* version/, "").strip
0
       end
0
 
0
-      def verify_git_version(required)
0
+      def verify_version(cmd, required)
0
         required_version = required.split(".")
0
-        actual_version   = extract_git_version.split(".")
0
+        actual_version   = extract_version(cmd).split(".")
0
         actual_version.each_with_index do |actual_piece, idx|
0
           required_piece = required_version[idx]
0
 

0
@@ -20,29 +20,33 @@ describe "Braid::Operations::Mirror#find_remote" do
0
   end
0
 end
0
 
0
-describe Braid::Operations::Helpers, "extract_git_version" do
0
+describe Braid::Operations::Helpers, "extract_version" do
0
   it "should extract from git --version output" do
0
     self.stub!(:exec!).and_return([0, "git version 1.5.5.1.98.gf0ec4\n", ""])
0
-    extract_git_version.should == "1.5.5.1.98.gf0ec4"
0
+    extract_version("git").should == "1.5.5.1.98.gf0ec4"
0
+  end
0
+  it "should extract from git svn --version output" do
0
+    self.stub!(:exec!).and_return([0, "git-svn version 1.5.5.1.98.gf0ec4\n", ""])
0
+    extract_version("git svn").should == "1.5.5.1.98.gf0ec4"
0
   end
0
 end
0
 
0
-describe Braid::Operations::Helpers, "verify_git_version against 1.5.4.5" do
0
+describe Braid::Operations::Helpers, "verify_version against 1.5.4.5" do
0
   required_version = "1.5.4.5"
0
   should_pass      = %w(1.5.4.6 1.5.5 1.6 1.5.4.5.2 1.5.5.1.98.gf0ec4)
0
   should_not_pass  = %w(1.5.4.4 1.5.4 1.5.3 1.4.5.6)
0
 
0
   should_pass.each do |actual_version|
0
     it "should be true for #{actual_version}" do
0
-      self.stub!(:extract_git_version).and_return(actual_version)
0
-      verify_git_version("1.5.4.5").should == true
0
+      self.should_receive(:extract_version).with("some git executable").and_return(actual_version)
0
+      verify_version("some git executable", "1.5.4.5").should == true
0
     end
0
   end
0
 
0
   should_not_pass.each do |actual_version|
0
     it "should be false for #{actual_version}" do
0
-      self.stub!(:extract_git_version).and_return(actual_version)
0
-      verify_git_version("1.5.4.5").should == false
0
+      self.should_receive(:extract_version).with("some git executable").and_return(actual_version)
0
+      verify_version("some git executable", "1.5.4.5").should == false
0
     end
0
   end
0
 end