Skip to content

Commit

Permalink
git-sync should use APIs to find upstream
Browse files Browse the repository at this point in the history 
Reviewed-by: rwestberg
  • Loading branch information
@edvbld
edvbld committed Nov 22, 2019
1 parent 6bea8f3 commit 2f8cfc9
Show file tree
Hide file tree
Showing 15 changed files with 72 additions and 26 deletions.
8 changes: 6 additions & 2 deletions bot/src/main/java/org/openjdk/skara/bot/BotRunnerConfiguration.java
View file
Expand Up @@ -154,7 +154,9 @@ private Map<String, HostedRepository> parseRepositories(JSONObject config) throw
throw new ConfigurationError("Repository " + entry.name() + " uses undefined host '" + hostName + "'");
}
var host = repositoryHosts.get(hostName);
var repo = host.repository(entry.value().get("repository").asString());
var repo = host.repository(entry.value().get("repository").asString()).orElseThrow(() ->
new ConfigurationError("Repository " + entry.value().get("repository").asString() + " is not available at " + hostName)
);
ret.put(entry.name(), repo);
}

Expand All @@ -181,7 +183,9 @@ private RepositoryEntry parseRepositoryEntry(String entry) throws ConfigurationE
throw new ConfigurationError("Repository entry " + entry + " uses undefined host '" + hostName + "'");
}
var repositoryName = entry.substring(hostSeparatorIndex + 1);
ret.repository = host.repository(repositoryName);
ret.repository = host.repository(repositoryName).orElseThrow(() ->
new ConfigurationError("Repository " + repositoryName + " is not available at " + hostName)
);
} else {
if (!repositories.containsKey(entry)) {
throw new ConfigurationError("Repository " + entry + " is not defined!");
Expand Down
4 changes: 3 additions & 1 deletion bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
View file
Expand Up @@ -137,7 +137,9 @@ private List<String> botSpecificChecks() throws IOException {
var sourceBranch = mergeSourceBranch();
if (sourceBranch.isPresent() && sourceRepo.isPresent()) {
try {
var mergeSourceRepo = pr.repository().forge().repository(sourceRepo.get());
var mergeSourceRepo = pr.repository().forge().repository(sourceRepo.get()).orElseThrow(() ->
new RuntimeException("Could not find repository " + sourceRepo.get())
);
try {
var sourceHash = prInstance.localRepo().fetch(mergeSourceRepo.url(), sourceBranch.get());
if (!prInstance.localRepo().isAncestor(commits.get(1).hash(), sourceHash)) {
Expand Down
4 changes: 2 additions & 2 deletions bots/tester/src/test/java/org/openjdk/skara/bots/tester/InMemoryHost.java
View file
Expand Up @@ -37,8 +37,8 @@ public boolean isValid() {
}

@Override
public HostedRepository repository(String name) {
return null;
public Optional<HostedRepository> repository(String name) {
return Optional.empty();
}

@Override
Expand Down
5 changes: 4 additions & 1 deletion cli/src/main/java/org/openjdk/skara/cli/GitFork.java
View file
Expand Up @@ -157,7 +157,10 @@ public static void main(String[] args) throws IOException {
path = path.substring(1);
}

var fork = host.get().repository(path).fork();
var hostedRepo = host.get().repository(path).orElseThrow(() ->
new IOException("Could not find repository at " + uri.toString())
);
var fork = hostedRepo.fork();

if (token == null) {
GitCredentials.approve(credentials);
Expand Down
12 changes: 9 additions & 3 deletions cli/src/main/java/org/openjdk/skara/cli/GitPr.java
View file
Expand Up @@ -108,7 +108,9 @@ private static HostedRepository getHostedRepositoryFor(URI uri, GitCredentials c
if (host.isEmpty() || !host.get().isValid()) {
exit("error: failed to connect to host " + uri);
}
var remoteRepo = host.get().repository(projectName(uri));
var remoteRepo = host.get().repository(projectName(uri)).orElseThrow(() ->
new IOException("Could not find repository at: " + uri.toString())
);
var parentRepo = remoteRepo.parent();
var targetRepo = parentRepo.isPresent() ? parentRepo.get() : remoteRepo;
return targetRepo;
Expand Down Expand Up @@ -418,7 +420,9 @@ public static void main(String[] args) throws IOException, InterruptedException
System.exit(1);
}

var remoteRepo = host.get().repository(projectName(uri));
var remoteRepo = host.get().repository(projectName(uri)).orElseThrow(() ->
new IOException("Could not find repository at " + uri.toString())
);
if (token == null) {
GitCredentials.approve(credentials);
}
Expand Down Expand Up @@ -575,7 +579,9 @@ public static void main(String[] args) throws IOException, InterruptedException
System.exit(1);
}

var remoteRepo = host.get().repository(projectName(uri));
var remoteRepo = host.get().repository(projectName(uri)).orElseThrow(() ->
new IOException("Could not find repository at " + uri.toString())
);
if (token == null) {
GitCredentials.approve(credentials);
}
Expand Down
24 changes: 22 additions & 2 deletions cli/src/main/java/org/openjdk/skara/cli/GitSync.java
View file
Expand Up @@ -24,9 +24,11 @@

import org.openjdk.skara.args.*;
import org.openjdk.skara.vcs.*;
import org.openjdk.skara.forge.*;
import org.openjdk.skara.proxy.HttpProxy;

import java.io.*;
import java.net.URI;
import java.net.*;
import java.nio.file.*;
import java.util.*;
import java.util.logging.*;
Expand Down Expand Up @@ -101,6 +103,8 @@ public static void main(String[] args) throws IOException, InterruptedException
die("error: no repository found at " + cwd.toString())
);

HttpProxy.setup();

var remotes = repo.remotes();

String upstream = null;
Expand All @@ -111,9 +115,25 @@ public static void main(String[] args) throws IOException, InterruptedException
if (lines.size() == 1 && remotes.contains(lines.get(0))) {
upstream = lines.get(0);
} else {
die("No remote provided to fetch from, please set the --from flag");
if (remotes.contains("origin")) {
var originPullPath = repo.pullPath("origin");
try {
var uri = Remote.toWebURI(originPullPath);
upstream = Forge.from(URI.create(uri.getScheme() + "://" + uri.getHost()))
.flatMap(f -> f.repository(uri.getPath().substring(1)))
.flatMap(r -> r.parent())
.map(p -> p.webUrl().toString())
.orElse(null);
} catch (IllegalArgumentException e) {
upstream = null;
}
}
}
}

if (upstream == null) {
die("Could not find upstream repository, please specify one with --from");
}
var upstreamPullPath = remotes.contains(upstream) ?
Remote.toURI(repo.pullPath(upstream)) : URI.create(upstream);

Expand Down
3 changes: 3 additions & 0 deletions cli/src/main/java/org/openjdk/skara/cli/Remote.java
View file
Expand Up @@ -34,6 +34,9 @@ public static URI toWebURI(String remotePath) throws IOException {
if (remotePath.startsWith("git+")) {
remotePath = remotePath.substring("git+".length());
}
if (remotePath.endsWith(".git")) {
remotePath = remotePath.substring(0, remotePath.length() - ".git".length());
}
if (remotePath.startsWith("http")) {
return URI.create(remotePath);
} else {
Expand Down
2 changes: 1 addition & 1 deletion forge/src/main/java/org/openjdk/skara/forge/Forge.java
View file
Expand Up @@ -30,7 +30,7 @@
import java.util.stream.Collectors;

public interface Forge extends Host {
HostedRepository repository(String name);
Optional<HostedRepository> repository(String name);
boolean supportsReviewBody();

static Forge from(String name, URI uri, Credential credential, JSONObject configuration) {
Expand Down
10 changes: 7 additions & 3 deletions forge/src/main/java/org/openjdk/skara/forge/github/GitHubHost.java
View file
Expand Up @@ -30,7 +30,7 @@
import java.io.IOException;
import java.net.*;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.*;
import java.util.logging.Logger;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -169,8 +169,12 @@ JSONObject runSearch(String query) {
}

@Override
public HostedRepository repository(String name) {
return new GitHubRepository(this, name);
public Optional<HostedRepository> repository(String name) {
try {
return Optional.of(new GitHubRepository(this, name));
} catch (Throwable t) {
return Optional.empty();
}
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion forge/src/main/java/org/openjdk/skara/forge/github/GitHubRepository.java
View file
Expand Up @@ -190,7 +190,7 @@ public Optional<WebHook> parseWebHook(JSONValue body) {
@Override
public HostedRepository fork() {
var response = request.post("forks").execute();
return gitHubHost.repository(response.get("full_name").asString());
return gitHubHost.repository(response.get("full_name").asString()).orElseThrow(RuntimeException::new);
}

@Override
Expand Down
8 changes: 6 additions & 2 deletions forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabHost.java
View file
Expand Up @@ -102,8 +102,12 @@ JSONObject getProjectInfo(String name) {
}

@Override
public HostedRepository repository(String name) {
return new GitLabRepository(this, name);
public Optional<HostedRepository> repository(String name) {
try {
return Optional.of(new GitLabRepository(this, name));
} catch (Throwable t) {
return Optional.empty();
}
}

private HostUser parseUserDetails(JSONObject details) {
Expand Down
2 changes: 1 addition & 1 deletion forge/src/main/java/org/openjdk/skara/forge/gitlab/GitLabRepository.java
View file
Expand Up @@ -235,7 +235,7 @@ public HostedRepository fork() {
e.printStackTrace();
}
}
return gitLabHost.repository(forkedRepoName);
return gitLabHost.repository(forkedRepoName).orElseThrow(RuntimeException::new);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion test/src/main/java/org/openjdk/skara/test/CensusBuilder.java
View file
Expand Up @@ -208,7 +208,7 @@ private void generateVersion(Path folder) throws IOException {
public HostedRepository build() {
try {
var host = TestHost.createNew(List.of(new HostUser(1, "cu", "Census User")));
var repository = host.repository("census");
var repository = host.repository("census").orElseThrow();
var folder = Files.createTempDirectory("censusbuilder");
var localRepository = Repository.init(folder, VCS.GIT);

Expand Down
8 changes: 4 additions & 4 deletions test/src/main/java/org/openjdk/skara/test/HostCredentials.java
View file
Expand Up @@ -91,7 +91,7 @@ public IssueTracker createIssueHost(int userIndex) {

@Override
public HostedRepository getHostedRepository(Forge host) {
return host.repository(config.get("project").asString());
return host.repository(config.get("project").asString()).orElseThrow();
}

@Override
Expand Down Expand Up @@ -128,7 +128,7 @@ public IssueTracker createIssueHost(int userIndex) {

@Override
public HostedRepository getHostedRepository(Forge host) {
return host.repository(config.get("project").asString());
return host.repository(config.get("project").asString()).orElseThrow();
}

@Override
Expand Down Expand Up @@ -165,7 +165,7 @@ public IssueTracker createIssueHost(int userIndex) {

@Override
public HostedRepository getHostedRepository(Forge host) {
return host.repository(config.get("project").asString());
return host.repository(config.get("project").asString()).orElseThrow();
}

@Override
Expand Down Expand Up @@ -209,7 +209,7 @@ public IssueTracker createIssueHost(int userIndex) {

@Override
public HostedRepository getHostedRepository(Forge host) {
return host.repository("test");
return host.repository("test").orElseThrow();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions test/src/main/java/org/openjdk/skara/test/TestHost.java
View file
Expand Up @@ -85,7 +85,7 @@ public boolean isValid() {
}

@Override
public HostedRepository repository(String name) {
public Optional<HostedRepository> repository(String name) {
Repository localRepository;
if (data.repositories.containsKey(name)) {
localRepository = data.repositories.get(name);
Expand All @@ -96,7 +96,7 @@ public HostedRepository repository(String name) {
localRepository = createLocalRepository();
data.repositories.put(name, localRepository);
}
return new TestHostedRepository(this, name, localRepository);
return Optional.of(new TestHostedRepository(this, name, localRepository));
}

@Override
Expand Down

0 comments on commit 2f8cfc9

Please sign in to comment.