Author: vsiveton
Date: Fri Aug 15 05:14:38 2008
New Revision: 686200
URL: http://svn.apache.org/viewvc?rev=686200&view=rev
Log:
o fixed checkstyle
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgConfig.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/update/HgUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepository.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgConfig.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgConfig.java?rev=686200&r1=686199&r2=686200&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgConfig.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgConfig.java
Fri Aug 15 05:14:38 2008
@@ -38,7 +38,7 @@
public class HgConfig
{
//Minimum version for the Hg SCM
- private static String HG_REQ = "0.9.2";
+ private static final String HG_REQ = "0.9.2";
// The string which indicates the beginning of the Mercurial line
private static final String HG_VERSION_TAG = "ercurial Distributed SCM
(version ";
@@ -103,7 +103,7 @@
* @param version2
* @return true if version2 is greater than version1
*/
- private static boolean CompareVersion( String version1, String version2 )
+ private static boolean compareVersion( String version1, String version2 )
{
int l1, l2, i;
String v1, v2;
@@ -143,17 +143,17 @@
private String versionStr = "NA";
- private String version_tag;
+ private String versionTag;
HgVersionConsumer( String version_tag )
{
super( new DefaultLog() );
- this.version_tag = version_tag;
+ this.versionTag = version_tag;
}
public void doConsume( ScmFileStatus status, String line )
{
- if ( line.startsWith( version_tag ) )
+ if ( line.startsWith( versionTag ) )
{
String[] elements = line.split( " " );
versionStr = elements[elements.length - 1].split( "\\)" )[0];
@@ -169,7 +169,7 @@
{
// build one number out of the whole version #
- return CompareVersion( version, versionStr );
+ return compareVersion( version, versionStr );
}
}
@@ -185,7 +185,7 @@
public String toString( File workingDir )
{
boolean hgOk = hgVersion.isVersionOk( HG_REQ );
- return "\n Your Hg installation seems to be " + getInstalledStr() +
"\n Hg version: " +
- hgVersion.getVersion() + ( hgOk ? " (OK)" : " (May be INVALID)" )
+ "\n";
+ return "\n Your Hg installation seems to be " + getInstalledStr() +
"\n Hg version: "
+ + hgVersion.getVersion() + ( hgOk ? " (OK)" : " (May be INVALID)"
) + "\n";
}
}
\ No newline at end of file
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java?rev=686200&r1=686199&r2=686200&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
Fri Aug 15 05:14:38 2008
@@ -77,18 +77,17 @@
/** [EMAIL PROTECTED] */
public ScmProviderRepository makeProviderScmRepository( String
scmSpecificUrl, char delimiter )
- throws ScmRepositoryException
- {
- HgUrlParserResult result = parseScmUrl( scmSpecificUrl );
-
- if ( result.messages.size() > 0 )
- {
- throw new ScmRepositoryException( "The scm url is invalid.",
result.messages );
- }
+ throws ScmRepositoryException
+ {
+ HgUrlParserResult result = parseScmUrl( scmSpecificUrl );
- return result.repository;
+ if ( result.messages.size() > 0 )
+ {
+ throw new ScmRepositoryException( "The scm url is invalid.",
result.messages );
}
+ return result.repository;
+ }
private HgUrlParserResult parseScmUrl( String scmSpecificUrl )
{
@@ -126,12 +125,17 @@
return result;
}
- } else {
- try {
+ }
+ else
+ {
+ try
+ {
- File file = new File(url);
+ File file = new File( url );
- } catch (Throwable e) {
+ }
+ catch ( Throwable e )
+ {
result.messages.add( "The filename provided is not valid" );
return result;
@@ -225,8 +229,7 @@
}
/** [EMAIL PROTECTED] */
- public TagScmResult tag( ScmProviderRepository repository, ScmFileSet
fileSet,
- CommandParameters parameters )
+ public TagScmResult tag( ScmProviderRepository repository, ScmFileSet
fileSet, CommandParameters parameters )
throws ScmException
{
HgTagCommand command = new HgTagCommand();
@@ -248,7 +251,8 @@
}
/** [EMAIL PROTECTED] */
- public RemoveScmResult remove( ScmProviderRepository repository,
ScmFileSet fileSet, CommandParameters parameters )
+ public RemoveScmResult remove( ScmProviderRepository repository,
ScmFileSet fileSet,
+ CommandParameters parameters )
throws ScmException
{
HgRemoveCommand command = new HgRemoveCommand();
@@ -259,7 +263,8 @@
}
/** [EMAIL PROTECTED] */
- public StatusScmResult status( ScmProviderRepository repository,
ScmFileSet fileSet, CommandParameters parameters )
+ public StatusScmResult status( ScmProviderRepository repository,
ScmFileSet fileSet,
+ CommandParameters parameters )
throws ScmException
{
HgStatusCommand command = new HgStatusCommand();
@@ -270,7 +275,8 @@
}
/** [EMAIL PROTECTED] */
- public UpdateScmResult update( ScmProviderRepository repository,
ScmFileSet fileSet, CommandParameters parameters )
+ public UpdateScmResult update( ScmProviderRepository repository,
ScmFileSet fileSet,
+ CommandParameters parameters )
throws ScmException
{
HgUpdateCommand command = new HgUpdateCommand();
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java?rev=686200&r1=686199&r2=686200&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
Fri Aug 15 05:14:38 2008
@@ -49,24 +49,24 @@
/**
* Map between command and its valid exit codes
*/
- private static final Map exitCodeMap = new HashMap();
+ private static final Map EXIT_CODE_MAP = new HashMap();
/**
* Default exit codes for entries not in exitCodeMap
*/
- private static final List defaultExitCodes = new ArrayList();
+ private static final List DEFAULT_EXIT_CODES = new ArrayList();
/** Setup exit codes*/
static
{
- defaultExitCodes.add( new Integer( 0 ) );
+ DEFAULT_EXIT_CODES.add( new Integer( 0 ) );
//Diff is different
List diffExitCodes = new ArrayList();
diffExitCodes.add( new Integer( 0 ) ); //No difference
diffExitCodes.add( new Integer( 1 ) ); //Conflicts in merge-like or
changes in diff-like
diffExitCodes.add( new Integer( 2 ) ); //Unrepresentable diff changes
- exitCodeMap.put( HgCommand.DIFF_CMD, diffExitCodes );
+ EXIT_CODE_MAP.put( HgCommand.DIFF_CMD, diffExitCodes );
}
public static ScmResult execute( HgConsumer consumer, ScmLogger logger,
File workingDir, String[] cmdAndArgs )
@@ -82,10 +82,10 @@
int exitCode = executeCmd( consumer, cmd );
//Return result
- List exitCodes = defaultExitCodes;
- if ( exitCodeMap.containsKey( cmdAndArgs[0] ) )
+ List exitCodes = DEFAULT_EXIT_CODES;
+ if ( EXIT_CODE_MAP.containsKey( cmdAndArgs[0] ) )
{
- exitCodes = (List) exitCodeMap.get( cmdAndArgs[0] );
+ exitCodes = (List) EXIT_CODE_MAP.get( cmdAndArgs[0] );
}
boolean success = exitCodes.contains( new Integer( exitCode ) );
@@ -94,9 +94,10 @@
if ( !success )
{
HgConfig config = new HgConfig( workingDir );
- providerMsg = "\nEXECUTION FAILED" + "\n Execution of cmd : "
+ cmdAndArgs[0] +
- " failed with exit code: " + exitCode + "." + "\n Working
directory was: " + "\n " +
- workingDir.getAbsolutePath() + config.toString( workingDir
) + "\n";
+ providerMsg =
+ "\nEXECUTION FAILED" + "\n Execution of cmd : " +
cmdAndArgs[0] + " failed with exit code: "
+ + exitCode + "." + "\n Working directory was: " + "\n
" + workingDir.getAbsolutePath()
+ + config.toString( workingDir ) + "\n";
logger.error( providerMsg );
}
@@ -104,8 +105,9 @@
}
catch ( ScmException se )
{
- String msg = "EXECUTION FAILED" + "\n Execution failed before
invoking the Hg command. Last exception:" +
- "\n " + se.getMessage();
+ String msg =
+ "EXECUTION FAILED" + "\n Execution failed before invoking the
Hg command. Last exception:"
+ + "\n " + se.getMessage();
//Add nested cause if any
if ( se.getCause() != null )
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommand.java?rev=686200&r1=686199&r2=686200&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommand.java
Fri Aug 15 05:14:38 2008
@@ -36,86 +36,86 @@
/**
* Executable for Hg
*/
- public static final String EXEC = "hg";
+ String EXEC = "hg";
/**
* Use to create an empty branch or before importing an existing project
*/
- public static final String INIT_CMD = "init";
+ String INIT_CMD = "init";
/**
* Default recursive. Common option: --dry-run and --no-recursive
*/
- public static final String ADD_CMD = "add";
+ String ADD_CMD = "add";
/**
* Reports the following states: added, removed, modified, unchanged,
unknown
*/
- public static final String STATUS_CMD = "status";
+ String STATUS_CMD = "status";
/**
* Make a file unversioned
*/
- public static final String REMOVE_CMD = "remove";
+ String REMOVE_CMD = "remove";
/**
* Create a new copy of a branch. Alias get or clone
*/
- public static final String BRANCH_CMD = "clone";
+ String BRANCH_CMD = "clone";
/**
* Commit changes into a new revision
*/
- public static final String COMMIT_CMD = "commit";
+ String COMMIT_CMD = "commit";
/**
* Pull any changes from another branch into the current one
*/
- public static final String PULL_CMD = "pull";
+ String PULL_CMD = "pull";
/**
* Show log of this branch Common option: --revision
*/
- public static final String LOG_CMD = "log";
+ String LOG_CMD = "log";
/**
* Show differences in workingtree. Common option: --revision
*/
- public static final String DIFF_CMD = "diff";
+ String DIFF_CMD = "diff";
/**
* Push this branch into another branch
*/
- public static final String PUSH_CMD = "push";
+ String PUSH_CMD = "push";
/**
* Show current revision number
*/
- public static final String REVNO_CMD = "id";
+ String REVNO_CMD = "id";
/**
* Tag this revision
*/
- public static final String TAG_CMD = "tag";
+ String TAG_CMD = "tag";
/**
* Show list of the current working copy or a revision
*/
- public static final String INVENTORY_CMD = "locate";
+ String INVENTORY_CMD = "locate";
/**
* no recurse option does not exist in mercurial
*/
- public static final String NO_RECURSE_OPTION = "";
+ String NO_RECURSE_OPTION = "";
- public static final String MESSAGE_OPTION = "--message";
+ String MESSAGE_OPTION = "--message";
- public static final String REVISION_OPTION = "-r";
+ String REVISION_OPTION = "-r";
- public static final String VERBOSE_OPTION = "--verbose";
+ String VERBOSE_OPTION = "--verbose";
- public static final String VERSION = "version";
+ String VERSION = "version";
- public static final String CHECK = "check";
+ String CHECK = "check";
String ALL_OPTION = "-A";
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgConsumer.java?rev=686200&r1=686199&r2=686200&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgConsumer.java
Fri Aug 15 05:14:38 2008
@@ -45,12 +45,12 @@
/**
* A list of known keywords from hg
*/
- private static final Map identifiers = new HashMap();
+ private static final Map IDENTIFIERS = new HashMap();
/**
* A list of known message prefixes from hg
*/
- private static final Map messages = new HashMap();
+ private static final Map MESSAGES = new HashMap();
/**
* Number of lines to keep from Std.Err
@@ -68,25 +68,25 @@
{
/** Statuses from hg add
*/
- identifiers.put( "adding", ScmFileStatus.ADDED );
- identifiers.put( "unknown", ScmFileStatus.UNKNOWN );
- identifiers.put( "modified", ScmFileStatus.MODIFIED );
- identifiers.put( "removed", ScmFileStatus.DELETED );
- identifiers.put( "renamed", ScmFileStatus.MODIFIED );
+ IDENTIFIERS.put( "adding", ScmFileStatus.ADDED );
+ IDENTIFIERS.put( "unknown", ScmFileStatus.UNKNOWN );
+ IDENTIFIERS.put( "modified", ScmFileStatus.MODIFIED );
+ IDENTIFIERS.put( "removed", ScmFileStatus.DELETED );
+ IDENTIFIERS.put( "renamed", ScmFileStatus.MODIFIED );
/** Statuses from hg status;
*/
- identifiers.put( "A", ScmFileStatus.ADDED );
- identifiers.put( "?", ScmFileStatus.UNKNOWN );
- identifiers.put( "M", ScmFileStatus.MODIFIED );
- identifiers.put( "R", ScmFileStatus.DELETED );
- identifiers.put( "C", ScmFileStatus.CHECKED_IN );
- identifiers.put( "!", ScmFileStatus.MISSING );
- identifiers.put( "I", ScmFileStatus.UNKNOWN ); // not precisely the
same, but i think semantics work? - rwd
-
- messages.put( "hg: WARNING:", "WARNING" );
- messages.put( "hg: ERROR:", "ERROR" );
- messages.put( "'hg' ", "ERROR" ); // hg isn't found in windows path
+ IDENTIFIERS.put( "A", ScmFileStatus.ADDED );
+ IDENTIFIERS.put( "?", ScmFileStatus.UNKNOWN );
+ IDENTIFIERS.put( "M", ScmFileStatus.MODIFIED );
+ IDENTIFIERS.put( "R", ScmFileStatus.DELETED );
+ IDENTIFIERS.put( "C", ScmFileStatus.CHECKED_IN );
+ IDENTIFIERS.put( "!", ScmFileStatus.MISSING );
+ IDENTIFIERS.put( "I", ScmFileStatus.UNKNOWN ); // not precisely the
same, but i think semantics work? - rwd
+
+ MESSAGES.put( "hg: WARNING:", "WARNING" );
+ MESSAGES.put( "hg: ERROR:", "ERROR" );
+ MESSAGES.put( "'hg' ", "ERROR" ); // hg isn't found in windows path
}
public HgConsumer( ScmLogger logger )
@@ -124,7 +124,7 @@
trimmedLine = trimmedLine.trim(); //one or more spaces
}
- ScmFileStatus status = statusStr != null ? ( (ScmFileStatus)
identifiers.get( statusStr.intern() ) ) : null;
+ ScmFileStatus status = statusStr != null ? ( (ScmFileStatus)
IDENTIFIERS.get( statusStr.intern() ) ) : null;
doConsume( status, trimmedLine );
}
@@ -146,7 +146,7 @@
private static String processInputForKnownIdentifiers( String line )
{
- for ( Iterator it = identifiers.keySet().iterator(); it.hasNext(); )
+ for ( Iterator it = IDENTIFIERS.keySet().iterator(); it.hasNext(); )
{
String id = (String) it.next();
if ( line.startsWith( id ) )
@@ -159,7 +159,7 @@
private boolean processInputForKnownMessages( String line )
{
- for ( Iterator it = messages.keySet().iterator(); it.hasNext(); )
+ for ( Iterator it = MESSAGES.keySet().iterator(); it.hasNext(); )
{
String prefix = (String) it.next();
if ( line.startsWith( prefix ) )
@@ -170,7 +170,7 @@
stderr.remove( 0 ); //Rotate list
}
String message = line.substring( prefix.length() );
- if ( messages.get( prefix ).equals( "WARNING" ) )
+ if ( MESSAGES.get( prefix ).equals( "WARNING" ) )
{
getLogger().warn( message );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java?rev=686200&r1=686199&r2=686200&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
Fri Aug 15 05:14:38 2008
@@ -56,8 +56,8 @@
List logEntries = consumer.getModifications();
List inRangeAndValid = new ArrayList();
- startDate = startDate == null ? new Date( 0 ) : startDate;//From 1.
Jan 1970
- endDate = endDate == null ? new Date() : endDate;//Upto now
+ startDate = startDate == null ? new Date( 0 ) : startDate; // From 1.
Jan 1970
+ endDate = endDate == null ? new Date() : endDate; // Upto now
for ( Iterator it = logEntries.iterator(); it.hasNext(); )
{
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java?rev=686200&r1=686199&r2=686200&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/checkout/HgCheckOutCommand.java
Fri Aug 15 05:14:38 2008
@@ -64,16 +64,16 @@
}
// Do the actual checkout
- String[] checkout_cmd = new String[]{BRANCH_CMD, REVISION_OPTION,
+ String[] checkoutCmd = new String[]{BRANCH_CMD, REVISION_OPTION,
scmVersion != null && !StringUtils.isEmpty( scmVersion.getName() )
? scmVersion.getName() : "tip", url,
checkoutDir.getAbsolutePath()};
- HgConsumer checkout_consumer = new HgConsumer( getLogger() );
- HgUtils.execute( checkout_consumer, getLogger(),
checkoutDir.getParentFile(), checkout_cmd );
+ HgConsumer checkoutConsumer = new HgConsumer( getLogger() );
+ HgUtils.execute( checkoutConsumer, getLogger(),
checkoutDir.getParentFile(), checkoutCmd );
// Do inventory to find list of checkedout files
- String[] inventory_cmd = new String[]{INVENTORY_CMD};
+ String[] inventoryCmd = new String[]{INVENTORY_CMD};
HgCheckOutConsumer consumer = new HgCheckOutConsumer( getLogger(),
checkoutDir );
- ScmResult result = HgUtils.execute( consumer, getLogger(),
checkoutDir, inventory_cmd );
+ ScmResult result = HgUtils.execute( consumer, getLogger(),
checkoutDir, inventoryCmd );
return new CheckOutScmResult( consumer.getCheckedOutFiles(), result );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommand.java?rev=686200&r1=686199&r2=686200&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffCommand.java
Fri Aug 15 05:14:38 2008
@@ -1,19 +1,22 @@
package org.apache.maven.scm.provider.hg.command.diff;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.maven.scm.ScmException;
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffConsumer.java?rev=686200&r1=686199&r2=686200&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/diff/HgDiffConsumer.java
Fri Aug 15 05:14:38 2008
@@ -127,9 +127,9 @@
// skip, though could parse to verify filename, end revision
patch.append( line ).append( "\n" );
}
- else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith(
REMOVED_LINE_TOKEN ) ||
- line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith(
CHANGE_SEPARATOR_TOKEN ) ||
- line.equals( NO_NEWLINE_TOKEN ) )
+ else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith(
REMOVED_LINE_TOKEN )
+ || line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith(
CHANGE_SEPARATOR_TOKEN )
+ || line.equals( NO_NEWLINE_TOKEN ) )
{
// add to buffer
currentDifference.append( line ).append( "\n" );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListCommand.java?rev=686200&r1=686199&r2=686200&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListCommand.java
Fri Aug 15 05:14:38 2008
@@ -1,14 +1,5 @@
package org.apache.maven.scm.provider.hg.command.inventory;
-import org.apache.maven.scm.provider.hg.command.HgCommand;
-import org.apache.maven.scm.provider.hg.HgUtils;
-import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.command.list.AbstractListCommand;
-import org.apache.maven.scm.command.list.ListScmResult;
-import org.apache.maven.scm.*;
-
-import java.io.File;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -28,17 +19,33 @@
* under the License.
*/
+import java.io.File;
+
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.ScmVersion;
+import org.apache.maven.scm.command.list.AbstractListCommand;
+import org.apache.maven.scm.command.list.ListScmResult;
+import org.apache.maven.scm.provider.ScmProviderRepository;
+import org.apache.maven.scm.provider.hg.HgUtils;
+import org.apache.maven.scm.provider.hg.command.HgCommand;
+
/**
* Get a list of all files in the repository
*
* @author <a href="mailto:[EMAIL PROTECTED]">ryan daum</a>
* @version $Id$
*/
-public class HgListCommand extends AbstractListCommand
- implements HgCommand
+public class HgListCommand
+ extends AbstractListCommand
+ implements HgCommand
{
/** [EMAIL PROTECTED] */
- protected ListScmResult executeListCommand(ScmProviderRepository
repository, ScmFileSet fileSet, boolean recursive, ScmVersion scmVersion)
throws ScmException {
+ protected ListScmResult executeListCommand( ScmProviderRepository
repository, ScmFileSet fileSet,
+ boolean recursive, ScmVersion
scmVersion )
+ throws ScmException
+ {
if ( fileSet.getFiles().length != 0 )
{
@@ -47,25 +54,29 @@
//
File workingDir = fileSet.getBasedir();
- // build the command
- String[] listCmd = new String[]{STATUS_CMD, ALL_OPTION};
+ // build the command
+ String[] listCmd = new String[] { STATUS_CMD, ALL_OPTION };
// keep the command about in string form for reporting
StringBuffer cmd = new StringBuffer();
- for (int i = 0; i < listCmd.length; i++) {
+ for ( int i = 0; i < listCmd.length; i++ )
+ {
String s = listCmd[i];
- cmd.append(s);
- if (i < listCmd.length - 1)
- cmd.append(" ");
+ cmd.append( s );
+ if ( i < listCmd.length - 1 )
+ cmd.append( " " );
}
HgListConsumer consumer = new HgListConsumer( getLogger() );
- ScmResult result = HgUtils.execute( consumer, getLogger(), workingDir,
listCmd);
+ ScmResult result = HgUtils.execute( consumer, getLogger(), workingDir,
listCmd );
- if (result.isSuccess()) {
- return new ListScmResult(consumer.getFiles(), result);
- } else {
+ if ( result.isSuccess() )
+ {
+ return new ListScmResult( consumer.getFiles(), result );
+ }
+ else
+ {
throw new ScmException( "Error while executing command " +
cmd.toString() );
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListConsumer.java?rev=686200&r1=686199&r2=686200&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgListConsumer.java
Fri Aug 15 05:14:38 2008
@@ -1,13 +1,5 @@
package org.apache.maven.scm.provider.hg.command.inventory;
-import org.apache.maven.scm.provider.hg.command.HgConsumer;
-import org.apache.maven.scm.log.ScmLogger;
-import org.apache.maven.scm.ScmFileStatus;
-import org.apache.maven.scm.ScmFile;
-
-import java.util.List;
-import java.util.ArrayList;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -27,13 +19,23 @@
* under the License.
*/
+import org.apache.maven.scm.provider.hg.command.HgConsumer;
+import org.apache.maven.scm.log.ScmLogger;
+import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.ScmFile;
+
+import java.util.List;
+import java.util.ArrayList;
+
/**
* Get a list of all files in the repository
*
* @author <a href="mailto:[EMAIL PROTECTED]">ryan daum</a>
* @version $Id$
*/
-public class HgListConsumer extends HgConsumer {
+public class HgListConsumer
+ extends HgConsumer
+{
private List files = new ArrayList();
@@ -45,10 +47,11 @@
/** [EMAIL PROTECTED] */
public void doConsume( ScmFileStatus status, String trimmedLine )
{
- files.add(new ScmFile(trimmedLine, status));
+ files.add( new ScmFile( trimmedLine, status ) );
}
- public List getFiles() {
+ public List getFiles()
+ {
return files;
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java?rev=686200&r1=686199&r2=686200&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java
Fri Aug 15 05:14:38 2008
@@ -19,22 +19,26 @@
* under the License.
*/
-import org.apache.maven.scm.*;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.command.tag.AbstractTagCommand;
import org.apache.maven.scm.command.tag.TagScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.hg.HgUtils;
-import org.apache.maven.scm.provider.hg.repository.HgScmProviderRepository;
import org.apache.maven.scm.provider.hg.command.HgCommand;
import org.apache.maven.scm.provider.hg.command.HgConsumer;
import org.apache.maven.scm.provider.hg.command.inventory.HgListConsumer;
+import org.apache.maven.scm.provider.hg.repository.HgScmProviderRepository;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
-
/**
* Tag
*
@@ -42,11 +46,14 @@
* @version $Id$
*/
public class HgTagCommand
- extends AbstractTagCommand
- implements HgCommand
+ extends AbstractTagCommand
+ implements HgCommand
{
/** [EMAIL PROTECTED] */
- protected ScmResult executeTagCommand(ScmProviderRepository
scmProviderRepository, ScmFileSet fileSet, String tag, String message) throws
ScmException {
+ protected ScmResult executeTagCommand( ScmProviderRepository
scmProviderRepository, ScmFileSet fileSet,
+ String tag, String message )
+ throws ScmException
+ {
if ( tag == null || StringUtils.isEmpty( tag.trim() ) )
{
@@ -60,56 +67,64 @@
File workingDir = fileSet.getBasedir();
-
// build the command
- String[] tagCmd = new String[]{TAG_CMD, MESSAGE_OPTION, message, tag };
+ String[] tagCmd = new String[] { TAG_CMD, MESSAGE_OPTION, message, tag
};
// keep the command about in string form for reporting
- StringBuffer cmd = joinCmd(tagCmd);
+ StringBuffer cmd = joinCmd( tagCmd );
HgTagConsumer consumer = new HgTagConsumer( getLogger() );
- ScmResult result = HgUtils.execute( consumer, getLogger(), workingDir,
tagCmd);
+ ScmResult result = HgUtils.execute( consumer, getLogger(), workingDir,
tagCmd );
HgScmProviderRepository repository = (HgScmProviderRepository)
scmProviderRepository;
- if (result.isSuccess()) {
+ if ( result.isSuccess() )
+ {
// now push
// Push to parent branch if any
if ( !repository.getURI().equals(
fileSet.getBasedir().getAbsolutePath() ) )
{
- String[] push_cmd = new String[]{HgCommand.PUSH_CMD,
repository.getURI()};
- result = HgUtils.execute( new HgConsumer( getLogger() ),
getLogger(), fileSet.getBasedir(), push_cmd );
+ String[] pushCmd = new String[] { HgCommand.PUSH_CMD,
repository.getURI() };
+ result =
+ HgUtils.execute( new HgConsumer( getLogger() ),
getLogger(), fileSet.getBasedir(), pushCmd );
}
- } else {
+ }
+ else
+ {
throw new ScmException( "Error while executing command " +
cmd.toString() );
}
// do an inventory to return the files tagged (all of them)
- String[] list_cmd = new String[]{HgCommand.INVENTORY_CMD};
- HgListConsumer listconsumer = new HgListConsumer(getLogger());
- result = HgUtils.execute(listconsumer, getLogger(),
fileSet.getBasedir(), list_cmd);
- if (result.isSuccess()) {
+ String[] listCmd = new String[] { HgCommand.INVENTORY_CMD };
+ HgListConsumer listconsumer = new HgListConsumer( getLogger() );
+ result = HgUtils.execute( listconsumer, getLogger(),
fileSet.getBasedir(), listCmd );
+ if ( result.isSuccess() )
+ {
List files = listconsumer.getFiles();
ArrayList fileList = new ArrayList();
for ( Iterator i = files.iterator(); i.hasNext(); )
{
ScmFile f = (ScmFile) i.next();
- if (!f.getPath().endsWith(".hgtags"))
+ if ( !f.getPath().endsWith( ".hgtags" ) )
fileList.add( new ScmFile( f.getPath(),
ScmFileStatus.TAGGED ) );
}
- return new TagScmResult(fileList, result);
- } else {
+ return new TagScmResult( fileList, result );
+ }
+ else
+ {
throw new ScmException( "Error while executing command " +
cmd.toString() );
}
}
- private StringBuffer joinCmd(String[] cmd) {
+ private StringBuffer joinCmd( String[] cmd )
+ {
StringBuffer result = new StringBuffer();
- for (int i = 0; i < cmd.length; i++) {
+ for ( int i = 0; i < cmd.length; i++ )
+ {
String s = cmd[i];
- result.append(s);
- if (i < cmd.length - 1)
- result.append(" ");
+ result.append( s );
+ if ( i < cmd.length - 1 )
+ result.append( " " );
}
return result;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/update/HgUpdateCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/update/HgUpdateCommand.java?rev=686200&r1=686199&r2=686200&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/update/HgUpdateCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/update/HgUpdateCommand.java
Fri Aug 15 05:14:38 2008
@@ -58,9 +58,9 @@
File workingDir = fileSet.getBasedir();
// Update branch
- String[] update_cmd = new String[]{HgCommand.PULL_CMD, REVISION_OPTION,
+ String[] updateCmd = new String[]{HgCommand.PULL_CMD, REVISION_OPTION,
tag != null && !StringUtils.isEmpty( tag.getName() ) ?
tag.getName() : "tip"};
- ScmResult updateResult = HgUtils.execute( new HgConsumer( getLogger()
), getLogger(), workingDir, update_cmd );
+ ScmResult updateResult = HgUtils.execute( new HgConsumer( getLogger()
), getLogger(), workingDir, updateCmd );
if ( !updateResult.isSuccess() )
{
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepository.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepository.java?rev=686200&r1=686199&r2=686200&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepository.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/repository/HgScmProviderRepository.java
Fri Aug 15 05:14:38 2008
@@ -59,8 +59,8 @@
public String getURI()
{
- return protocol + ( needsAuthentication() ? addUser() + addPassword()
+ addAt() : "" ) + addHost() + addPort() +
- addPath();
+ return protocol + ( needsAuthentication() ? addUser() + addPassword()
+ addAt() : "" ) + addHost()
+ + addPort() + addPath();
}
/**
@@ -94,8 +94,9 @@
if ( msg != null )
{
- msg = "Something could be wrong about the repository URL: " +
orgUrl + "\nReason: " + msg +
- "\nCheck http://maven.apache.org/scm for usage and hints.";
+ msg =
+ "Something could be wrong about the repository URL: " + orgUrl
+ "\nReason: " + msg
+ + "\nCheck http://maven.apache.org/scm for usage and
hints.";
}
return msg;
}
@@ -258,7 +259,8 @@
/** [EMAIL PROTECTED] */
public String toString()
{
- return "Hg Repository Interpreted from: " + orgUrl + ":\nProtocol: " +
protocol + "\nHost: " + getHost() +
- "\nPort: " + getPort() + "\nUsername: " + getUser() + "\nPassword:
" + getPassword() + "\nPath: " + path;
+ return "Hg Repository Interpreted from: " + orgUrl + ":\nProtocol: " +
protocol + "\nHost: " + getHost()
+ + "\nPort: " + getPort() + "\nUsername: " + getUser() +
"\nPassword: " + getPassword() + "\nPath: "
+ + path;
}
}
