InlineEdit: Perform some clean up
Remove some unused variables. Also convert output of abbreviate()
method to string before passing it to String.format() method.
Change-Id: I667fd218457b27d483debf30d494ce5e59b7b494
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditModifier.java b/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditModifier.java
index b6e8991..2284087 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditModifier.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditModifier.java
@@ -119,7 +119,7 @@
ps.getRevision().get()));
ObjectId commit = createCommit(me, inserter, base, base, base.getTree());
inserter.flush();
- return update(repo, me, refName, rw, base, ObjectId.zeroId(), commit);
+ return update(repo, me, refName, rw, ObjectId.zeroId(), commit);
} finally {
rw.release();
inserter.release();
@@ -197,11 +197,6 @@
RevCommit base = rw.parseCommit(ObjectId.fromString(
basePs.getRevision().get()));
- ObjectId oldObjectId = prevEdit;
- if (prevEdit == null) {
- prevEdit = base;
- oldObjectId = ObjectId.zeroId();
- }
ObjectId newTree = writeNewTree(op, repo, rw, inserter,
prevEdit, reader, file, content, base);
if (ObjectId.equals(newTree, prevEdit.getTree())) {
@@ -210,7 +205,7 @@
ObjectId commit = createCommit(me, inserter, prevEdit, base, newTree);
inserter.flush();
- return update(repo, me, refName, rw, base, oldObjectId, commit);
+ return update(repo, me, refName, rw, prevEdit, commit);
} finally {
rw.release();
inserter.release();
@@ -233,8 +228,8 @@
}
private RefUpdate.Result update(Repository repo, IdentifiedUser me,
- String refName, RevWalk rw, RevCommit base,
- ObjectId oldObjectId, ObjectId newEdit) throws IOException {
+ String refName, RevWalk rw, ObjectId oldObjectId, ObjectId newEdit)
+ throws IOException {
RefUpdate ru = repo.updateRef(refName);
ru.setExpectedOldObjectId(oldObjectId);
ru.setNewObjectId(newEdit);
@@ -269,15 +264,13 @@
RevCommit base, DirCacheEditor dce, ObjectInserter ins, String path,
byte[] content) throws IOException, InvalidChangeOperationException {
switch (op) {
+ case DELETE_ENTRY:
+ dce.add(new DeletePath(path));
+ break;
case CHANGE_ENTRY:
case RESTORE_ENTRY:
dce.add(getPathEdit(op, repo, rw, base, path, ins, content));
break;
- case DELETE_ENTRY:
- dce.add(new DeletePath(path));
- break;
- default:
- throw new IllegalStateException("unknown tree operation");
}
dce.finish();
}
@@ -311,7 +304,7 @@
if (tw == null) {
throw new InvalidChangeOperationException(String.format(
"cannot restore path %s: missing in base revision %s",
- path, base.abbreviate(8)));
+ path, base.abbreviate(8).name()));
}
return tw.getObjectId(0);
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java
index 5934df6..cf0785f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java
@@ -215,12 +215,12 @@
if (r.isEmpty()) {
throw new InvalidChangeOperationException(String.format(
"patch set %s change edit is based on doesn't exist",
- rev.abbreviate(8)));
+ rev.abbreviate(8).name()));
}
if (r.size() > 1) {
throw new InvalidChangeOperationException(String.format(
"multiple patch sets for change edit parent %s",
- rev.abbreviate(8)));
+ rev.abbreviate(8).name()));
}
PatchSet parentPatchSet = Iterables.getOnlyElement(r);
if (!edit.getChange().getId().equals(
