| commit | bee66db39c3e3fb1787c5e7fa0c35db7ac4a2168 | [log] [tgz] |
|---|---|---|
| author | Christian Aistleitner <christian@quelltextlich.at> | Sat Oct 17 20:16:07 2015 +0200 |
| committer | Christian Aistleitner <christian@quelltextlich.at> | Sat Oct 17 20:24:19 2015 +0200 |
| tree | f194e427b1e4e3678206e3204720742216dc7fa6 | |
| parent | 1092e2c17da8377cbd320c409e1849344546cab4 [diff] |
Follow upstream's change of PatchSetInfoFactory's get method Gerrit core changed the signature of PatchSetInfoFactory's get method to additionally require a RevWalk [1], which made compiling against current master fail [2]. Hence, we now pass the needed RevWalk to again allow compilation against current master. [1] Commit b9805aee6dfe73b79269f5f0915a79ae0709cf32 [2] See http://builds.quelltextlich.at/gerrit/nightly/master/latest/importer.jar.build.stderr.txt http://builds.quelltextlich.at/gerrit/nightly/master/latest/index.html#importer.jar Error message is (re-formatted to fit the commit message): [...]/ReplayRevisionsStep.java:128: error: no suitable method found for get([...].RevCommit,[...].PatchSet.Id) info = patchSetInfoFactory.get(commit, ps.getId()); ^ Bug: Issue 3615 Change-Id: Idf45020d6fdd3f8ad87d6e015c3e992c11c46291
diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayRevisionsStep.java b/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayRevisionsStep.java index aa986cd..b4184b1 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayRevisionsStep.java +++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayRevisionsStep.java
@@ -125,7 +125,7 @@ ps.setRevision(new RevId(commit.name())); ps.setDraft(r.draft != null && r.draft); - info = patchSetInfoFactory.get(commit, ps.getId()); + info = patchSetInfoFactory.get(rw, commit, ps.getId()); if (info.getRevId().equals(changeInfo.currentRevision)) { change.setCurrentPatchSet(info); }