Git support: first steps

Author: wilzbach

source/dlangbot/app.d

@@ -114,8 +114,16 @@ void githubHook(HTTPServerRequest req, HTTPServerResponse res)
                 action = "merged";
             goto case;
         case "opened", "reopened", "synchronize", "labeled", "edited":
-
             auto pullRequest = json["pull_request"].deserializeJson!PullRequest;
+            if (action == "labeled")
+            {
+                if (json["label"]["name"].get!string == "bot-rebase")
+                {
+                    import dlangbot.git : rebase;
+                    runTaskHelper(&rebase, &pullRequest);
+                    return res.writeBody("handled");
+                }
+            }
             runTaskHelper(&handlePR, action, &pullRequest);
             return res.writeBody("handled");
         default:

source/dlangbot/git.d

@@ -0,0 +1,55 @@
+module dlangbot.git;
+
+import std.conv, std.file, std.path, std.string, std.uuid;
+import std.format, std.stdio;
+
+import dlangbot.github;
+import vibe.core.log;
+
+string gitURL = "http://0.0.0.0:9006";
+
+void rebase(PullRequest* pr)
+{
+    import std.process;
+    auto uniqDir = tempDir.buildPath("dlang-bot-git", randomUUID.to!string.replace("-", ""));
+    uniqDir.mkdirRecurse;
+    scope(exit) uniqDir.rmdirRecurse;
+
+    auto targetBranch = pr.base.ref_;
+    auto remoteDir = pr.repoURL;
+
+    logInfo("[git/%s]: cloning branch %s...", pr.repoSlug, targetBranch);
+    auto pid = spawnShell("git clone -b %s %s %s".format(targetBranch, remoteDir, uniqDir));
+    pid.wait;
+
+    //auto git = "git -C %s ".format(uniqDir);
+    //logInfo("[git/%s]: fetching repo...", pr.repoSlug);
+    //pid = spawnShell(git ~ "fetch origin pull/%s/head:pr-%1$s".format(pr.number));
+    //pid.wait;
+    //logInfo("[git/%s]: switching to PR branch...", pr.repoSlug);
+    //pid = spawnShell(git ~ "checkout pr-%s".format(pr.number));
+    //pid.wait;
+    //logInfo("[git/%s]: rebasing...", pr.repoSlug);
+    //pid = spawnShell(git ~ "rebase " ~ targetBranch);
+    //pid.wait;
+
+    import std.net.curl, std.json;
+    auto headSlug = pr.head.repo.fullName;
+    auto headRef = pr.head.ref_;
+    auto sep = gitURL.startsWith("http") ? "/" : ":";
+    logInfo("[git/%s]: pushing... to %s", pr.repoSlug, gitURL);
+
+    // TODO: use --force here
+    auto cmd = "git push -vv %s%s%s HEAD:%s".format(gitURL, sep, headSlug, headRef);
+    writeln("CMD");
+    uniqDir.writeln;
+    cmd.writeln;
+    writeln("CMD");
+
+    pid = spawnShell(cmd);
+    //pid.wait;
+    import vibe.core.core;
+    import core.time;
+    sleep(60.seconds);
+    pid.wait;
+}

source/dlangbot/github.d

@@ -1,5 +1,6 @@
 module dlangbot.github;
 
+string githubURL = "https://github.com";
 import dlangbot.bugzilla : bugzillaURL, Issue, IssueRef;
 import dlangbot.warnings : printMessages, UserMessage;
 

source/dlangbot/github_api.d

@@ -1,5 +1,6 @@
 module dlangbot.github_api;
 
+string githubURL = "https://github.com";
 string githubAPIURL = "https://api.github.com";
 string githubAuth, hookSecret;
 
@@ -126,7 +127,7 @@ struct PullRequest
     alias repoSlug = baseRepoSlug;
     bool isOpen() const { return state == State.open; }
 
-    string htmlURL() const { return "https://github.com/%s/pull/%d".format(repoSlug, number); }
+    string htmlURL() const { return "%s/%s/pull/%d".format(githubURL, repoSlug, number); }
     string commentsURL() const { return "%s/repos/%s/issues/%d/comments".format(githubAPIURL, repoSlug, number); }
     string commitsURL() const { return "%s/repos/%s/pulls/%d/commits".format(githubAPIURL, repoSlug, number); }
     string eventsURL() const { return "%s/repos/%s/issues/%d/events".format(githubAPIURL, repoSlug, number); }
@@ -135,6 +136,7 @@ struct PullRequest
     string mergeURL() const { return "%s/repos/%s/pulls/%d/merge".format(githubAPIURL, repoSlug, number); }
     string statusURL() const { return "%s/repos/%s/status/%s".format(githubAPIURL, repoSlug, head.sha); }
     string membersURL() const { return "%s/orgs/%s/public_members".format(githubAPIURL, base.repo.owner.login); }
+    string repoURL() const { return "%s/%s".format(githubURL, repoSlug); }
 
     string pid() const
     {

test/git.d

@@ -0,0 +1,34 @@
+import utils;
+
+// send rebase label
+unittest
+{
+    setAPIExpectations();
+    import std.stdio;
+
+    // first request by the git client
+    // server returns a list of all refs it knows
+    gitInfoRefs = (string user, string repo) {
+        "requesting refs".writeln;
+        return [
+            GitInfoRef("6ed2e15cf4a35e274adb8385b3ee8125326509f9", "refs/heads/foo"),
+            GitInfoRef("6e79d22fdfda446601d969ce77e406b9a5506de9", "refs/heads/Issue_8573"),
+            GitInfoRef("6e79d22fdfda446601d969ce77e406b9a5506de8", "refs/heads/master"),
+        ];
+    };
+
+
+    // git client "reports" new refs to the server
+    gitReportRefs = (ClientReq clientReq) {
+        clientReq.writeln;
+        return [
+            GitReportRef(GitReportRef.status.ok, "refs/heads/Issue_8573")
+        ];
+    };
+
+    postGitHubHook("dlang_phobos_label_4921.json", "pull_request",
+        (ref Json j, scope HTTPClientRequest req){
+            j["pull_request"]["state"] = "open";
+            j["label"]["name"] = "bot-rebase";
+    }.toDelegate);
+}