opendev/gerrit
Code Issues Proposed changes

Merge "Injecting IdentifiedUser into rebase triggers errors in the MergeQueue"

Browse Source
This commit is contained in:
Edwin Kempin 2013-05-21 12:43:23 +00:00 committed by Gerrit Code Review
commit db7c6e2930
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,6 @@ public class RebaseChange {
private final ChangeHookRunner hooks; private final ChangeHookRunner hooks;
private final MergeUtil.Factory mergeUtilFactory; private final MergeUtil.Factory mergeUtilFactory;
private final ProjectCache projectCache; private final ProjectCache projectCache;
private final IdentifiedUser currentUser;
@Inject @Inject
RebaseChange(final ChangeControl.GenericFactory changeControlFactory, RebaseChange(final ChangeControl.GenericFactory changeControlFactory,
@ -86,8 +85,7 @@ public class RebaseChange {
final RebasedPatchSetSender.Factory rebasedPatchSetSenderFactory, final RebasedPatchSetSender.Factory rebasedPatchSetSenderFactory,
final ChangeHookRunner hooks, final ChangeHookRunner hooks,
final MergeUtil.Factory mergeUtilFactory, final MergeUtil.Factory mergeUtilFactory,
final ProjectCache projectCache, final ProjectCache projectCache) {
final IdentifiedUser currentUser) {
this.changeControlFactory = changeControlFactory; this.changeControlFactory = changeControlFactory;
this.patchSetInfoFactory = patchSetInfoFactory; this.patchSetInfoFactory = patchSetInfoFactory;
this.db = db; this.db = db;
@ -98,7 +96,6 @@ public class RebaseChange {
this.hooks = hooks; this.hooks = hooks;
this.mergeUtilFactory = mergeUtilFactory; this.mergeUtilFactory = mergeUtilFactory;
this.projectCache = projectCache; this.projectCache = projectCache;
this.currentUser = currentUser;
} }
/** /**
@ -156,7 +153,7 @@ public class RebaseChange {
rw.parseCommit(ObjectId.fromString(baseRev)); rw.parseCommit(ObjectId.fromString(baseRev));
PersonIdent committerIdent = PersonIdent committerIdent =
currentUser.newCommitterIdent(myIdent.getWhen(), uploader.newCommitterIdent(myIdent.getWhen(),
myIdent.getTimeZone()); myIdent.getTimeZone());
final PatchSet newPatchSet = final PatchSet newPatchSet =