Changeset 2265


Ignore:
Timestamp:
Aug 30, 2017, 5:07:46 PM (3 months ago)
Author:
bruno
Message:

Fix git+svn usage for vcs_add and checkin

File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/VCS.pm

    r2254 r2265  
    481481    pb_system("cd $dir && $vcscmd ci -m \"$msg\" .","Checking in $dir ");
    482482} elsif ($scheme =~ /^git/) {
    483     pb_system("cd $dir && $vcscmd commit -a -m \"$msg\"", "Checking in $dir ");
     483    pb_system("cd $dir && git commit -a -m \"$msg\"", "Checking in $dir ");
    484484} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) {
    485485    # Nothing to do.
     
    529529
    530530if ($scheme =~ /^((hg)|(git)|(svn)|(svk)|(cvs))/o) {
     531    $vcscmd =~ s/ svn// if (($scheme =~ /git/) && ($scheme =~ /svn/));
    531532    pb_system("$vcscmd add ".join(' ',@f),"Adding ".join(' ',@f)." to VCS ");
    532533} elsif ($scheme =~ /^(flat)|(ftp)|(http)|(https)|(file)\b/o) {
     
    553554
    554555if ($scheme =~ /^((svn)|(cvs)|(svk)|(git))/o) {
     556    $vcscmd =~ s/ svn// if (($scheme =~ /git/) && ($scheme =~ /svn/));
    555557    open(PIPE,"$vcscmd diff $dir |") || confess "Unable to get $vcscmd diff from $dir";
    556558    $l = 0;
Note: See TracChangeset for help on using the changeset viewer.