opendev/gerrit
Code Issues Proposed changes

RebaseChange: Tidy up rebase method

Browse Source 
First and foremost fix the incorrect @throws declaration. Slightly
reword others, remove unnecessary finals, and use consistent
capitalization and punctuation.

Change-Id: I31981f7df561f22b2be6c8aaf25bdef7ae5131b3
This commit is contained in:
Dave Borowitz
2014-12-19 11:03:23 -08:00
parent 93eaa3d419
commit d07337d9a7
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java
View File

@@ -323,31 +323,28 @@ public class RebaseChange {
} }
/** /**
* Rebases a commit. * Rebase a commit.
* *
* @param git repository to find commits in * @param git repository to find commits in.
* @param inserter inserter to handle new trees and blobs * @param inserter inserter to handle new trees and blobs.
* @param original The commit to rebase * @param original the commit to rebase.
* @param base Base to rebase against * @param base base to rebase against.
* @param mergeUtil merge utilities for the destination project * @param mergeUtil merge utilities for the destination project.
* @param committerIdent committer identity * @param committerIdent committer identity.
* @return the id of the rebased commit * @return the id of the rebased commit.
* @throws IOException Merged failed * @throws MergeConflictException the rebase failed due to a merge conflict.
* @throws PathConflictException the rebase failed due to a path conflict * @throws IOException the merge failed for another reason.
*/ */
private ObjectId rebaseCommit(final Repository git, private ObjectId rebaseCommit(Repository git, ObjectInserter inserter,
final ObjectInserter inserter, final RevCommit original, RevCommit original, RevCommit base, MergeUtil mergeUtil,
final RevCommit base, final MergeUtil mergeUtil, PersonIdent committerIdent) throws MergeConflictException, IOException {
final PersonIdent committerIdent) throws IOException, RevCommit parentCommit = original.getParent(0);
MergeConflictException {
final RevCommit parentCommit = original.getParent(0);
if (base.equals(parentCommit)) { if (base.equals(parentCommit)) {
throw new IOException("Change is already up to date."); throw new IOException("Change is already up to date.");
} }
final ThreeWayMerger merger = mergeUtil.newThreeWayMerger(git, inserter); ThreeWayMerger merger = mergeUtil.newThreeWayMerger(git, inserter);
merger.setBase(parentCommit); merger.setBase(parentCommit);
merger.merge(original, base); merger.merge(original, base);
@@ -356,13 +353,13 @@ public class RebaseChange {
"The change could not be rebased due to a conflict during merge."); "The change could not be rebased due to a conflict during merge.");
} }
final CommitBuilder cb = new CommitBuilder(); CommitBuilder cb = new CommitBuilder();
cb.setTreeId(merger.getResultTreeId()); cb.setTreeId(merger.getResultTreeId());
cb.setParentId(base); cb.setParentId(base);
cb.setAuthor(original.getAuthorIdent()); cb.setAuthor(original.getAuthorIdent());
cb.setMessage(original.getFullMessage()); cb.setMessage(original.getFullMessage());
cb.setCommitter(committerIdent); cb.setCommitter(committerIdent);
final ObjectId objectId = inserter.insert(cb); ObjectId objectId = inserter.insert(cb);
inserter.flush(); inserter.flush();
return objectId; return objectId;
} }