Merge "Improve info returned when listing imported projects"
diff --git a/BUCK b/BUCK
index a9ba580..8f8013f 100644
--- a/BUCK
+++ b/BUCK
@@ -25,6 +25,10 @@
HTTP_LIB,
GSON,
],
+ provided_deps = [
+ '//lib/commons:validator',
+ '//lib/log:log4j'
+ ],
)
# this is required for bucklets/tools/eclipse/project.py to work
diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/GitFetchStep.java b/src/main/java/com/googlesource/gerrit/plugins/importer/GitFetchStep.java
index 97461fa..22404a4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/GitFetchStep.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/GitFetchStep.java
@@ -16,7 +16,6 @@
import static com.googlesource.gerrit.plugins.importer.ProgressMonitorUtil.updateAndEnd;
-import com.google.gerrit.reviewdb.client.Project;
import com.google.inject.Singleton;
import org.eclipse.jgit.api.Git;
@@ -24,9 +23,9 @@
import org.eclipse.jgit.api.errors.InvalidRemoteException;
import org.eclipse.jgit.api.errors.TransportException;
import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.ProgressMonitor;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.RefUpdate;
-import org.eclipse.jgit.lib.ProgressMonitor;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.transport.CredentialsProvider;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
@@ -37,8 +36,7 @@
@Singleton
class GitFetchStep {
- void fetch(String user, String password, Repository repo,
- Project.NameKey name, ProgressMonitor pm)
+ void fetch(String user, String password, Repository repo, ProgressMonitor pm)
throws InvalidRemoteException, TransportException, GitAPIException,
IOException {
pm.beginTask("Fetch project", 1);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/ImportProject.java b/src/main/java/com/googlesource/gerrit/plugins/importer/ImportProject.java
index 95cb2b6..1df8dbc 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ImportProject.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ImportProject.java
@@ -147,7 +147,7 @@
try {
ImportJson.persist(lockFile, importJson.format(input), pm);
configRepoStep.configure(repo, project, input.from, pm);
- gitFetchStep.fetch(input.user, input.pass, repo, project, pm);
+ gitFetchStep.fetch(input.user, input.pass, repo, pm);
configProjectStep.configure(project, parent, pm);
replayChangesFactory.create(input.from, input.user, input.pass, repo,
project, pm)
