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 2013/09/24 12:00:40 UTC

[1/3] git commit: Fixed date format bug by using log template Fixed log template escaping by splitting old template option into template option and template format

Updated Branches:
  refs/heads/master cd0652eac -> fedf28fde


Fixed date format bug by using log template
Fixed log template escaping by splitting old template option into template option and template format


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

Branch: refs/heads/master
Commit: f9377e9ed6478a5965ba3071a684ac6785cd5caf
Parents: cd0652e
Author: Mads Mohr Christensen <hr...@gmail.com>
Authored: Sun Sep 22 12:31:57 2013 +0200
Committer: Mads Mohr Christensen <hr...@gmail.com>
Committed: Sun Sep 22 12:31:57 2013 +0200

----------------------------------------------------------------------
 .../scm/provider/hg/command/HgCommandConstants.java  | 15 ++++++++-------
 .../hg/command/changelog/HgChangeLogCommand.java     |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f9377e9e/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
index eb6e167..6088ad7 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
@@ -152,17 +152,18 @@ public final class HgCommandConstants
 
     public static final String CLEAN_OPTION = "-c";
 
+    public static final String TEMPLATE_OPTION = "--template";
+
     /**
      * limit number of changes displayed
      */
     public static final String LIMIT_OPTION = "--limit";
 
