continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r384510 - /maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
Date Thu, 09 Mar 2006 13:42:16 GMT
Author: evenisse
Date: Thu Mar  9 05:42:13 2006
New Revision: 384510

URL: http://svn.apache.org/viewcvs?rev=384510&view=rev
Log:
Fix changes parsing

Modified:
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java?rev=384510&r1=384509&r2=384510&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
Thu Mar  9 05:42:13 2006
@@ -394,14 +394,7 @@
 
         result.setProviderMessage( scmResult.getProviderMessage() );
 
-        // TODO: is this valid?
-        ChangeSet changeSet = convertScmFileSetToChangeSet( scmResult.getUpdatedFiles() );
-        if ( changeSet != null )
-        {
-            result.addChange( changeSet );
-        }
-
-        if ( scmResult.getChanges() != null )
+        if ( scmResult.getChanges() != null && !scmResult.getChanges().isEmpty()
)
         {
             for ( Iterator it = scmResult.getChanges().iterator(); it.hasNext(); )
             {
@@ -433,6 +426,18 @@
 
                 result.addChange( change );
             }
+        }
+        else
+        {
+            //We don't have a changes information probably because provider doesn't have
a changelog command
+            //so we use the updated list that contains only the updated files list
+            ChangeSet changeSet = convertScmFileSetToChangeSet( scmResult.getUpdatedFiles()
);
+
+            if ( changeSet != null )
+            {
+                result.addChange( changeSet );
+            }
+
         }
 
         return result;



Mime
View raw message