Changeset 2022 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/VCS.pm

Timestamp:

Dec 6, 2015, 3:46:51 AM (8 years ago)

Author:

Bruno Cornec

Message:

• Improve git support where pbconf is upstream in the main directory of a simple project

File:

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

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

@@ -447 +447 @@
 } elsif ($scheme =~ /^((hg)|(git))/o) {
     foreach my $d (@dir) {
-        pb_system("(cd $d && $vcscmd pull)", "Updating $d ");
+        pb_system("(cd $d && $vcscmd fetch)", "Updating $d ");
     }
 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o) {
@@ -545 +545 @@
 my $l = undef;
 
-if ($scheme =~ /^((svn)|(cvs)|(svk))/o) {
+if ($scheme =~ /^((svn)|(cvs)|(svk)|(git))/o) {
     open(PIPE,"$vcscmd diff $dir |") || confess "Unable to get $vcscmd diff from $dir";
     $l = 0;
@@ -685 +685 @@
     # Either we have a version in the uri, and it should be the same
     # as the one in the envar. Or we should add the version to the uri
-    # # But not if it's git as it manages version branches internally
+    # But not if it's git as it manages version branches internally
     if ((basename($uri) ne basename($ENV{$envar})) && ($scheme !~ /^git/)) {
         $uri .= "/".basename($ENV{$envar})
@@ -704 +704 @@
         # remove schema from `git+file:` and `git+dir:` urls
         # TODO: handle query-parameters
-        $uri =~ s/^git\+(file|dir)://;
+        $uri =~ s/^git\+(file|dir|ssh):[\/]*//;
         # Expand potential env variable in it -- this is required due to the consistency check
         $uri =~ s/(\$ENV.+\})/$1/eeg;