You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2016/04/06 02:29:56 UTC

[1/5] maven-scm git commit: fix incorrect resolving of branch name from outgoing changes

Repository: maven-scm
Updated Branches:
  refs/heads/master e0afea497 -> 43d5eadc9


fix incorrect resolving of branch name from outgoing changes


Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/29ccf295
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/29ccf295
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/29ccf295

Branch: refs/heads/master
Commit: 29ccf295c1e259acbfe633c8e361b4b782620d1d
Parents: 98c53aa
Author: s13o <Agartsin!1>
Authored: Wed Mar 25 01:11:02 2015 +0200
Committer: s13o <Agartsin!1>
Committed: Wed Mar 25 01:11:02 2015 +0200

----------------------------------------------------------------------
 .../apache/maven/scm/provider/hg/HgUtils.java    | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-scm/blob/29ccf295/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
index bfcf72c..36ef6c9 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
@@ -48,6 +48,8 @@ import java.util.Map;
 public final class HgUtils
 {
 
+    public static final String DEFAULT = "default";
+
     private HgUtils()
     {
         // no op
@@ -78,7 +80,7 @@ public final class HgUtils
         List<Integer> outgoingExitCodes = new ArrayList<Integer>( 2 );
         outgoingExitCodes.add( Integer.valueOf( 0 ) ); //There are changes
         outgoingExitCodes.add( Integer.valueOf( 1 ) ); //No changes
-        EXIT_CODE_MAP.put( HgCommandConstants.OUTGOING_CMD, outgoingExitCodes );        
+        EXIT_CODE_MAP.put( HgCommandConstants.OUTGOING_CMD, outgoingExitCodes );
     }
 
     public static ScmResult execute( HgConsumer consumer, ScmLogger logger, File workingDir, String[] cmdAndArgs )
@@ -301,7 +303,7 @@ public final class HgUtils
      * @return true if a different outgoing branch was found
      * @throws ScmException on outgoing command error
      */
-    public static boolean differentOutgoingBranchFound( ScmLogger logger, File workingDir, String workingbranchName )
+    public static boolean differentOutgoingBranchFound( ScmLogger logger, File workingDir,String workingbranchName )
         throws ScmException
     {
         String[] outCmd = new String[]{ HgCommandConstants.OUTGOING_CMD };
@@ -312,11 +314,10 @@ public final class HgUtils
         {
             for ( HgChangeSet set : changes )
             {
-                if ( set.getBranch() != null )
-                {
-                    logger.warn( "A different branch than " + workingbranchName
-                        + " was found in outgoing changes, branch name was " + set.getBranch()
-                        + ". Only local branch named " + workingbranchName + " will be pushed." );
+                if (!getBranchName(workingbranchName).equals(getBranchName(set.getBranch()))) {
+                    logger.warn( "A different branch than " + getBranchName(workingbranchName)
+                        + " was found in outgoing changes, branch name was " + getBranchName(set.getBranch())
+                        + ". Only local branch named " + getBranchName(workingbranchName) + " will be pushed." );
                     return true;
                 }
             }
@@ -324,6 +325,10 @@ public final class HgUtils
         return false;
     }
 
+    private static String getBranchName(String branch) {
+        return branch == null ? DEFAULT : branch;
+    }
+
     public static String maskPassword( Commandline cl )
     {
         String clString = cl.toString();


[5/5] maven-scm git commit: prefer CopyOnWriteArrayList to Collections.synchronizedList

Posted by ol...@apache.org.
prefer CopyOnWriteArrayList to Collections.synchronizedList

Signed-off-by: olivier lamy <ol...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/43d5eadc
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/43d5eadc
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/43d5eadc

Branch: refs/heads/master
Commit: 43d5eadc96a781ffdec4c92fe9cdc7d9441d19c0
Parents: 6dddf1f
Author: olivier lamy <ol...@apache.org>
Authored: Wed Apr 6 10:26:05 2016 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Wed Apr 6 10:26:05 2016 +1000

----------------------------------------------------------------------
 .../scm/provider/hg/command/inventory/HgOutgoingConsumer.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-scm/blob/43d5eadc/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java
index 34c39f2..f5eebfb 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java
@@ -25,6 +25,7 @@ import org.apache.maven.scm.provider.hg.command.HgConsumer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * Get a list of outgoing changes
@@ -35,7 +36,7 @@ import java.util.List;
 public class HgOutgoingConsumer
     extends HgConsumer
 {
-    private List<HgChangeSet> changes = Collections.synchronizedList(new ArrayList<HgChangeSet>());
+    private List<HgChangeSet> changes = new CopyOnWriteArrayList<HgChangeSet>();
 
     private static final String BRANCH = "branch";
 


[4/5] maven-scm git commit: Merge remote-tracking branch 's13o/master' into bugfix/SCM-821 [SCM-821] fixes #29

Posted by ol...@apache.org.
Merge remote-tracking branch 's13o/master' into bugfix/SCM-821
[SCM-821]
fixes #29


Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/6dddf1fc
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/6dddf1fc
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/6dddf1fc

Branch: refs/heads/master
Commit: 6dddf1fc0847be77b2fba4eb073c85e1dd69682a
Parents: e0afea4 18ac8ca
Author: olivier lamy <ol...@apache.org>
Authored: Wed Apr 6 10:21:34 2016 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Wed Apr 6 10:21:34 2016 +1000

----------------------------------------------------------------------
 .../apache/maven/scm/provider/hg/HgUtils.java   | 21 ++++++++++++--------
 .../command/inventory/HgOutgoingConsumer.java   |  3 ++-
 2 files changed, 15 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-scm/blob/6dddf1fc/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
----------------------------------------------------------------------


[3/5] maven-scm git commit: fix MPE in HgUtils.differentOutgoingBranchFound

Posted by ol...@apache.org.
fix MPE in HgUtils.differentOutgoingBranchFound


Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/18ac8ca0
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/18ac8ca0
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/18ac8ca0

Branch: refs/heads/master
Commit: 18ac8ca0f4dad979c9312de010d45edd231fb450
Parents: 328c9b0
Author: s13o <Agartsin!1>
Authored: Fri Apr 10 01:04:03 2015 +0300
Committer: s13o <Agartsin!1>
Committed: Fri Apr 10 01:04:03 2015 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java   | 2 +-
 .../scm/provider/hg/command/inventory/HgOutgoingConsumer.java     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-scm/blob/18ac8ca0/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
index 36ef6c9..24ba5ee 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
@@ -297,7 +297,7 @@ public final class HgUtils
      * Method users should not stop the push on a negative return, instead, they should
      * hg push -r(branch being released)
      *
-     * @param logger            the logger
+     * @param logger            the logger31
      * @param workingDir        the working dir
      * @param workingbranchName the working branch name
      * @return true if a different outgoing branch was found

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/18ac8ca0/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java
index 32d24bb..34c39f2 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java
@@ -23,6 +23,7 @@ import org.apache.maven.scm.log.ScmLogger;
 import org.apache.maven.scm.provider.hg.command.HgConsumer;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -34,7 +35,7 @@ import java.util.List;
 public class HgOutgoingConsumer
     extends HgConsumer
 {
-    private List<HgChangeSet> changes = new ArrayList<HgChangeSet>();
+    private List<HgChangeSet> changes = Collections.synchronizedList(new ArrayList<HgChangeSet>());
 
     private static final String BRANCH = "branch";
 


[2/5] maven-scm git commit: Merge https://github.com/apache/maven-scm

Posted by ol...@apache.org.
Merge https://github.com/apache/maven-scm


Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/328c9b0f
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/328c9b0f
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/328c9b0f

Branch: refs/heads/master
Commit: 328c9b0f7e41d4fe94fd737ea3eaacc35886d13e
Parents: 29ccf29 c76eb1f
Author: s13o <Agartsin!1>
Authored: Fri Apr 10 00:44:09 2015 +0300
Committer: s13o <Agartsin!1>
Committed: Fri Apr 10 00:44:09 2015 +0300

----------------------------------------------------------------------
 maven-scm-api/pom.xml                                  |  2 +-
 maven-scm-client/pom.xml                               |  2 +-
 maven-scm-managers/maven-scm-manager-plexus/pom.xml    |  2 +-
 maven-scm-managers/pom.xml                             |  2 +-
 maven-scm-plugin/pom.xml                               |  2 +-
 maven-scm-providers/maven-scm-provider-accurev/pom.xml |  2 +-
 maven-scm-providers/maven-scm-provider-bazaar/pom.xml  |  2 +-
 .../maven-scm-provider-clearcase/pom.xml               |  2 +-
 maven-scm-providers/maven-scm-provider-hg/pom.xml      |  2 +-
 .../maven-scm-provider-integrity/pom.xml               |  2 +-
 maven-scm-providers/maven-scm-provider-jazz/pom.xml    |  2 +-
 maven-scm-providers/maven-scm-provider-local/pom.xml   |  2 +-
 .../maven-scm-provider-perforce/pom.xml                |  2 +-
 .../maven-scm-provider-starteam/pom.xml                |  2 +-
 maven-scm-providers/maven-scm-provider-synergy/pom.xml |  2 +-
 maven-scm-providers/maven-scm-provider-tfs/pom.xml     |  2 +-
 maven-scm-providers/maven-scm-provider-vss/pom.xml     |  2 +-
 .../maven-scm-provider-cvs-commons/pom.xml             |  2 +-
 .../maven-scm-provider-cvsexe/pom.xml                  |  2 +-
 .../maven-scm-provider-cvsjava/pom.xml                 |  4 ++--
 .../maven-scm-provider-cvstest/pom.xml                 |  2 +-
 maven-scm-providers/maven-scm-providers-cvs/pom.xml    |  2 +-
 .../maven-scm-provider-git-commons/pom.xml             |  2 +-
 .../maven-scm-provider-gitexe/pom.xml                  |  2 +-
 .../maven-scm-provider-gittest/pom.xml                 |  2 +-
 .../maven-scm-provider-jgit/pom.xml                    |  2 +-
 maven-scm-providers/maven-scm-providers-git/pom.xml    |  2 +-
 .../maven-scm-providers-standard/pom.xml               |  2 +-
 .../maven-scm-provider-svn-commons/pom.xml             |  2 +-
 .../maven-scm-provider-svnexe/pom.xml                  |  2 +-
 .../maven-scm-provider-svntest/pom.xml                 |  2 +-
 maven-scm-providers/maven-scm-providers-svn/pom.xml    |  2 +-
 maven-scm-providers/pom.xml                            |  2 +-
 maven-scm-test/pom.xml                                 |  2 +-
 pom.xml                                                | 13 ++++++++++---
 35 files changed, 45 insertions(+), 38 deletions(-)
----------------------------------------------------------------------