-	/**
-	 * A template for the log output in order to decouple the date parsing from
-	 * system and java locale, also helps avoiding bug due changes on the
-	 * verbose format for log command.
-	 */
-	public static final String TEMPLATE_OPTION = "--template \"changeset:   {rev}:{node|short}\nbranch:      {branch}\nuser:        {author}\ndate:        {date|isodatesec}\ntag:         {tags}\nfiles:       {files}\ndescription:\n{desc}\n\n\"";
-
+    /**
+     * A template for the log output in order to decouple the date parsing from
+     * system and java locale, also helps avoiding bug due changes on the
+     * verbose format for log command.
+     */
+    public static final String TEMPLATE_FORMAT = "changeset:   {rev}:{node|short}\nbranch:      {branch}\nuser:        {author}\ndate:        {date|isodatesec}\ntag:         {tags}\nfiles:       {files}\ndescription:\n{desc}\n";
 
 }

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f9377e9e/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
index cb4a61e..ec90d30 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
@@ -84,7 +84,7 @@ public class HgChangeLogCommand
                                                           String datePattern, Integer limit )
         throws ScmException
     {
-        SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
+        SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" );
         StringBuilder dateInterval = new StringBuilder();
         // TRICK: Mercurial 1.9.3 don't accept 1970-01-01
         dateInterval.append(
@@ -93,7 +93,7 @@ public class HgChangeLogCommand
         dateInterval.append( dateFormat.format( endDate == null ? new Date() : endDate ) ); // Upto now
 
         List<String> cmd = new ArrayList<String>();
-        cmd.addAll( Arrays.asList( HgCommandConstants.LOG_CMD, HgCommandConstants.VERBOSE_OPTION,
+        cmd.addAll( Arrays.asList( HgCommandConstants.LOG_CMD, HgCommandConstants.TEMPLATE_OPTION, HgCommandConstants.TEMPLATE_FORMAT,
                                    HgCommandConstants.NO_MERGES_OPTION, HgCommandConstants.DATE_OPTION,
                                    dateInterval.toString() ) );
 
@@ -128,7 +128,7 @@ public class HgChangeLogCommand
             revisionInterval.append( endVersion.getName() );
         }
 
-        String[] cmd = new String[]{ HgCommandConstants.LOG_CMD, HgCommandConstants.TEMPLATE_OPTION,
+        String[] cmd = new String[]{ HgCommandConstants.LOG_CMD, HgCommandConstants.TEMPLATE_OPTION, HgCommandConstants.TEMPLATE_FORMAT,
             HgCommandConstants.NO_MERGES_OPTION, HgCommandConstants.REVISION_OPTION, revisionInterval.toString() };
         HgChangeLogConsumer consumer = new HgChangeLogConsumer( getLogger(), datePattern );
         ScmResult result = HgUtils.execute( consumer, getLogger(), fileSet.getBasedir(), cmd );


[3/3] git commit: code formatting

Posted by ol...@apache.org.
code formatting


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

Branch: refs/heads/master
Commit: fedf28fde22d51f66c837ceee8f498f87618edea
Parents: 33bceaf
Author: Olivier Lamy <ol...@apache.org>
Authored: Tue Sep 24 19:58:19 2013 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Tue Sep 24 19:58:19 2013 +1000

----------------------------------------------------------------------
 .../provider/hg/command/HgCommandConstants.java |  4 ++--
 .../command/changelog/HgChangeLogCommand.java   | 23 ++++++++++----------
 .../command/changelog/HgChangeLogConsumer.java  | 17 +++++++++------
 3 files changed, 24 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-scm/blob/fedf28fd/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
index 6088ad7..f1679fa 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
@@ -27,7 +27,6 @@ package org.apache.maven.scm.provider.hg.command;
  * Eg. "check in" is translated to be "commit" and "push".
  *
  * @author <a href="mailto:thurner.rupert@ymono.net">thurner rupert</a>
- *
  */
 public final class HgCommandConstants
 {
@@ -164,6 +163,7 @@ public final class HgCommandConstants
      * system and java locale, also helps avoiding bug due changes on the
      * verbose format for log command.
      */
-    public static final String TEMPLATE_FORMAT = "changeset:   {rev}:{node|short}\nbranch:      {branch}\nuser:        {author}\ndate:        {date|isodatesec}\ntag:         {tags}\nfiles:       {files}\ndescription:\n{desc}\n";
+    public static final String TEMPLATE_FORMAT =
+        "changeset:   {rev}:{node|short}\nbranch:      {branch}\nuser:        {author}\ndate:        {date|isodatesec}\ntag:         {tags}\nfiles:       {files}\ndescription:\n{desc}\n";
 
 }

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/fedf28fd/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
index ec90d30..a2ad3ac 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
@@ -43,7 +43,6 @@ import java.util.List;
 /**
  * @author <a href="mailto:thurner.rupert@ymono.net">thurner rupert</a>
  * @author Olivier Lamy
- *
  */
 public class HgChangeLogCommand
     extends AbstractChangeLogCommand
@@ -54,7 +53,7 @@ public class HgChangeLogCommand
      */
     @Override
     protected ChangeLogScmResult executeChangeLogCommand( ChangeLogScmRequest request )
-            throws ScmException
+        throws ScmException
     {
         final ScmVersion startVersion = request.getStartRevision();
         final ScmVersion endVersion = request.getEndRevision();
@@ -65,8 +64,8 @@ public class HgChangeLogCommand
             final ScmProviderRepository scmProviderRepository = request.getScmRepository().getProviderRepository();
             return executeChangeLogCommand( scmProviderRepository, fileSet, startVersion, endVersion, datePattern );
         }
-        return executeChangeLogCommand( fileSet, request.getStartDate(), request.getEndDate(),
-            datePattern, request.getLimit() );
+        return executeChangeLogCommand( fileSet, request.getStartDate(), request.getEndDate(), datePattern,
+                                        request.getLimit() );
     }
 
     /**
@@ -81,7 +80,7 @@ public class HgChangeLogCommand
     }
 
     private ChangeLogScmResult executeChangeLogCommand( ScmFileSet fileSet, Date startDate, Date endDate,
-                                                          String datePattern, Integer limit )
+                                                        String datePattern, Integer limit )
         throws ScmException
     {
         SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" );
@@ -93,9 +92,9 @@ public class HgChangeLogCommand
         dateInterval.append( dateFormat.format( endDate == null ? new Date() : endDate ) ); // Upto now
 
         List<String> cmd = new ArrayList<String>();
-        cmd.addAll( Arrays.asList( HgCommandConstants.LOG_CMD, HgCommandConstants.TEMPLATE_OPTION, HgCommandConstants.TEMPLATE_FORMAT,
-                                   HgCommandConstants.NO_MERGES_OPTION, HgCommandConstants.DATE_OPTION,
-                                   dateInterval.toString() ) );
+        cmd.addAll( Arrays.asList( HgCommandConstants.LOG_CMD, HgCommandConstants.TEMPLATE_OPTION,
+                                   HgCommandConstants.TEMPLATE_FORMAT, HgCommandConstants.NO_MERGES_OPTION,
+                                   HgCommandConstants.DATE_OPTION, dateInterval.toString() ) );
 
         if ( limit != null && limit > 0 )
         {
@@ -104,7 +103,8 @@ public class HgChangeLogCommand
         }
 
         HgChangeLogConsumer consumer = new HgChangeLogConsumer( getLogger(), datePattern );
-        ScmResult result = HgUtils.execute( consumer, getLogger(), fileSet.getBasedir(), cmd.toArray( new String[ cmd.size() ] ) );
+        ScmResult result =
+            HgUtils.execute( consumer, getLogger(), fileSet.getBasedir(), cmd.toArray( new String[cmd.size()] ) );
 
         List<ChangeSet> logEntries = consumer.getModifications();
         ChangeLogSet changeLogSet = new ChangeLogSet( logEntries, startDate, endDate );
@@ -128,8 +128,9 @@ public class HgChangeLogCommand
             revisionInterval.append( endVersion.getName() );
         }
 
-        String[] cmd = new String[]{ HgCommandConstants.LOG_CMD, HgCommandConstants.TEMPLATE_OPTION, HgCommandConstants.TEMPLATE_FORMAT,
-            HgCommandConstants.NO_MERGES_OPTION, HgCommandConstants.REVISION_OPTION, revisionInterval.toString() };
+        String[] cmd = new String[]{ HgCommandConstants.LOG_CMD, HgCommandConstants.TEMPLATE_OPTION,
+            HgCommandConstants.TEMPLATE_FORMAT, HgCommandConstants.NO_MERGES_OPTION, HgCommandConstants.REVISION_OPTION,
+            revisionInterval.toString() };
         HgChangeLogConsumer consumer = new HgChangeLogConsumer( getLogger(), datePattern );
         ScmResult result = HgUtils.execute( consumer, getLogger(), fileSet.getBasedir(), cmd );
 

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/fedf28fd/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
index 6375a6a..7475f44 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
@@ -33,7 +33,6 @@ import org.apache.maven.scm.provider.hg.command.HgConsumer;
 /**
  * @author <a href="mailto:thurner.rupert@ymono.net">thurner rupert</a>
  * @author <a href="mailto:hr.mohr@gmail.com">Mads Mohr Christensen</a>
- *
  */
 public class HgChangeLogConsumer
     extends HgConsumer
@@ -61,10 +60,10 @@ public class HgChangeLogConsumer
 
     private String currentRevision;
 
-    @SuppressWarnings( "unused" )
+    @SuppressWarnings("unused")
     private String currentTag; // don't know what to do with this
 
-    @SuppressWarnings( "unused" )
+    @SuppressWarnings("unused")
     private String currentBranch; // don't know what to do with this
 
     private String userDatePattern;
@@ -80,7 +79,9 @@ public class HgChangeLogConsumer
         return logEntries;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public void consumeLine( String line )
     {
         // override default behaviour which tries to pick through things for some standard messages.  that
@@ -89,13 +90,15 @@ public class HgChangeLogConsumer
         doConsume( null, trimmedLine );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public void doConsume( ScmFileStatus status, String line )
     {
         String tmpLine;
 
         // new changeset
-        if ( line.startsWith(REVNO_TAG) )
+        if ( line.startsWith( REVNO_TAG ) )
         {
             //Init a new changeset
             currentChange = new ChangeSet();
@@ -141,7 +144,7 @@ public class HgChangeLogConsumer
         }
         else if ( line.startsWith( MESSAGE_TOKEN ) )
         {
-            currentChange.setComment("");
+            currentChange.setComment( "" );
         }
         else
         {


[2/3] git commit: Refactored changelog parsing to fix new changeset detection removing null changesets and removed the branch name parsing warning

Posted by ol...@apache.org.
Refactored changelog parsing to fix new changeset detection removing null changesets and removed the branch name parsing warning


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

Branch: refs/heads/master
Commit: 33bceaf310d9322ce34c865db635ecf0e3bf24e4
Parents: f9377e9
Author: Mads Mohr Christensen <hr...@gmail.com>
Authored: Sun Sep 22 12:37:48 2013 +0200
Committer: Mads Mohr Christensen <hr...@gmail.com>
Committed: Sun Sep 22 12:37:48 2013 +0200

----------------------------------------------------------------------
 .../command/changelog/HgChangeLogConsumer.java  | 107 +++++++------------
 1 file changed, 37 insertions(+), 70 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-scm/blob/33bceaf3/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
index 5a92838..6375a6a 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogConsumer.java
@@ -32,6 +32,7 @@ import org.apache.maven.scm.provider.hg.command.HgConsumer;
 
 /**
  * @author <a href="mailto:thurner.rupert@ymono.net">thurner rupert</a>
+ * @author <a href="mailto:hr.mohr@gmail.com">Mads Mohr Christensen</a>
  *
  */
 public class HgChangeLogConsumer
@@ -40,21 +41,19 @@ public class HgChangeLogConsumer
 
     private static final String TIME_PATTERN = "yyyy-MM-dd HH:mm:ss Z";
 
-    private static final String REVNO_TAG = "changeset: ";
+    private static final String REVNO_TAG = "changeset:";
 
-    private static final String TAG_TAG = "tag:         ";
+    private static final String TAG_TAG = "tag:";
 
-    private static final String AUTHOR_TAG = "user: ";
+    private static final String BRANCH_TAG = "branch:";
 
-    private static final String TIME_STAMP_TOKEN = "date: ";
+    private static final String AUTHOR_TAG = "user:";
 
-    private static final String MESSAGE_TOKEN = "description:";
-
-    private static final String FILES_TOKEN = "files: ";
+    private static final String TIME_STAMP_TOKEN = "date:";
 
-    private String prevLine = "";
+    private static final String MESSAGE_TOKEN = "description:";
 
-    private String prevPrevLine = "";
+    private static final String FILES_TOKEN = "files:";
 
     private List<ChangeSet> logEntries = new ArrayList<ChangeSet>();
 
@@ -65,16 +64,14 @@ public class HgChangeLogConsumer
     @SuppressWarnings( "unused" )
     private String currentTag; // don't know what to do with this
 
-    private String userDatePattern;
-
-    private boolean spoolingComments;
+    @SuppressWarnings( "unused" )
+    private String currentBranch; // don't know what to do with this
 
-    private List<String> currentComment = null;
+    private String userDatePattern;
 
     public HgChangeLogConsumer( ScmLogger logger, String userDatePattern )
     {
         super( logger );
-
         this.userDatePattern = userDatePattern;
     }
 
@@ -86,81 +83,51 @@ public class HgChangeLogConsumer
     /** {@inheritDoc} */
     public void consumeLine( String line )
     {
-
         // override default behaviour which tries to pick through things for some standard messages.  that
         // does not apply here
-        doConsume( null, line );
+        String trimmedLine = line.trim();
+        doConsume( null, trimmedLine );
     }
 
     /** {@inheritDoc} */
     public void doConsume( ScmFileStatus status, String line )
     {
-        String tmpLine = line;
-        // If current status == null then this is a new entry
-        // If the line == "" and previous line was "", then this is also a new entry
-        if ( ( line.equals( "" ) && ( prevLine.equals( "" ) && prevPrevLine.equals( "" ) ) ) || currentComment == null )
-        {
-            if ( currentComment != null )
-            {
-                StringBuilder comment = new StringBuilder();
-                for ( int i = 0; i < currentComment.size() - 1; i++ )
-                {
-                    comment.append( currentComment.get( i ) );
-                    if ( i + 1 < currentComment.size() - 1 )
-                    {
-                        comment.append( '\n' );
-                    }
-                }
-                currentChange.setComment( comment.toString() );
-
-            }
-
-            spoolingComments = false;
+        String tmpLine;
 
+        // new changeset
+        if ( line.startsWith(REVNO_TAG) )
+        {
             //Init a new changeset
             currentChange = new ChangeSet();
             currentChange.setFiles( new ArrayList<ChangeFile>( 0 ) );
             logEntries.add( currentChange );
 
-            //Reset memeber vars
-            currentComment = new ArrayList<String>();
-            currentRevision = "";
-        }
-
-        if ( spoolingComments )
-        {
-            currentComment.add( line );
-        }
-        else if ( line.startsWith( MESSAGE_TOKEN ) )
-        {
-            spoolingComments = true;
-        }
-        else if ( line.startsWith( REVNO_TAG ) )
-        {
-            tmpLine = line.substring( REVNO_TAG.length() );
-            tmpLine = tmpLine.trim();
+            // parse revision
+            tmpLine = line.substring( REVNO_TAG.length() ).trim();
             currentRevision = tmpLine.substring( tmpLine.indexOf( ':' ) + 1 );
             currentChange.setRevision( currentRevision );
-
         }
-        else if ( line.startsWith( TAG_TAG ) )
+        else if ( line.startsWith( BRANCH_TAG ) )
         {
-            tmpLine = line.substring( TAG_TAG.length() ).trim();
-            currentTag = tmpLine;
+            tmpLine = line.substring( BRANCH_TAG.length() ).trim();
+            currentBranch = tmpLine;
         }
         else if ( line.startsWith( AUTHOR_TAG ) )
         {
-            tmpLine = line.substring( AUTHOR_TAG.length() );
-            tmpLine = tmpLine.trim();
+            tmpLine = line.substring( AUTHOR_TAG.length() ).trim();
             currentChange.setAuthor( tmpLine );
         }
         else if ( line.startsWith( TIME_STAMP_TOKEN ) )
         {
-            // TODO: FIX Date Parsing to match Mercurial or fix with template
             tmpLine = line.substring( TIME_STAMP_TOKEN.length() ).trim();
             Date date = parseDate( tmpLine, userDatePattern, TIME_PATTERN, Locale.ENGLISH );
             currentChange.setDate( date );
         }
+        else if ( line.startsWith( TAG_TAG ) )
+        {
+            tmpLine = line.substring( TAG_TAG.length() ).trim();
+            currentTag = tmpLine;
+        }
         else if ( line.startsWith( FILES_TOKEN ) )
         {
             tmpLine = line.substring( FILES_TOKEN.length() ).trim();
@@ -172,16 +139,16 @@ public class HgChangeLogConsumer
                 currentChange.addFile( changeFile );
             }
         }
-        else if ( line.length() > 0 )
+        else if ( line.startsWith( MESSAGE_TOKEN ) )
         {
-            if ( getLogger().isWarnEnabled() )
-            {
-                getLogger().warn( "Could not figure out: " + line );
-            }
+            currentChange.setComment("");
+        }
+        else
+        {
+            StringBuilder comment = new StringBuilder( currentChange.getComment() );
+            comment.append( line );
+            comment.append( '\n' );
+            currentChange.setComment( comment.toString() );
         }
-
-        // record previous line
-        prevLine = line;
-        prevPrevLine = prevLine;
     }
 }