Changeset 2025 in ProjectBuilder

Timestamp:

Dec 11, 2015, 7:36:11 AM (8 years ago)

Author:

Bruno Cornec

Message:

improve git support by archiving HEAD if no modif in progress and removing git+ on uri when needed

File:

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

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

@@ -206 +206 @@
             }
             $source = pb_vcs_mod_htftp($source,"git");
-            pb_system("cd $source ; stid=`$vcscmd stash create` ; $vcscmd archive --format=tar \$stid | (mkdir $tmp && cd $tmp && tar xf -)","Exporting current $source from GIT to $tmp ");
+            pb_system("cd $source ; stid=`$vcscmd stash create` ; $vcscmd archive --format=tar \$\{stid:=HEAD\} | (mkdir $tmp && cd $tmp && tar xf -)","Exporting current $source from GIT to $tmp ");
         } else {
             $uri = pb_vcs_mod_htftp($uri,"git");
@@ -712 +712 @@
         return;
     }
+    # Remove git+ part if only in scheme
+    $uri =~ s/^git\+// if (($scheme =~ /^git\+/) && ($scheme2 !~ /^git\+/));
 
     if ($cmsurl ne $uri) {