maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tryg...@apache.org
Subject cvs commit: maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkout SvnCheckOutCommand.java
Date Sun, 12 Dec 2004 22:33:53 GMT
trygvis     2004/12/12 14:33:53

  Modified:    maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkout
                        SvnCheckOutCommand.java
  Log:
  o Making sure the output directory can be controlled.
  
  Revision  Changes    Path
  1.4       +6 -6      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutCommand.java
  
  Index: SvnCheckOutCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutCommand.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SvnCheckOutCommand.java	9 Nov 2004 16:07:17 -0000	1.3
  +++ SvnCheckOutCommand.java	12 Dec 2004 22:33:53 -0000	1.4
  @@ -42,7 +42,7 @@
       {
           Commandline cl = createCommandLine( (SvnScmProviderRepository)repo, workingDirectory,
tag );
   
  -        SvnCheckOutConsumer consumer = new SvnCheckOutConsumer( getLogger(), workingDirectory
);
  +        SvnCheckOutConsumer consumer = new SvnCheckOutConsumer( getLogger(), workingDirectory.getParentFile()
);
   
           CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
   
  @@ -62,7 +62,7 @@
   
           if ( exitCode != 0 )
           {
  -            return new CheckOutScmResult( "The cvs command failed.", stderr.getOutput(),
false );
  +            return new CheckOutScmResult( "The svn command failed.", stderr.getOutput(),
false );
           }
   
           return new CheckOutScmResult( consumer.getCheckedOutFiles() );
  @@ -78,14 +78,12 @@
   
           cl.setExecutable( "svn" );
   
  -        cl.setWorkingDirectory( workingDirectory.getAbsolutePath() );
  +        cl.setWorkingDirectory( workingDirectory.getParentFile().getAbsolutePath() );
   
           cl.createArgument().setValue( "checkout" );
   
           cl.createArgument().setValue( "--non-interactive" );
   
  -//        cl.createArgument().setValue( "-q" );
  -
           if ( tag != null)
           {
               cl.createArgument().setValue( "-r" );
  @@ -108,6 +106,8 @@
           }
   
           cl.createArgument().setValue( repository.getUrl() );
  +
  +        cl.createArgument().setValue( workingDirectory.getName() );
   
           return cl;
       }
  
  
  

Mime
View raw message