Changeset 1800 in ProjectBuilder for devel

Timestamp:

Nov 29, 2013, 7:45:03 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Start to support git-svn

File:

• devel/pb-modules/lib/ProjectBuilder/VCS.pm (modified) (6 diffs)

devel/pb-modules/lib/ProjectBuilder/VCS.pm

@@ -16 +16 @@
 use strict 'vars';
 use Carp 'confess';
+use Cwd 'abs_path';
 use Data::Dumper;
 use English;
@@ -184 +185 @@
     }
 } elsif ($scheme =~ /^git/) {
-    if (defined $source) {
-        if (-d $source) {
-            $tmp = $destdir;
+    if ($scheme =~ /svn/) {
+        if (defined $source) {
+            if (-d $source) {
+                $tmp = $destdir;
+            } else {
+                $tmp = "$destdir/".basename($source);
+            }
+            $source = pb_vcs_mod_htftp($source,"git");
+            pb_system("$vcscmd clone $source $tmp","Exporting $source from $scheme to $tmp ");
         } else {
-            $tmp = "$destdir/".basename($source);
-        }
-        $source = pb_vcs_mod_htftp($source,"git");
-        pb_system("cd $source ; $vcscmd archive --format=tar HEAD | (mkdir $tmp && cd $tmp && tar xf -)","Exporting $source/HEAD from GIT to $tmp ");
-    } else {
-        $uri = pb_vcs_mod_htftp($uri,"git");
-        pb_system("$vcscmd clone $uri $destdir","Exporting $uri from GIT to $destdir ");
+            $uri = pb_vcs_mod_htftp($uri,"git");
+            pb_system("$vcscmd clone $uri $destdir","Exporting $uri from $scheme to $destdir ");
+        }
+    } else {
+        if (defined $source) {
+            if (-d $source) {
+                $tmp = $destdir;
+            } else {
+                $tmp = "$destdir/".basename($source);
+            }
+            $source = pb_vcs_mod_htftp($source,"git");
+            pb_system("cd $source ; $vcscmd archive --format=tar HEAD | (mkdir $tmp && cd $tmp && tar xf -)","Exporting $source/HEAD from GIT to $tmp ");
+        } else {
+            $uri = pb_vcs_mod_htftp($uri,"git");
+            pb_system("$vcscmd clone $uri $destdir","Exporting $uri from GIT to $destdir ");
+        }
     }
 } elsif ($scheme =~ /^cvs/) {
@@ -267 +283 @@
     chomp($res);
 } elsif ($scheme =~ /^git/) {
-    open(GIT,"git --git-dir=$dir/.git remote -v 2> /dev/null |") || return("");
-    while (<GIT>) {
-        next unless (/^origin\s+(\S+) \(push\)$/);
-        return $1;
-    }
-    close(GIT);
-    warn "Unable to find origin remote for $dir";
-    return "";
+    if ($scheme =~ /svn/) {
+        my $cwd = abs_path();
+        chdir($dir) || return("");;
+        open(PIPE,"LANGUAGE=C $vcscmd info . 2> /dev/null |") || return("");
+        chdir($cwd) || return("");
+        while (<PIPE>) {
+            ($void,$res) = split(/^URL:/) if (/^URL:/);
+        }
+        $res =~ s/^\s*//;
+        close(PIPE);
+        chomp($res);
+        # We've got an SVN ref so add git in front of it for coherency
+        $res = "git+".$res;
+    } else {
+        # Pure git
+        open(GIT,"LANGUAGE=C $vcscmd --git-dir=$dir/.git remote -v 2> /dev/null |") || return("");
+        while (<GIT>) {
+            next unless (/^origin\s+(\S+) \(push\)$/);
+            return $1;
+        }
+        close(GIT);
+        warn "Unable to find remote origin for $dir";
+        return "";
+    }
 } elsif ($scheme =~ /^cvs/) {
     # This path is always the root path of CVS, but we may be below
@@ -492 +524 @@
 =item B<pb_vcs_isdiff>
 
-This function returns a integer indicating the number f differences between the VCS content and the local directory where it's checked out.
+This function returns a integer indicating the number of differences between the VCS content and the local directory where it's checked out.
 The first parameter is the schema of the VCS systems (svn, cvs, svn+ssh, ...)
 The second parameter is the directory to consider.
@@ -559 +591 @@
 
 if ($scheme =~ /hg/) {
-    return($cmd."hg".$cmdopt)
+    $cmd .= "hg".$cmdopt;
 } elsif ($scheme =~ /git/) {
-    return($cmd."git".$cmdopt)
+    if ($scheme =~ /svn/) {
+        $cmd .= "git svn".$cmdopt;
+    } else {
+        $cmd .= "git".$cmdopt;
+    }
 } elsif ($scheme =~ /svn/) {
-    return($cmd."svn".$cmdopt)
+    $cmd .= "svn".$cmdopt;
 } elsif ($scheme =~ /svk/) {
-    return($cmd."svk".$cmdopt)
+    $cmd .= "svk".$cmdopt;
 } elsif ($scheme =~ /cvs/) {
-    return($cmd."cvs".$cmdopt)
+    $cmd .= "cvs".$cmdopt;
 } elsif (($scheme =~ /http/) || ($scheme =~ /ftp/)) {
     my $command = pb_check_req("wget",1);
     if (-x $command) {
-        return($cmd."$command -nv -O ");
+        $cmd .= "$command -nv -O ";
     } else {
         $command = pb_check_req("curl",1);
         if (-x $command) {
-            return($cmd."$command -o ");
+            $cmd .= "$command -o ";
         } else {
             confess "Unable to handle $scheme.\nNo wget/curl available, please install one of those";
@@ -581 +617 @@
     }
 } else {
-    return($cmd);
-}
+    $cmd = "";
+}
+pb_log(3,"pb_vcs_cmd returns $cmd\n");
+return($cmd);
 }