opendev/gerrit
Code Issues Proposed changes

InlineEdit: Perform some clean up

Browse Source 
Remove some unused variables.  Also convert output of abbreviate()
method to string before passing it to String.format() method.

Change-Id: I667fd218457b27d483debf30d494ce5e59b7b494
This commit is contained in:
David Ostrovsky
2014-08-10 00:34:46 +02:00
parent da5e5e76a1
commit 2e1c3c5b73
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditModifier.java
View File

@@ -119,7 +119,7 @@ public class ChangeEditModifier {
ps.getRevision().get())); ps.getRevision().get()));
ObjectId commit = createCommit(me, inserter, base, base, base.getTree()); ObjectId commit = createCommit(me, inserter, base, base, base.getTree());
inserter.flush(); inserter.flush();
return update(repo, me, refName, rw, base, ObjectId.zeroId(), commit); return update(repo, me, refName, rw, ObjectId.zeroId(), commit);
} finally { } finally {
rw.release(); rw.release();
inserter.release(); inserter.release();
@@ -197,11 +197,6 @@ public class ChangeEditModifier {
RevCommit base = rw.parseCommit(ObjectId.fromString( RevCommit base = rw.parseCommit(ObjectId.fromString(
basePs.getRevision().get())); basePs.getRevision().get()));
ObjectId oldObjectId = prevEdit;
if (prevEdit == null) {
prevEdit = base;
oldObjectId = ObjectId.zeroId();
}
ObjectId newTree = writeNewTree(op, repo, rw, inserter, ObjectId newTree = writeNewTree(op, repo, rw, inserter,
prevEdit, reader, file, content, base); prevEdit, reader, file, content, base);
if (ObjectId.equals(newTree, prevEdit.getTree())) { if (ObjectId.equals(newTree, prevEdit.getTree())) {
@@ -210,7 +205,7 @@ public class ChangeEditModifier {
ObjectId commit = createCommit(me, inserter, prevEdit, base, newTree); ObjectId commit = createCommit(me, inserter, prevEdit, base, newTree);
inserter.flush(); inserter.flush();
return update(repo, me, refName, rw, base, oldObjectId, commit); return update(repo, me, refName, rw, prevEdit, commit);
} finally { } finally {
rw.release(); rw.release();
inserter.release(); inserter.release();
@@ -233,8 +228,8 @@ public class ChangeEditModifier {
} }
private RefUpdate.Result update(Repository repo, IdentifiedUser me, private RefUpdate.Result update(Repository repo, IdentifiedUser me,
String refName, RevWalk rw, RevCommit base, String refName, RevWalk rw, ObjectId oldObjectId, ObjectId newEdit)
ObjectId oldObjectId, ObjectId newEdit) throws IOException { throws IOException {
RefUpdate ru = repo.updateRef(refName); RefUpdate ru = repo.updateRef(refName);
ru.setExpectedOldObjectId(oldObjectId); ru.setExpectedOldObjectId(oldObjectId);
ru.setNewObjectId(newEdit); ru.setNewObjectId(newEdit);
@@ -269,15 +264,13 @@ public class ChangeEditModifier {
RevCommit base, DirCacheEditor dce, ObjectInserter ins, String path, RevCommit base, DirCacheEditor dce, ObjectInserter ins, String path,
byte[] content) throws IOException, InvalidChangeOperationException { byte[] content) throws IOException, InvalidChangeOperationException {
switch (op) { switch (op) {
case DELETE_ENTRY:
dce.add(new DeletePath(path));
break;
case CHANGE_ENTRY: case CHANGE_ENTRY:
case RESTORE_ENTRY: case RESTORE_ENTRY:
dce.add(getPathEdit(op, repo, rw, base, path, ins, content)); dce.add(getPathEdit(op, repo, rw, base, path, ins, content));
break; break;
case DELETE_ENTRY:
dce.add(new DeletePath(path));
break;
default:
throw new IllegalStateException("unknown tree operation");
} }
dce.finish(); dce.finish();
} }
@@ -311,7 +304,7 @@ public class ChangeEditModifier {
if (tw == null) { if (tw == null) {
throw new InvalidChangeOperationException(String.format( throw new InvalidChangeOperationException(String.format(
"cannot restore path %s: missing in base revision %s", "cannot restore path %s: missing in base revision %s",
path, base.abbreviate(8))); path, base.abbreviate(8).name()));
} }
return tw.getObjectId(0); return tw.getObjectId(0);
} }

4
gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java
View File

@@ -215,12 +215,12 @@ public class ChangeEditUtil {
if (r.isEmpty()) { if (r.isEmpty()) {
throw new InvalidChangeOperationException(String.format( throw new InvalidChangeOperationException(String.format(
"patch set %s change edit is based on doesn't exist", "patch set %s change edit is based on doesn't exist",
rev.abbreviate(8))); rev.abbreviate(8).name()));
} }
if (r.size() > 1) { if (r.size() > 1) {
throw new InvalidChangeOperationException(String.format( throw new InvalidChangeOperationException(String.format(
"multiple patch sets for change edit parent %s", "multiple patch sets for change edit parent %s",
rev.abbreviate(8))); rev.abbreviate(8).name()));
} }
PatchSet parentPatchSet = Iterables.getOnlyElement(r); PatchSet parentPatchSet = Iterables.getOnlyElement(r);
if (!edit.getChange().getId().equals( if (!edit.getChange().getId().equals(