Changeset 2022 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/VCS.pm
- Timestamp:
- Dec 6, 2015, 3:46:51 AM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/VCS.pm
r1958 r2022 447 447 } elsif ($scheme =~ /^((hg)|(git))/o) { 448 448 foreach my $d (@dir) { 449 pb_system("(cd $d && $vcscmd pull)", "Updating $d ");449 pb_system("(cd $d && $vcscmd fetch)", "Updating $d "); 450 450 } 451 451 } elsif ($scheme =~ /^(flat)|(ftp)|(http)|(file)\b/o) { … … 545 545 my $l = undef; 546 546 547 if ($scheme =~ /^((svn)|(cvs)|(svk) )/o) {547 if ($scheme =~ /^((svn)|(cvs)|(svk)|(git))/o) { 548 548 open(PIPE,"$vcscmd diff $dir |") || confess "Unable to get $vcscmd diff from $dir"; 549 549 $l = 0; … … 685 685 # Either we have a version in the uri, and it should be the same 686 686 # as the one in the envar. Or we should add the version to the uri 687 # #But not if it's git as it manages version branches internally687 # But not if it's git as it manages version branches internally 688 688 if ((basename($uri) ne basename($ENV{$envar})) && ($scheme !~ /^git/)) { 689 689 $uri .= "/".basename($ENV{$envar}) … … 704 704 # remove schema from `git+file:` and `git+dir:` urls 705 705 # TODO: handle query-parameters 706 $uri =~ s/^git\+(file|dir )://;706 $uri =~ s/^git\+(file|dir|ssh):[\/]*//; 707 707 # Expand potential env variable in it -- this is required due to the consistency check 708 708 $uri =~ s/(\$ENV.+\})/$1/eeg;
Note:
See TracChangeset
for help on using the changeset viewer.