svn commit: r756914 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command: HgCommandConstants.java update/HgUpdateCommand.java

[olamy]

Author: olamy
Date: Sat Mar 21 10:55:50 2009
New Revision: 756914

URL: http://svn.apache.org/viewvc?rev=756914&view=rev
Log:
[SCM-421] After update working directory is not updated: missing hg update 
command
Submitted by Tsuyoshi Ito

Modified:
    
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
    
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/update/HgUpdateCommand.java

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.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/HgCommandConstants.java?rev=756914&r1=756913&r2=756914&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
 Sat Mar 21 10:55:50 2009
@@ -65,6 +65,11 @@
      * Commit changes into a new revision
      */
     public static final String COMMIT_CMD = "commit";
+    
+    /**
+     * update working-copy to tip
+     */
+    public static final String UPDATE_CMD = "update";
 
     /**
      * Pull any changes from another branch into the current one

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=756914&r1=756913&r2=756914&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
 Sat Mar 21 10:55:50 2009
@@ -98,6 +98,9 @@
                 updatedFiles.add( file );
             }
         }
+        
+        String[] hgUpdateCmd = new String[] { HgCommandConstants.UPDATE_CMD };
+        HgUtils.execute( new HgConsumer( getLogger() ), getLogger(), 
workingDir, hgUpdateCmd );
 
         return new UpdateScmResultWithRevision( updatedFiles, changes, 
String.valueOf( currentRevision ), diffResult );
     }