Changeset 612 in ProjectBuilder for devel/pb/lib

Timestamp:

Nov 20, 2008, 8:22:22 PM (16 years ago)

Author:

Bruno Cornec

Message:

Adds Mercurial support in CMS.pm

File:

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

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -83 +83 @@
 pb_cms_compliant(undef,'PBDIR',"$ENV{'PBPROJDIR'}/$tmp",$pburl->{$ENV{'PBPROJ'}},$pbinit);
 
-if ($scheme =~ /^svn/) {
+if ($scheme =~ /^hg/) {
     # svnversion more precise than svn info
+    $tmp = `(cd "$ENV{'PBDIR'}" ; hg identify )`;
+    chomp($tmp);
+    $tmp =~ s/^.* //;
+    $ENV{'PBREVISION'}=$tmp;
+    $ENV{'PBCMSLOGFILE'}="hg.log";
+} elsif (($scheme eq "file") || ($scheme eq "ftp") || ($scheme eq "http")) {
+    $ENV{'PBREVISION'}="flat";
+    $ENV{'PBCMSLOGFILE'}="flat.log";
+} elsif ($scheme =~ /^svn/) {
     $tmp = `(cd "$ENV{'PBDIR'}" ; svnversion .)`;
     chomp($tmp);
     $ENV{'PBREVISION'}=$tmp;
     $ENV{'PBCMSLOGFILE'}="svn.log";
-} elsif (($scheme eq "file") || ($scheme eq "ftp") || ($scheme eq "http")) {
-    $ENV{'PBREVISION'}="flat";
-    $ENV{'PBCMSLOGFILE'}="flat.log";
 } elsif ($scheme =~ /^cvs/) {
     # Way too slow
@@ -194 +200 @@
         copy($path,$destdir);
     }
+} elsif ($scheme =~ /^hg/) {
+    if (defined $source) {
+        if (-d $source) {
+            $tmp = $destdir;
+        } else {
+            $tmp = "$destdir/".basename($source);
+        }
+        $source = pb_cms_mod_hg_http($source);
+        pb_system("hg export $source $tmp","Exporting $source from Mercurial to $tmp ");
+    } else {
+        $uri = pb_cms_mod_hg_http($uri);
+        pb_system("hg export $uri $destdir","Exporting $uri from Mercurial to $destdir ");
+    }
 } elsif ($scheme =~ /^cvs/) {
     # CVS needs a relative path !
@@ -245 +264 @@
     $res =~ s/^\s*//;
     close(PIPE);
+    chomp($res);
+} elsif ($scheme =~ /^hg/) {
+    open(HGRC,".hg/hgrc/") || return("");
+    while (<HGRC>) {
+        ($void,$res) = split(/^default.*=/) if (/^default.*=/);
+    }
+    close(HGRC);
     chomp($res);
 } elsif ($scheme =~ /^cvs/) {
@@ -284 +310 @@
 The third parameter is the URL of the destination CMS content.
 
-Only coded for SVN now.
+Only coded for SVN now as used for pbconf itself not the project
 
 =cut
@@ -321 +347 @@
     $url = pb_cms_mod_svn_http($url);
     pb_system("svn co $url $destination","Checking out $url to $destination ");
+} elsif ($scheme =~ /^hg/) {
+    $url = pb_cms_mod_hg_http($url);
+    pb_system("hg clone $url $destination","Checking out $url to $destination ");
 } elsif (($scheme eq "ftp") || ($scheme eq "http")) {
     return;
@@ -361 +390 @@
     pb_system("svn up $dir","Updating $dir ");
 } elsif ($scheme eq "flat") {
+} elsif ($scheme =~ /^hg/) {
+    pb_system("cd $dir ; hg up","Updating $dir ");
 } elsif ($scheme =~ /^cvs/) {
     pb_system("cvs up $dir","Updating $dir ");
@@ -389 +420 @@
     pb_system("svn ci -m \"$msg\" $dir","Checking in $dir ");
 } elsif ($scheme eq "flat") {
+} elsif ($scheme =~ /^hg/) {
+    pb_system("hg ci -m \"$msg\" $dir","Checking in $dir ");
 } elsif ($scheme =~ /^cvs/) {
     pb_system("cvs ci -m \"$msg\" $dir","Checking in $dir ");
@@ -412 +445 @@
     pb_system("svn add $f","Adding $f to SVN ");
 } elsif ($scheme eq "flat") {
+} elsif ($scheme =~ /^hg/) {
+    pb_system("hg add $f","Adding $f to Mercurial ");
 } elsif ($scheme =~ /^cvs/) {
     pb_system("cvs add $f","Adding $f to CVS ");
@@ -434 +469 @@
 if ($scheme =~ /^svn/) {
     open(PIPE,"svn diff $dir |") || die "Unable to get svn diff from $dir";
+    my $l = 0;
+    while (<PIPE>) {
+        $l++;
+    }
+    return($l);
+} elsif ($scheme =~ /^hg/) {
+    open(PIPE,"hg diff $dir |") || die "Unable to get hg diff from $dir";
     my $l = 0;
     while (<PIPE>) {
@@ -570 +612 @@
         pb_cms_checkout($scheme,$uri,$ENV{$envar});
     }
-} elsif (($scheme !~ /^cvs/) || ($scheme !~ /^svn/)) {
+} elsif (($scheme !~ /^cvs/) || ($scheme !~ /^svn/)  || ($scheme !~ /^hg/)) {
     # Do not compare if it's not a real cms
     return;
@@ -690 +732 @@
         }
     }
+} elsif ($scheme =~ /^hg/) {
+    if (! -f "$dest/ChangeLog") {
+        # In case we have no network, just create an empty one before to allow correct build
+        open(CL,"> $dest/ChangeLog") || die "Unable to create $dest/ChangeLog";
+        close(CL);
+        pb_system("hg log -v $pkgdir > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from SVN");
+        }
+    }
 } elsif (($scheme eq "file") || ($scheme eq "dir") || ($scheme eq "http") || ($scheme eq "ftp")) {
     if (! -f "$dest/ChangeLog") {
@@ -721 +771 @@
 }
 
+sub pb_cms_mod_hg_http {
+
+my $url = shift;
+
+$url =~ s/^hg\+(http[s]*):/$1:/;
+return($url);
+}
+
 =back