Changeset 1302 in ProjectBuilder

Timestamp:

May 18, 2011, 6:53:12 PM (13 years ago)

Author:

Bruno Cornec

Message:

devel/svk-commitnUF8h.tmp

File:

• devel/pb/lib/ProjectBuilder/CMS.pm (modified) (5 diffs)

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -488 +488 @@
 my $vcscmd = pb_cms_cmd($scheme);
 
-if (($scheme =~ /^svn/) || ($scheme =~ /^svk/) || ($scheme =~ /^hg/) || ($scheme =~ /^git/) || ($scheme =~ /^cvs/)) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^cvs/) || ($scheme =~ /^svk/)) {
     pb_system("$vcscmd up $dir","Updating $dir ");
 } elsif (($scheme eq "flat") || ($scheme eq "ftp") || ($scheme eq "http"))   {
@@ -515 +515 @@
 $msg = "Project $ENV{PBPROJ} creation" if (defined $pbinit);
 
-if (($scheme =~ /^svn/) || ($scheme =~ /^svk/) || ($scheme =~ /^hg/) || ($scheme =~ /^git/) || ($scheme =~ /^cvs/)) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^cvs/) || ($scheme =~ /^svk/)) {
     pb_system("cd $dir ; $vcscmd ci -m \"$msg\" .","Checking in $dir ");
 } elsif (($scheme eq "flat") || ($scheme eq "ftp") || ($scheme eq "http"))   {
@@ -537 +537 @@
 my $vcscmd = pb_cms_cmd($scheme);
 
-if (($scheme =~ /^svn/) || ($scheme =~ /^svk/) || ($scheme =~ /^hg/) || ($scheme =~ /^git/) || ($scheme =~ /^cvs/)) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^cvs/) || ($scheme =~ /^svk/)) {
     pb_system("$vcscmd add $f","Adding $f to VCS ");
 } elsif (($scheme eq "flat") || ($scheme eq "ftp") || ($scheme eq "http"))   {
@@ -560 +560 @@
 my $l = undef;
 
-if (($scheme =~ /^svn/) || ($scheme =~ /^svk/) || ($scheme =~ /^hg/) || ($scheme =~ /^git/) || ($scheme =~ /^cvs/)) {
+if (($scheme =~ /^svn/) || ($scheme =~ /^cvs/) || ($scheme =~ /^svk/)) {
     open(PIPE,"$vcscmd diff $dir |") || die "Unable to get $vcscmd diff from $dir";
     $l = 0;
@@ -715 +715 @@
     # which needs it to trigger correct behaviour
     $uri =~ s/^svk://;
-    if ($cmsurl ne $uri) {
+    if (($scheme2 =~ /^git/) || ($scheme2 =~ /^hg/)) {
+        # These VCS manages branches internally not with different tree structures
+        # Assuming it's correct for now.
+    } elsif ($cmsurl ne $uri) {
         # The local content doesn't correpond to the repository
         pb_log(0,"ERROR: Inconsistency detected:\n");