Changeset 1535 in ProjectBuilder

Timestamp:

May 13, 2012, 11:39:07 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Add git support in pb_vcs_up, pb_vcs_checkin and pb_vcs_add

Location:

devel

Files:

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

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

@@ -14 +14 @@
 
 use strict 'vars';
+use Carp 'confess';
 use Data::Dumper;
 use English;
@@ -397 +398 @@
 my $vcscmd = pb_vcs_cmd($scheme);
 
-if (($scheme =~ /^svn/) || ($scheme =~ /^cvs/) || ($scheme =~ /^svk/)) {
+if (($scheme =~ /^((svn)|(cvs)|(svk))/o) {
     pb_system("$vcscmd up ".join(' ',@dir),"Updating ".join(' ',@dir));
+} elsif ($scheme =~ /^((hg)|(git))/o) {
+    pb_system("(cd $dir && $vcscmd pull)", "Updating $dir ");
 } elsif (($scheme eq "flat") || ($scheme eq "ftp") || ($scheme eq "http"))   {
 } else {
@@ -420 +423 @@
 my $vcscmd = pb_vcs_cmd($scheme);
 
-if (($scheme =~ /^svn/) || ($scheme =~ /^cvs/) || ($scheme =~ /^svk/)) {
-    pb_system("cd $dir ; $vcscmd ci -m \"$msg\" .","Checking in $dir ");
+if (($scheme =~ /^((svn)|(cvs)|(svk))/o) {
+    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 ");
 } elsif (($scheme eq "flat") || ($scheme eq "ftp") || ($scheme eq "http"))   {
 } else {
@@ -442 +447 @@
 my $vcscmd = pb_vcs_cmd($scheme);
 
-if (($scheme =~ /^svn/) || ($scheme =~ /^cvs/) || ($scheme =~ /^svk/)) {
+if ($scheme =~ /^((hg)|(git)|(svn)|(svk)|(cvs))/o) {
     pb_system("$vcscmd add ".join(' ',@f),"Adding ".join(' ',@f)." to VCS ");
 } elsif (($scheme eq "flat") || ($scheme eq "ftp") || ($scheme eq "http"))   {
@@ -465 +470 @@
 my $l = undef;
 
-if (($scheme =~ /^svn/) || ($scheme =~ /^cvs/) || ($scheme =~ /^svk/)) {
+if (($scheme =~ /^((svn)|(cvs)|(svk))/o) {
     open(PIPE,"$vcscmd diff $dir |") || die "Unable to get $vcscmd diff from $dir";
     $l = 0;

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -13 +13 @@
 
 use strict 'vars';
+use Carp 'confess';
 use Data::Dumper;
 use English;