Changeset 1801 in ProjectBuilder

Timestamp:

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

Author:

Bruno Cornec

Message:

• Fix PBREVISION computation for git-svn
• Export correctly in case of git-svn as well

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/VCS.pm (modified) (1 diff)
• pb/lib/ProjectBuilder/CMS.pm (modified) (1 diff)

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

@@ -193 +193 @@
             }
             $source = pb_vcs_mod_htftp($source,"git");
-            pb_system("$vcscmd clone $source $tmp","Exporting $source from $scheme to $tmp ");
+            pb_system("cp -a $source $tmp","Exporting $source from $scheme to $tmp ");
         } else {
             $uri = pb_vcs_mod_htftp($uri,"git");

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -104 +104 @@
     $ENV{'PBCMSLOGFILE'}="hg.log";
 } elsif ($scheme =~ /^git/) {
-    $tmp = `(cd "$ENV{'PBDIR'}" ; $vcscmd log | head -1 | cut -f2)`;
+    if ($scheme =~ /svn/) {
+        $tmp = `(cd "$ENV{'PBDIR'}" ; LANGUAGE=C $vcscmd info | grep -E '^Revision:' | cut -d: -f2)`;
+        $tmp =~ s/\s+//;
+    } else {
+        $tmp = `(cd "$ENV{'PBDIR'}" ; $vcscmd log | head -1 | cut -f2)`;
+        $tmp =~ s/^.* //;
+    }
     chomp($tmp);
-    $tmp =~ s/^.* //;
     $ENV{'PBREVISION'}=$tmp;
     $ENV{'PBCMSLOGFILE'}="git.log";