Author: olamy
Date: Tue Jun 8 21:39:49 2010
New Revision: 952830
URL: http://svn.apache.org/viewvc?rev=952830&view=rev
Log:
[SCM-521] Please add support for optional push / merge to the bazaar provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/tag/BazaarTagCommand.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java?rev=952830&r1=952829&r2=952830&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/checkin/BazaarCheckInCommand.java
Tue Jun 8 21:39:49 2010
@@ -95,7 +95,7 @@ public class BazaarCheckInCommand
// Push to parent branch if any
BazaarScmProviderRepository repository = (BazaarScmProviderRepository)
repo;
- if ( !repository.getURI().equals(
fileSet.getBasedir().getAbsolutePath() ) )
+ if ( !repository.getURI().equals(
fileSet.getBasedir().getAbsolutePath() ) && repo.isPushChanges() )
{
String[] pushCmd = new String[] { BazaarConstants.PUSH_CMD,
BazaarConstants.NO_STRICT_OPTION, repository.getURI() };
result =
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/tag/BazaarTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/tag/BazaarTagCommand.java?rev=952830&r1=952829&r2=952830&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/tag/BazaarTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/tag/BazaarTagCommand.java
Tue Jun 8 21:39:49 2010
@@ -77,7 +77,7 @@ public class BazaarTagCommand extends Ab
// Push new tags to parent branch if any
BazaarScmProviderRepository bazaarRepository =
(BazaarScmProviderRepository) repository;
- if ( !bazaarRepository.getURI().equals(
fileSet.getBasedir().getAbsolutePath() ) )
+ if ( !bazaarRepository.getURI().equals(
fileSet.getBasedir().getAbsolutePath() ) && repository.isPushChanges() )
{
String[] pushCmd = new String[] { BazaarConstants.PUSH_CMD,
bazaarRepository.getURI() };
ScmResult pushResult =
