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/10/12 09:56:29 UTC
[1/2] git commit: [SCM-681] Git blame fails to report line authors on
windows with core.autocrlf = true
Updated Branches:
refs/heads/master d186b2e55 -> 329b6c07f
[SCM-681] Git blame fails to report line authors on windows with core.autocrlf = true
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/87f4a780
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/87f4a780
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/87f4a780
Branch: refs/heads/master
Commit: 87f4a780e9a82631f8a2b76d123c50fe0b21f229
Parents: d186b2e
Author: Olivier Lamy <ol...@apache.org>
Authored: Sat Oct 12 18:55:46 2013 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Oct 12 18:55:46 2013 +1100
----------------------------------------------------------------------
.../apache/maven/scm/command/blame/BlameScmRequest.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/87f4a780/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmRequest.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmRequest.java b/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmRequest.java
index 4618d93..dd18a2b 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmRequest.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmRequest.java
@@ -17,7 +17,6 @@ package org.apache.maven.scm.command.blame;
* specific language governing permissions and limitations
* under the License.
*/
-
import org.apache.maven.scm.CommandParameter;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -60,8 +59,14 @@ public class BlameScmRequest
return ignoreWhitespace;
}
- public void setIgnoreWhitespace( boolean ignoreWhitespace )
- {
+ public void setIgnoreWhitespace( boolean ignoreWhitespace ) throws ScmException
+ {
this.ignoreWhitespace = ignoreWhitespace;
+
+ if (ignoreWhitespace) {
+ this.getCommandParameters().setString(CommandParameter.IGNORE_WHITESPACE, "TRUE");
+ } else {
+ this.getCommandParameters().setString(CommandParameter.IGNORE_WHITESPACE, "FALSE");
+ }
}
}
[2/2] git commit: format code
Posted by ol...@apache.org.
format code
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/329b6c07
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/329b6c07
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/329b6c07
Branch: refs/heads/master
Commit: 329b6c07f60d720d7338e92ea8238c265625cad4
Parents: 87f4a78
Author: Olivier Lamy <ol...@apache.org>
Authored: Sat Oct 12 18:56:17 2013 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Oct 12 18:56:17 2013 +1100
----------------------------------------------------------------------
.../maven/scm/command/blame/BlameScmRequest.java | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/329b6c07/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmRequest.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmRequest.java b/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmRequest.java
index dd18a2b..609ea8a 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmRequest.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmRequest.java
@@ -17,6 +17,7 @@ package org.apache.maven.scm.command.blame;
* specific language governing permissions and limitations
* under the License.
*/
+
import org.apache.maven.scm.CommandParameter;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -59,14 +60,18 @@ public class BlameScmRequest
return ignoreWhitespace;
}
- public void setIgnoreWhitespace( boolean ignoreWhitespace ) throws ScmException
- {
+ public void setIgnoreWhitespace( boolean ignoreWhitespace )
+ throws ScmException
+ {
this.ignoreWhitespace = ignoreWhitespace;
- if (ignoreWhitespace) {
- this.getCommandParameters().setString(CommandParameter.IGNORE_WHITESPACE, "TRUE");
- } else {
- this.getCommandParameters().setString(CommandParameter.IGNORE_WHITESPACE, "FALSE");
- }
+ if ( ignoreWhitespace )
+ {
+ this.getCommandParameters().setString( CommandParameter.IGNORE_WHITESPACE, "TRUE" );
+ }
+ else
+ {
+ this.getCommandParameters().setString( CommandParameter.IGNORE_WHITESPACE, "FALSE" );
+ }
}
}