You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/05/22 08:00:03 UTC
[maven-scm] branch maven-scm-1.x updated (92a09124c -> bf86295f0)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch maven-scm-1.x
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
from 92a09124c [SCM-913] NPE on ChangeSet.toString() when no mergedRevisions are set
new 8249f5fa8 Style improvements
new bf86295f0 Ignore .factorypath
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 6 ++++--
.../src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java | 2 +-
.../src/main/java/org/apache/maven/scm/provider/hg/HgConfig.java | 6 +++---
3 files changed, 8 insertions(+), 6 deletions(-)
[maven-scm] 02/02: Ignore .factorypath
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-scm-1.x
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit bf86295f0369b36ec14ea29e192a13aad20003b8
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun May 22 09:56:27 2022 +0200
Ignore .factorypath
---
.gitignore | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index c8945e163..a5b710ff6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,7 @@ build
.java-version
.checkstyle
nbactions.xml
-maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/test/repository/CVSROOT/history
-maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/test/repository/CVSROOT/history
+/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/src/test/repository/CVSROOT/history
+/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/test/repository/CVSROOT/history
+.DS_Store
+.factorypath
[maven-scm] 01/02: Style improvements
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-scm-1.x
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 8249f5fa869cf9d4d005777b0fe5e0b9ffc1bae5
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat May 21 20:02:54 2022 +0200
Style improvements
---
.../src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java | 2 +-
.../src/main/java/org/apache/maven/scm/provider/hg/HgConfig.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java b/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java
index 66a281eaa..0f1b33c23 100644
--- a/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java
+++ b/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java
@@ -91,7 +91,7 @@ public class MavenScmCli
}
catch ( Exception ex )
{
- System.err.println( "Error while starting Maven Scm." );
+ System.err.println( "Error while starting Maven SCM." );
ex.printStackTrace( System.err );
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgConfig.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgConfig.java
index 8ed87a34e..665b54e67 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgConfig.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgConfig.java
@@ -41,7 +41,7 @@ public class HgConfig
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 ";
+ private static final String HG_VERSION_TAG = "Mercurial Distributed SCM (version ";
// URL to download mercurial from
private static final String HG_INSTALL_URL = "'http://www.selenic.com/mercurial/wiki/index.cgi/Download'";
@@ -83,7 +83,7 @@ public class HgConfig
public static HgVersionConsumer getHgVersion( File workingDir )
throws ScmException
{
- String[] versionCmd = new String[]{HgCommandConstants.VERSION};
+ String[] versionCmd = new String[]{ HgCommandConstants.VERSION };
HgVersionConsumer consumer = new HgVersionConsumer( HG_VERSION_TAG );
Commandline cmd = HgUtils.buildCmd( workingDir, versionCmd );
@@ -188,4 +188,4 @@ public class HgConfig
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
+}