Changeset 2265 in ProjectBuilder for devel

Timestamp:

Aug 30, 2017, 5:07:46 PM (7 years ago)

Author:

Bruno Cornec

Message:

Fix git+svn usage for vcs_add and checkin

File:

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

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

@@ -481 +481 @@
     pb_system("cd $dir && $vcscmd ci -m \"$msg\" .","Checking in $dir ");
 } elsif ($scheme =~ /^git/) {
-    pb_system("cd $dir && $vcscmd commit -a -m \"$msg\"", "Checking in $dir ");
+    pb_system("cd $dir && git commit -a -m \"$msg\"", "Checking in $dir ");
 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) {
     # Nothing to do.
@@ -529 +529 @@
 
 if ($scheme =~ /^((hg)|(git)|(svn)|(svk)|(cvs))/o) {
+    $vcscmd =~ s/ svn// if (($scheme =~ /git/) && ($scheme =~ /svn/));
     pb_system("$vcscmd add ".join(' ',@f),"Adding ".join(' ',@f)." to VCS ");
 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) {
@@ -553 +554 @@
 
 if ($scheme =~ /^((svn)|(cvs)|(svk)|(git))/o) {
+    $vcscmd =~ s/ svn// if (($scheme =~ /git/) && ($scheme =~ /svn/));
     open(PIPE,"$vcscmd diff $dir |") || confess "Unable to get $vcscmd diff from $dir";
     $l = 0;