Repository: maven-scm Updated Branches: refs/heads/master 71fcf0ec6 -> 9df010c0c
[SCM-795] Fixed. Content on stderr will no longer raise an exception. Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/2d750207 Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/2d750207 Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/2d750207 Branch: refs/heads/master Commit: 2d7502077559d46f8009e45311b8ce5ab79f01bb Parents: b1ab76e Author: Chris Graham <chrisgw...@apache.org> Authored: Sat May 9 20:06:36 2015 +1000 Committer: Chris Graham <chrisgw...@apache.org> Committed: Sat May 9 20:06:36 2015 +1000 ---------------------------------------------------------------------- .../maven/scm/provider/jazz/command/add/JazzAddCommand.java | 2 +- .../scm/provider/jazz/command/blame/JazzBlameCommand.java | 2 +- .../jazz/command/changelog/JazzChangeLogCommand.java | 4 ++-- .../provider/jazz/command/checkin/JazzCheckInCommand.java | 4 ++-- .../provider/jazz/command/checkout/JazzCheckOutCommand.java | 2 +- .../scm/provider/jazz/command/diff/JazzDiffCommand.java | 2 +- .../scm/provider/jazz/command/edit/JazzEditCommand.java | 2 +- .../scm/provider/jazz/command/list/JazzListCommand.java | 2 +- .../scm/provider/jazz/command/status/JazzStatusCommand.java | 2 +- .../maven/scm/provider/jazz/command/tag/JazzTagCommand.java | 8 ++++---- .../scm/provider/jazz/command/unedit/JazzUnEditCommand.java | 2 +- .../scm/provider/jazz/command/update/JazzUpdateCommand.java | 6 +++--- .../apache/maven/scm/provider/jazz/command/JazzTckUtil.java | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/2d750207/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/add/JazzAddCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/add/JazzAddCommand.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/add/JazzAddCommand.java index 3a0c2e0..71597ff 100644 --- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/add/JazzAddCommand.java +++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/add/JazzAddCommand.java @@ -155,7 +155,7 @@ public class JazzAddCommand JazzScmCommand command = createAddCommand( repo, fileSet ); int status = command.execute( addConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { return new AddScmResult( command.getCommandString(), "Error code for Jazz SCM add (checkin) command - " + status, http://git-wip-us.apache.org/repos/asf/maven-scm/blob/2d750207/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameCommand.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameCommand.java index acde088..1704d60 100644 --- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameCommand.java +++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameCommand.java @@ -71,7 +71,7 @@ public class JazzBlameCommand ErrorConsumer errConsumer = new ErrorConsumer( getLogger() ); int status = blameCmd.execute( blameConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { return new BlameScmResult( blameCmd.getCommandString(), "Error code for Jazz SCM blame command - " + status, errConsumer.getOutput(), false ); http://git-wip-us.apache.org/repos/asf/maven-scm/blob/2d750207/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzChangeLogCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzChangeLogCommand.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzChangeLogCommand.java index 7564f8e..eab4459 100644 --- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzChangeLogCommand.java +++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzChangeLogCommand.java @@ -93,7 +93,7 @@ public class JazzChangeLogCommand JazzHistoryConsumer changeLogConsumer = new JazzHistoryConsumer( repo, getLogger(), changeSets ); ErrorConsumer errConsumer = new ErrorConsumer( getLogger() ); int status = historyCommand.execute( changeLogConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { return new ChangeLogScmResult( historyCommand.getCommandString(), "Error code for Jazz SCM history command - " + status, @@ -106,7 +106,7 @@ public class JazzChangeLogCommand new JazzListChangesetConsumer( repo, getLogger(), changeSets, datePattern ); errConsumer = new ErrorConsumer( getLogger() ); status = listChangesetsCommand.execute( listChangesetConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { return new ChangeLogScmResult( listChangesetsCommand.getCommandString(), "Error code for Jazz SCM list changesets command - " + status, http://git-wip-us.apache.org/repos/asf/maven-scm/blob/2d750207/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java index 7f6ab3c..a82c0d8 100644 --- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java +++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java @@ -108,7 +108,7 @@ public class JazzCheckInCommand ErrorConsumer errConsumer = new ErrorConsumer( getLogger() ); int status = createChangesetCmd.execute( outputConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { return new CheckInScmResult( createChangesetCmd.getCommandString(), "Error code for Jazz SCM create changeset command - " + status, @@ -139,7 +139,7 @@ public class JazzCheckInCommand ErrorConsumer errConsumer = new ErrorConsumer( getLogger() ); int status = deliverCmd.execute( deliverConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { return new CheckInScmResult( deliverCmd.getCommandString(), "Error code for Jazz SCM deliver command - " + status, http://git-wip-us.apache.org/repos/asf/maven-scm/blob/2d750207/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutCommand.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutCommand.java index 4ed51f4..5ace891 100644 --- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutCommand.java +++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutCommand.java @@ -72,7 +72,7 @@ public class JazzCheckOutCommand ErrorConsumer errConsumer = new ErrorConsumer( getLogger() ); int status = checkoutCmd.execute( checkoutConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { return new CheckOutScmResult( checkoutCmd.getCommandString(), "Error code for Jazz SCM checkout (load) command - " + status, http://git-wip-us.apache.org/repos/asf/maven-scm/blob/2d750207/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommand.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommand.java index 8fc38e3..e402086 100644 --- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommand.java +++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommand.java @@ -138,7 +138,7 @@ public class JazzDiffCommand ErrorConsumer errConsumer = new ErrorConsumer( getLogger() ); diffCmd = createDiffCommand( repo, fileSet, relativePath ); int status = diffCmd.execute( diffConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { // Return a false result (not the usual SCMResult) return new DiffScmResult( diffCmd.toString(), "The scm diff command failed.", http://git-wip-us.apache.org/repos/asf/maven-scm/blob/2d750207/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommand.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommand.java index 5b876d7..7d93b00 100644 --- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommand.java +++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommand.java @@ -78,7 +78,7 @@ public class JazzEditCommand JazzScmCommand editCmd = createEditCommand( repo, fileSet ); int status = editCmd.execute( editConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { return new EditScmResult( editCmd.getCommandString(), "Error code for Jazz SCM edit command - " + status, errConsumer.getOutput(), false ); http://git-wip-us.apache.org/repos/asf/maven-scm/blob/2d750207/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/list/JazzListCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/list/JazzListCommand.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/list/JazzListCommand.java index 0a91fdc..1a4a97b 100644 --- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/list/JazzListCommand.java +++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/list/JazzListCommand.java @@ -65,7 +65,7 @@ public class JazzListCommand JazzScmCommand listCmd = createListCommand( jazzRepo, fileSet, recursive, version ); int status = listCmd.execute( listConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { return new ListScmResult( listCmd.getCommandString(), "Error code for Jazz SCM list command - " + status, errConsumer.getOutput(), false ); http://git-wip-us.apache.org/repos/asf/maven-scm/blob/2d750207/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommand.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommand.java index 25d229b..2030f11 100644 --- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommand.java +++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommand.java @@ -61,7 +61,7 @@ public class JazzStatusCommand JazzScmCommand statusCmd = createStatusCommand( repo, fileSet ); int status = statusCmd.execute( statusConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { return new StatusScmResult( statusCmd.getCommandString(), "Error code for Jazz SCM status command - " + status, errConsumer.getOutput(), http://git-wip-us.apache.org/repos/asf/maven-scm/blob/2d750207/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommand.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommand.java index 2e80f16..aa0140f 100644 --- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommand.java +++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/tag/JazzTagCommand.java @@ -89,7 +89,7 @@ public class JazzTagCommand createTagCreateSnapshotCommand( jazzRepo, fileSet, tag, scmTagParameters ); int status = tagCreateSnapshotCmd.execute( tagConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { return new TagScmResult( tagCreateSnapshotCmd.getCommandString(), "Error code for Jazz SCM tag (SNAPSHOT) command - " + status, @@ -104,7 +104,7 @@ public class JazzTagCommand errConsumer = new ErrorConsumer( getLogger() ); status = tagCreateWorkspaceCmd.execute( tagConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { return new TagScmResult( tagCreateWorkspaceCmd.getCommandString(), "Error code for Jazz SCM tag (WORKSPACE) command - " + status, @@ -122,7 +122,7 @@ public class JazzTagCommand JazzScmCommand tagDeliverCommand = createTagDeliverCommand( jazzRepo, fileSet, tag ); errConsumer = new ErrorConsumer( getLogger() ); status = tagDeliverCommand.execute( tagConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { return new TagScmResult( tagDeliverCommand.getCommandString(), "Error code for Jazz SCM deliver command - " + status, errConsumer.getOutput(), @@ -134,7 +134,7 @@ public class JazzTagCommand JazzScmCommand tagSnapshotPromoteCommand = createTagSnapshotPromoteCommand( jazzRepo, fileSet, tag ); errConsumer = new ErrorConsumer( getLogger() ); status = tagSnapshotPromoteCommand.execute( tagConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { return new TagScmResult( tagSnapshotPromoteCommand.getCommandString(), "Error code for Jazz SCM snapshot promote command - " + status, http://git-wip-us.apache.org/repos/asf/maven-scm/blob/2d750207/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommand.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommand.java index 48492e3..9446925 100644 --- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommand.java +++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommand.java @@ -78,7 +78,7 @@ public class JazzUnEditCommand JazzScmCommand uneditCmd = createUneditCommand( repo, fileSet ); int status = uneditCmd.execute( uneditConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { return new UnEditScmResult( uneditCmd.getCommandString(), "Error code for Jazz SCM unedit command - " + status, errConsumer.getOutput(), http://git-wip-us.apache.org/repos/asf/maven-scm/blob/2d750207/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommand.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommand.java index 4bccbb4..fe93433 100644 --- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommand.java +++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommand.java @@ -69,12 +69,12 @@ public class JazzUpdateCommand } JazzUpdateConsumer updateConsumer = new JazzUpdateConsumer( repo, getLogger() ); - ErrorConsumer err = new ErrorConsumer( getLogger() ); + ErrorConsumer errConsumer = new ErrorConsumer( getLogger() ); JazzScmCommand updateCmd = createAcceptCommand( repo, fileSet ); - int status = updateCmd.execute( updateConsumer, err ); + int status = updateCmd.execute( updateConsumer, errConsumer ); - if ( status != 0 || err.hasBeenFed() ) + if ( status != 0 ) { return new UpdateScmResult( updateCmd.getCommandString(), "Error code for Jazz SCM update command - " + status, err.getOutput(), false ); http://git-wip-us.apache.org/repos/asf/maven-scm/blob/2d750207/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzTckUtil.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzTckUtil.java b/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzTckUtil.java index 7bbdf99..f9f2132 100644 --- a/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzTckUtil.java +++ b/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzTckUtil.java @@ -92,7 +92,7 @@ public class JazzTckUtil createCreateWorkspaceFromSnapshotCommand( jazzRepo, fileSet, nameWorkspace, nameSnapshot ); int status = tckCreateWorkspaceFromSnapshotCmd.execute( tckConsumer, errConsumer ); - if ( status != 0 || errConsumer.hasBeenFed() ) + if ( status != 0 ) { return new ScmResult( tckCreateWorkspaceFromSnapshotCmd.getCommandString(), "Error code for Jazz SCM (create workspace --snapshot) command - " + status,
