opendev/gerrit
Code Issues Proposed changes

CherryPick: Wrap long lines

Browse Source 
Change-Id: Id10266c6f10f13f31ad08dfe6317a4b710b56134
This commit is contained in:
Dave Borowitz
2015-02-13 15:53:23 -08:00
parent 23161c906f
commit da0f9f405a
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java
View File

@@ -107,7 +107,8 @@ public class CherryPick extends SubmitStrategy {
// taking the delta relative to that one parent and redoing
// that on the current merge tip.
try {
CodeReviewCommit merge = writeCherryPickCommit(mergeTip.getCurrentTip(), n);
CodeReviewCommit merge =
writeCherryPickCommit(mergeTip.getCurrentTip(), n);
mergeTip.moveTipTo(merge, merge.getName());
newCommits.put(mergeTip.getCurrentTip().getPatchsetId()
.getParentKey(), mergeTip.getCurrentTip());
@@ -193,8 +194,8 @@ public class CherryPick extends SubmitStrategy {
args.db.changes().update(Collections.singletonList(n.change()));
List<PatchSetApproval> approvals = Lists.newArrayList();
for (PatchSetApproval a
: args.approvalsUtil.byPatchSet(args.db, n.getControl(), n.getPatchsetId())) {
for (PatchSetApproval a : args.approvalsUtil.byPatchSet(
args.db, n.getControl(), n.getPatchsetId())) {
approvals.add(new PatchSetApproval(ps.getId(), a));
}
args.db.patchSetApprovals().insert(approvals);
@@ -218,14 +219,15 @@ public class CherryPick extends SubmitStrategy {
newCommit.copyFrom(n);
newCommit.setStatusCode(CommitMergeStatus.CLEAN_PICK);
newCommit.setControl(args.changeControlFactory.controlFor(n.change(), cherryPickUser));
newCommit.setControl(
args.changeControlFactory.controlFor(n.change(), cherryPickUser));
newCommits.put(newCommit.getPatchsetId().getParentKey(), newCommit);
setRefLogIdent(submitAudit);
return newCommit;
}
private static void insertAncestors(ReviewDb db, PatchSet.Id id, RevCommit src)
throws OrmException {
private static void insertAncestors(ReviewDb db, PatchSet.Id id,
RevCommit src) throws OrmException {
int cnt = src.getParentCount();
List<PatchSetAncestor> toInsert = new ArrayList<>(cnt);
for (int p = 0; p < cnt; p++) {