Allow passing of an alternative CVSROOT via -d.

This is necessary if using CVS in an asymmetric fashion, i.e. when the
CVSROOT you are checking out from differs from the CVSROOT you have to
commit to.

Signed-off-by: Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt
index 27d531b888ef0468022e2ec0780729acc5151147..555b8234f0ebfe99f5b59f9b5c71ee2569b4e347 100644 (file)
--- a/Documentation/git-cvsexportcommit.txt
+++ b/Documentation/git-cvsexportcommit.txt
@@ -8,7 +8,7 @@ git-cvsexportcommit - Export a single commit to a CVS checkout
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-cvsexportcommit' [-h] [-v] [-c] [-P] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
+'git-cvsexportcommit' [-h] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID

 
 
 DESCRIPTION
 
 
 DESCRIPTION


@@ -43,6 +43,11 @@ OPTIONS
        Add authorship information. Adds Author line, and Committer (if
        different from Author) to the message.
 
        Add authorship information. Adds Author line, and Committer (if
        different from Author) to the message.
 

+-d::
+       Set an alternative CVSROOT to use.  This corresponds to the CVS
+       -d parameter.  Usually users will not want to set this, except
+       if using CVS in an asymmetric fashion.
+

 -f::
        Force the merge even if the files are not up to date.
 
 -f::
        Force the merge even if the files are not up to date.
 

diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index 870554eade66d1744c561d4cba33c41dd7701e55..d08216cfd7df47310e6eee155520d600a561d467 100755 (executable)
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -15,14 +15,21 @@
     die "GIT_DIR is not defined or is unreadable";
 }
 
     die "GIT_DIR is not defined or is unreadable";
 }
 

-our ($opt_h, $opt_P, $opt_p, $opt_v, $opt_c, $opt_f, $opt_a, $opt_m );
+our ($opt_h, $opt_P, $opt_p, $opt_v, $opt_c, $opt_f, $opt_a, $opt_m, $opt_d);

 
 

-getopts('hPpvcfam:');
+getopts('hPpvcfam:d:');

 
 $opt_h && usage();
 
 die "Need at least one commit identifier!" unless @ARGV;
 
 
 $opt_h && usage();
 
 die "Need at least one commit identifier!" unless @ARGV;
 

+my @cvs;
+if ($opt_d) {
+       @cvs = ('cvs', '-d', $opt_d);
+} else {
+       @cvs = ('cvs');
+}
+

 # setup a tempdir
 our ($tmpdir, $tmpdirname) = tempdir('git-cvsapplycommit-XXXXXX',
                                     TMPDIR => 1,
 # setup a tempdir
 our ($tmpdir, $tmpdirname) = tempdir('git-cvsapplycommit-XXXXXX',
                                     TMPDIR => 1,


@@ -160,7 +167,7 @@
        my $p = $1;
        next if (grep { $_ eq $p } @dirs);
     }
        my $p = $1;
        next if (grep { $_ eq $p } @dirs);
     }

-    my @status = grep(m/^File/,  safe_pipe_capture('cvs', '-q', 'status' ,$f));
+    my @status = grep(m/^File/,  safe_pipe_capture(@cvs, '-q', 'status' ,$f));

     if (@status > 1) { warn 'Strange! cvs status returned more than one line?'};
     if (-d dirname $f and $status[0] !~ m/Status: Unknown$/
        and $status[0] !~ m/^File: no file /) {
     if (@status > 1) { warn 'Strange! cvs status returned more than one line?'};
     if (-d dirname $f and $status[0] !~ m/Status: Unknown$/
        and $status[0] !~ m/^File: no file /) {


@@ -173,7 +180,7 @@
 foreach my $f (@files) {
     next if grep { $_ eq $f } @afiles;
     # TODO:we need to handle removed in cvs
 foreach my $f (@files) {
     next if grep { $_ eq $f } @afiles;
     # TODO:we need to handle removed in cvs

-    my @status = grep(m/^File/,  safe_pipe_capture('cvs', '-q', 'status' ,$f));
+    my @status = grep(m/^File/,  safe_pipe_capture(@cvs, '-q', 'status' ,$f));

     if (@status > 1) { warn 'Strange! cvs status returned more than one line?'};
     unless ($status[0] =~ m/Status: Up-to-date$/) {
        $dirty = 1;
     if (@status > 1) { warn 'Strange! cvs status returned more than one line?'};
     unless ($status[0] =~ m/Status: Up-to-date$/) {
        $dirty = 1;


@@ -194,7 +201,7 @@
 print "Patch applied successfully. Adding new files and directories to CVS\n";
 my $dirtypatch = 0;
 foreach my $d (@dirs) {
 print "Patch applied successfully. Adding new files and directories to CVS\n";
 my $dirtypatch = 0;
 foreach my $d (@dirs) {

-    if (system('cvs','add',$d)) {
+    if (system(@cvs,'add',$d)) {

        $dirtypatch = 1;
        warn "Failed to cvs add directory $d -- you may need to do it manually";
     }
        $dirtypatch = 1;
        warn "Failed to cvs add directory $d -- you may need to do it manually";
     }


@@ -202,9 +209,9 @@
 
 foreach my $f (@afiles) {
     if (grep { $_ eq $f } @bfiles) {
 
 foreach my $f (@afiles) {
     if (grep { $_ eq $f } @bfiles) {

-      system('cvs', 'add','-kb',$f);
+      system(@cvs, 'add','-kb',$f);

     } else {
     } else {

-      system('cvs', 'add', $f);
+      system(@cvs, 'add', $f);

     }
     if ($?) {
        $dirtypatch = 1;
     }
     if ($?) {
        $dirtypatch = 1;


@@ -213,7 +220,7 @@
 }
 
 foreach my $f (@dfiles) {
 }
 
 foreach my $f (@dfiles) {

-    system('cvs', 'rm', '-f', $f);
+    system(@cvs, 'rm', '-f', $f);

     if ($?) {
        $dirtypatch = 1;
        warn "Failed to cvs rm -f $f -- you may need to do it manually";
     if ($?) {
        $dirtypatch = 1;
        warn "Failed to cvs rm -f $f -- you may need to do it manually";


@@ -223,7 +230,7 @@
 print "Commit to CVS\n";
 print "Patch title (first comment line): $title\n";
 my @commitfiles = map { unless (m/\s/) { '\''.$_.'\''; } else { $_; }; } (@files);
 print "Commit to CVS\n";
 print "Patch title (first comment line): $title\n";
 my @commitfiles = map { unless (m/\s/) { '\''.$_.'\''; } else { $_; }; } (@files);

-my $cmd = "cvs commit -F .msg @commitfiles";
+my $cmd = join(' ', @cvs)." commit -F .msg @commitfiles";

 
 if ($dirtypatch) {
     print "NOTE: One or more hunks failed to apply cleanly.\n";
 
 if ($dirtypatch) {
     print "NOTE: One or more hunks failed to apply cleanly.\n";


@@ -236,7 +243,7 @@
 
 if ($opt_c) {
     print "Autocommit\n  $cmd\n";
 
 if ($opt_c) {
     print "Autocommit\n  $cmd\n";

-    print safe_pipe_capture('cvs', 'commit', '-F', '.msg', @files);
+    print safe_pipe_capture(@cvs, 'commit', '-F', '.msg', @files);

     if ($?) {
        die "Exiting: The commit did not succeed";
     }
     if ($?) {
        die "Exiting: The commit did not succeed";
     }