Merge "ChangeRebuilder: Handle WIP changes"
diff --git a/WORKSPACE b/WORKSPACE
index e29256e..3b46d22 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -453,84 +453,84 @@
sha1 = "18a9a2ce6abf32ea1b5fd31dae5210ad93f4e5e3",
)
-LUCENE_VERS = "5.5.2"
+LUCENE_VERS = "5.5.4"
maven_jar(
name = "lucene_core",
artifact = "org.apache.lucene:lucene-core:" + LUCENE_VERS,
- sha1 = "de5e5c3161ea01e89f2a09a14391f9b7ed66cdbb",
+ sha1 = "ab9c77e75cf142aa6e284b310c8395617bd9b19b",
)
maven_jar(
name = "lucene_analyzers_common",
artifact = "org.apache.lucene:lucene-analyzers-common:" + LUCENE_VERS,
- sha1 = "f0bc3114a6b43f8e64a33c471d5b9e8ddc51564d",
+ sha1 = "08ce9d34c8124c80e176e8332ee947480bbb9576",
)
maven_jar(
name = "lucene_codecs",
artifact = "org.apache.lucene:lucene-codecs:" + LUCENE_VERS,
- sha1 = "e01fe463d9490bb1b4a6a168e771f7b7255a50b1",
+ sha1 = "afdad570668469b1734fbd32b8f98561561bed48",
)
maven_jar(
name = "backward_codecs",
artifact = "org.apache.lucene:lucene-backward-codecs:" + LUCENE_VERS,
- sha1 = "c5cfcd7a8cf48a0144b61fb991c8e50a0bf868d5",
+ sha1 = "a933f42e758c54c43083398127ea7342b54d8212",
)
maven_jar(
name = "lucene_misc",
artifact = "org.apache.lucene:lucene-misc:" + LUCENE_VERS,
- sha1 = "37bbe5a2fb429499dfbe75d750d1778881fff45d",
+ sha1 = "a74388857f73614e528ae44d742c60187cb55a5a",
)
maven_jar(
name = "lucene_queryparser",
artifact = "org.apache.lucene:lucene-queryparser:" + LUCENE_VERS,
- sha1 = "8ac921563e744463605284c6d9d2d95e1be5b87c",
+ sha1 = "8a06fad4675473d98d93b61fea529e3f464bf69e",
)
maven_jar(
name = "lucene_highlighter",
artifact = "org.apache.lucene:lucene-highlighter:" + LUCENE_VERS,
- sha1 = "d127ac514e9df965ab0b57d92bbe0c68d3d145b8",
+ sha1 = "433f53f03f1b14337c08d54e507a5410905376fa",
)
maven_jar(
name = "lucene_join",
artifact = "org.apache.lucene:lucene-join:" + LUCENE_VERS,
- sha1 = "dac1b322508f3f2696ecc49a97311d34d8382054",
+ sha1 = "23f9a909a244ed3b28b37c5bb21a6e33e6c0a339",
)
maven_jar(
name = "lucene_memory",
artifact = "org.apache.lucene:lucene-memory:" + LUCENE_VERS,
- sha1 = "7409db9863d8fbc265c27793c6cc7511304182c2",
+ sha1 = "4dbdc2e1a24837722294762a9edb479f79092ab9",
)
maven_jar(
name = "lucene_sandbox",
artifact = "org.apache.lucene:lucene-sandbox:" + LUCENE_VERS,
- sha1 = "30a91f120706ba66732d5a974b56c6971b3c8a16",
+ sha1 = "49498bbb2adc333e98bdca4bf6170ae770cbad11",
)
maven_jar(
name = "lucene_spatial",
artifact = "org.apache.lucene:lucene-spatial:" + LUCENE_VERS,
- sha1 = "8ed7a9a43d78222038573dd1c295a61f3c0bb0db",
+ sha1 = "0217d302dc0ef4d9b8b475ffe327d83c1e0ceba5",
)
maven_jar(
name = "lucene_suggest",
artifact = "org.apache.lucene:lucene-suggest:" + LUCENE_VERS,
- sha1 = "e8316b37dddcf2092a54dab2ce6aad0d5ad78585",
+ sha1 = "0f46dbb3229eed62dff10d008172c885e0e028c8",
)
maven_jar(
name = "lucene_queries",
artifact = "org.apache.lucene:lucene-queries:" + LUCENE_VERS,
- sha1 = "692f1ad887cf4e006a23f45019e6de30f3312d3f",
+ sha1 = "f915357b8b4b43742ab48f1401dedcaa12dfa37a",
)
maven_jar(
@@ -925,8 +925,8 @@
maven_jar(
name = "elasticsearch",
- artifact = "org.elasticsearch:elasticsearch:2.4.4",
- sha1 = "e69930bc794c539d34778e665d6f8ccbffd42c6f",
+ artifact = "org.elasticsearch:elasticsearch:2.4.5",
+ sha1 = "daafe48ae06592029a2fedca1fe2ac0f5eec3185",
)
# Java REST client for Elasticsearch.
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
index 2282c79..d197a2c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
@@ -517,8 +517,7 @@
Collection<String> stars = cd.stars(user.getAccountId());
out.starred = stars.contains(StarredChangesUtil.DEFAULT_LABEL) ? true : null;
out.muted =
- stars.contains(
- StarredChangesUtil.MUTE_LABEL + "/" + cd.currentPatchSet().getPatchSetId())
+ stars.contains(StarredChangesUtil.MUTE_LABEL + "/" + cd.currentPatchSet().getPatchSetId())
? true
: null;
if (!stars.isEmpty()) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Mergeable.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Mergeable.java
index e5f9352..69f26b2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Mergeable.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Mergeable.java
@@ -25,6 +25,7 @@
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.reviewdb.server.ReviewDbUtil;
+import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.git.BranchOrderSection;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.MergeUtil;
@@ -98,7 +99,7 @@
MergeableInfo result = new MergeableInfo();
if (!change.getStatus().isOpen()) {
- throw new ResourceConflictException("change is " + Submit.status(change));
+ throw new ResourceConflictException("change is " + ChangeUtil.status(change));
} else if (!ps.getId().equals(change.currentPatchSetId())) {
// Only the current revision is mergeable. Others always fail.
return result;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Move.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Move.java
index fb6ae0b..ec494ce 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Move.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Move.java
@@ -33,6 +33,7 @@
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ChangeMessagesUtil;
+import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.PatchSetUtil;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.notedb.ChangeUpdate;
@@ -115,7 +116,7 @@
throws OrmException, ResourceConflictException, RepositoryNotFoundException, IOException {
change = ctx.getChange();
if (change.getStatus() != Status.NEW && change.getStatus() != Status.DRAFT) {
- throw new ResourceConflictException("Change is " + status(change));
+ throw new ResourceConflictException("Change is " + ChangeUtil.status(change));
}
Project.NameKey projectKey = change.getProject();
@@ -182,8 +183,4 @@
return true;
}
}
-
- private static String status(Change change) {
- return change != null ? change.getStatus().name().toLowerCase() : "deleted";
- }
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
index 32dbcda..5933b19 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
@@ -34,6 +34,7 @@
import com.google.gerrit.server.ApprovalCopier;
import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.ChangeMessagesUtil;
+import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.PatchSetUtil;
import com.google.gerrit.server.ReviewerSet;
import com.google.gerrit.server.events.CommitReceivedEvent;
@@ -224,7 +225,7 @@
throw new ResourceConflictException(
String.format(
"Cannot create new patch set of change %s because it is %s",
- change.getId(), change.getStatus().name().toLowerCase()));
+ change.getId(), ChangeUtil.status(change)));
}
List<String> newGroups = groups;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PreviewSubmit.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PreviewSubmit.java
index 42dba3f..a074818 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PreviewSubmit.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PreviewSubmit.java
@@ -27,6 +27,7 @@
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.change.LimitedByteArrayOutputStream.LimitExceededException;
import com.google.gerrit.server.config.GerritServerConfig;
@@ -96,7 +97,7 @@
Change change = rsrc.getChange();
if (!change.getStatus().isOpen()) {
- throw new PreconditionFailedException("change is " + Submit.status(change));
+ throw new PreconditionFailedException("change is " + ChangeUtil.status(change));
}
ChangeControl control = rsrc.getControl();
if (!control.getUser().isIdentifiedUser()) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java
index 2f20f58..b866489 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java
@@ -31,6 +31,7 @@
import com.google.gerrit.reviewdb.client.Change.Status;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.PatchSetUtil;
import com.google.gerrit.server.change.RebaseUtil.Base;
import com.google.gerrit.server.git.GitRepositoryManager;
@@ -101,7 +102,7 @@
updateFactory.create(
dbProvider.get(), change.getProject(), rsrc.getUser(), TimeUtil.nowTs())) {
if (!change.getStatus().isOpen()) {
- throw new ResourceConflictException("change is " + change.getStatus().name().toLowerCase());
+ throw new ResourceConflictException("change is " + ChangeUtil.status(change));
} else if (!hasOneParent(rw, rsrc.getPatchSet())) {
throw new ResourceConflictException(
"cannot rebase merge commits or commit with no ancestor");
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Restore.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Restore.java
index aa3f56d..b362472 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Restore.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Restore.java
@@ -28,6 +28,7 @@
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ChangeMessagesUtil;
+import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.PatchSetUtil;
import com.google.gerrit.server.extensions.events.ChangeRestored;
import com.google.gerrit.server.mail.send.ReplyToChangeSender;
@@ -109,7 +110,7 @@
public boolean updateChange(ChangeContext ctx) throws OrmException, ResourceConflictException {
change = ctx.getChange();
if (change == null || change.getStatus() != Status.ABANDONED) {
- throw new ResourceConflictException("change is " + status(change));
+ throw new ResourceConflictException("change is " + ChangeUtil.status(change));
}
PatchSet.Id psId = change.currentPatchSetId();
ChangeUpdate update = ctx.getUpdate(psId);
@@ -157,8 +158,4 @@
rsrc.getChange().getStatus() == Status.ABANDONED
&& rsrc.permissions().database(dbProvider).testOrFalse(ChangePermission.RESTORE));
}
-
- private static String status(Change change) {
- return change != null ? change.getStatus().name().toLowerCase() : "deleted";
- }
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java
index 1d69a7b..14e55c5 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java
@@ -34,6 +34,7 @@
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.ChangeMessagesUtil;
+import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.GerritPersonIdent;
import com.google.gerrit.server.PatchSetUtil;
@@ -133,7 +134,7 @@
if (!refControl.canUpload()) {
throw new AuthException("revert not permitted");
} else if (change.getStatus() != Status.MERGED) {
- throw new ResourceConflictException("change is " + status(change));
+ throw new ResourceConflictException("change is " + ChangeUtil.status(change));
}
Change.Id revertedChangeId = revert(req.getControl(), Strings.emptyToNull(input.message));
@@ -233,10 +234,6 @@
&& resource.getControl().getRefControl().canUpload());
}
- private static String status(Change change) {
- return change != null ? change.getStatus().name().toLowerCase() : "deleted";
- }
-
private class NotifyOp implements BatchUpdateOp {
private final Change change;
private final ChangeInserter ins;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java
index 419d7ab..3e489da 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java
@@ -40,6 +40,7 @@
import com.google.gerrit.reviewdb.client.RevId;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ChangeMessagesUtil;
+import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.PatchSetUtil;
@@ -210,7 +211,7 @@
Change change = rsrc.getChange();
if (!change.getStatus().isOpen()) {
- throw new ResourceConflictException("change is " + status(change));
+ throw new ResourceConflictException("change is " + ChangeUtil.status(change));
} else if (!ProjectUtil.branchExists(repoManager, change.getDest())) {
throw new ResourceConflictException(
String.format("destination branch \"%s\" not found.", change.getDest().get()));
@@ -244,7 +245,7 @@
case ABANDONED:
case DRAFT:
default:
- throw new ResourceConflictException("change is " + status(change));
+ throw new ResourceConflictException("change is " + ChangeUtil.status(change));
}
}
@@ -404,10 +405,6 @@
.orNull();
}
- static String status(Change change) {
- return change != null ? change.getStatus().name().toLowerCase() : "deleted";
- }
-
public Collection<ChangeData> unmergeableChanges(ChangeSet cs) throws OrmException, IOException {
Set<ChangeData> mergeabilityMap = new HashSet<>();
for (ChangeData change : cs.changes()) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/AbandonOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/AbandonOp.java
index c5376fd..f4185c9 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/AbandonOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/AbandonOp.java
@@ -25,6 +25,7 @@
import com.google.gerrit.reviewdb.client.ChangeMessage;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.server.ChangeMessagesUtil;
+import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.PatchSetUtil;
import com.google.gerrit.server.extensions.events.ChangeAbandoned;
import com.google.gerrit.server.mail.send.AbandonedSender;
@@ -96,7 +97,7 @@
PatchSet.Id psId = change.currentPatchSetId();
ChangeUpdate update = ctx.getUpdate(psId);
if (!change.getStatus().isOpen()) {
- throw new ResourceConflictException("change is " + status(change));
+ throw new ResourceConflictException("change is " + ChangeUtil.status(change));
} else if (change.getStatus() == Change.Status.DRAFT) {
throw new ResourceConflictException("draft changes cannot be abandoned");
}
@@ -137,8 +138,4 @@
}
changeAbandoned.fire(change, patchSet, account, msgTxt, ctx.getWhen(), notifyHandling);
}
-
- private static String status(Change change) {
- return change != null ? change.getStatus().name().toLowerCase() : "deleted";
- }
}
