Updated Branches: refs/heads/master d009219e5 -> 665256d05
minor change Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/e734139a Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/e734139a Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/e734139a Branch: refs/heads/master Commit: e734139ae38165a4010f2d145339544d0a87bfc8 Parents: d009219 Author: Olivier Lamy <[email protected]> Authored: Tue Jul 16 22:11:23 2013 +1000 Committer: Olivier Lamy <[email protected]> Committed: Tue Jul 16 22:11:23 2013 +1000 ---------------------------------------------------------------------- .../provider/git/jgit/command/JGitUtils.java | 1 - .../command/changelog/JGitChangeLogCommand.java | 6 ++++-- .../changelog/ChangeLogCommandTckTest.java | 22 ++++++++++---------- 3 files changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/e734139a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java index 225dea0..aca1388 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java @@ -350,7 +350,6 @@ public class JGitUtils { walk.setRevFilter( CommitTimeRevFilter.after( fromDate ) ); } - if ( toDate != null ) { walk.setRevFilter( CommitTimeRevFilter.before( toDate ) ); http://git-wip-us.apache.org/repos/asf/maven-scm/blob/e734139a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommand.java index 912b8ba..8c3cdce 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/changelog/JGitChangeLogCommand.java @@ -85,7 +85,6 @@ public class JGitChangeLogCommand { Git git = Git.open( fileSet.getBasedir() ); - List<ChangeSet> modifications = new ArrayList<ChangeSet>(); String startRev = startVersion != null ? startVersion.getName() : null; String endRev = endVersion != null ? endVersion.getName() : null; @@ -93,6 +92,8 @@ public class JGitChangeLogCommand List<ChangeEntry> gitChanges = this.whatchanged( git.getRepository(), null, startRev, endRev, startDate, endDate, -1 ); + List<ChangeSet> modifications = new ArrayList<ChangeSet>( gitChanges.size() ); + for ( ChangeEntry change : gitChanges ) { ChangeSet scmChange = new ChangeSet(); @@ -100,6 +101,7 @@ public class JGitChangeLogCommand scmChange.setAuthor( change.getAuthorName() ); scmChange.setComment( change.getBody() ); scmChange.setDate( change.getAuthorDate() ); + scmChange.setRevision( change.getCommitHash() ); // X TODO scmChange.setFiles( change.get ) modifications.add( scmChange ); @@ -121,8 +123,8 @@ public class JGitChangeLogCommand Date fromDate, Date toDate, int maxLines ) throws MissingObjectException, IncorrectObjectTypeException, IOException { - List<ChangeEntry> changes = new ArrayList<ChangeEntry>(); List<RevCommit> revs = JGitUtils.getRevCommits( repo, sortings, fromRev, toRev, fromDate, toDate, maxLines ); + List<ChangeEntry> changes = new ArrayList<ChangeEntry>( revs.size() ); for ( RevCommit c : revs ) { http://git-wip-us.apache.org/repos/asf/maven-scm/blob/e734139a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java index 36eb820..1242c9c 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/changelog/ChangeLogCommandTckTest.java @@ -54,11 +54,11 @@ public abstract class ChangeLogCommandTckTest ScmFileSet fileSet = new ScmFileSet( getWorkingCopy() ); //We should have one log entry for the initial repository - ChangeLogScmResult result = + ChangeLogScmResult firstResult = provider.changeLog( getScmRepository(), fileSet, null, null, 0, (ScmBranch) null, null ); - assertTrue( result.getProviderMessage() + ": " + result.getCommandLine() + "\n" + result.getCommandOutput(), - result.isSuccess() ); - assertEquals( 1, result.getChangeLog().getChangeSets().size() ); + assertTrue( firstResult.getProviderMessage() + ": " + firstResult.getCommandLine() + "\n" + firstResult.getCommandOutput(), + firstResult.isSuccess() ); + assertEquals( 1, firstResult.getChangeLog().getChangeSets().size() ); //Make a timestamp that we know are after initial revision but before the second Date timeBeforeSecond = new Date(); //Current time @@ -71,19 +71,19 @@ public abstract class ChangeLogCommandTckTest CheckInScmResult checkInResult = provider.checkIn( getScmRepository(), fileSet, COMMIT_MSG ); assertTrue( "Unable to checkin changes to the repository", checkInResult.isSuccess() ); - result = provider.changeLog( getScmRepository(), fileSet, (ScmVersion) null, null ); - assertTrue( result.getProviderMessage(), result.isSuccess() ); - assertEquals( 2, result.getChangeLog().getChangeSets().size() ); + ChangeLogScmResult secondResult = provider.changeLog( getScmRepository(), fileSet, (ScmVersion) null, null ); + assertTrue( secondResult.getProviderMessage(), secondResult.isSuccess() ); + assertEquals( 2, secondResult.getChangeLog().getChangeSets().size() ); //Now only retrieve the changelog after timeBeforeSecondChangeLog Date currentTime = new Date(); - result = provider + ChangeLogScmResult thirdResult = provider .changeLog( getScmRepository(), fileSet, timeBeforeSecond, currentTime, 0, new ScmBranch( "" ) ); //Thorough assert of the last result - assertTrue( result.getProviderMessage(), result.isSuccess() ); - assertEquals( 1, result.getChangeLog().getChangeSets().size() ); - ChangeSet changeset = result.getChangeLog().getChangeSets().get( 0 ); + assertTrue( thirdResult.getProviderMessage(), thirdResult.isSuccess() ); + assertEquals( 1, thirdResult.getChangeLog().getChangeSets().size() ); + ChangeSet changeset = thirdResult.getChangeLog().getChangeSets().get( 0 ); assertTrue( changeset.getDate().after( timeBeforeSecond ) ); assertEquals( COMMIT_MSG, changeset.getComment() ); }
