diff options
-rwxr-xr-x | org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestTest.java | 2 | ||||
-rw-r--r-- | org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/PullRequest.java | 17 |
2 files changed, 14 insertions, 5 deletions
diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestTest.java index 6245e7c1..86c833b1 100755 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestTest.java @@ -39,7 +39,7 @@ public class PullRequestTest { @Test
public void defaultState() {
PullRequest request = new PullRequest();
- assertFalse(request.isMergeable());
+ assertNull(request.isMergeable());
assertFalse(request.isMerged());
assertEquals(0, request.getAdditions());
assertNull(request.getBase());
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/PullRequest.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/PullRequest.java index ec078782..2df4f767 100644 --- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/PullRequest.java +++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/PullRequest.java @@ -26,7 +26,7 @@ public class PullRequest implements Serializable { /** serialVersionUID */ private static final long serialVersionUID = 7858604768525096763L; - private boolean mergeable; + private Boolean mergeable; private boolean merged; @@ -89,9 +89,18 @@ public class PullRequest implements Serializable { private List<User> assignees; /** - * @return mergeable + * Tells whether the pull request can be merged. The value may be + * {@code null}, which indicates that GitHub is busy computing this + * information but hasn't determined it yet. + * + * @return whether the pull request is mergeable, or {@code null} if not + * known yet and GitHub is busy calculating the mergeability. + * + * @see <a href= + * "https://developer.github.com/v3/pulls/#get-a-single-pull-request">GitHub + * Rest API v3: Pull Requests</a> */ - public boolean isMergeable() { + public Boolean isMergeable() { return mergeable; } @@ -99,7 +108,7 @@ public class PullRequest implements Serializable { * @param mergeable * @return this pull request */ - public PullRequest setMergeable(boolean mergeable) { + public PullRequest setMergeable(Boolean mergeable) { this.mergeable = mergeable; return this; } |