From 4f919ced3614070ccdf46b59bc50b5a0dfc0af20 Mon Sep 17 00:00:00 2001 From: Samuel Shuert Date: Fri, 26 Sep 2025 19:49:46 +0000 Subject: [PATCH] knotserver: add create PR message on git push Change-Id: pylzpxmqulmpyyntlyswrsxkqzkxyvwp Respond to a successful push with a URL to create a PR pointing to the default branch. This behavior is made to mimic other Git forges. Signed-off-by: Samuel Shuert --- knotserver/internal.go | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/knotserver/internal.go b/knotserver/internal.go index fb70c318..db6e5ae1 100644 --- a/knotserver/internal.go +++ b/knotserver/internal.go @@ -15,6 +15,7 @@ import ( "github.com/go-chi/chi/v5/middleware" "tangled.org/core/api/tangled" "tangled.org/core/hook" + "tangled.org/core/idresolver" "tangled.org/core/knotserver/config" "tangled.org/core/knotserver/db" "tangled.org/core/knotserver/git" @@ -111,6 +112,25 @@ func (h *InternalHandle) PostReceiveHook(w http.ResponseWriter, r *http.Request) Messages: make([]string, 0), } + userIdent, err := idresolver.DefaultResolver().ResolveIdent(r.Context(), gitUserDid) + user := gitUserDid + if err != nil { + l.Error("Failed to fetch user identity", "err", err) + // non-fatal + } else { + user = userIdent.Handle.String() + } + gr, err := git.PlainOpen(gitRelativeDir) + if err != nil { + l.Error("Failed to open git repository", "err", err) + return + } + defaultBranch, err := gr.FindMainBranch() + if err != nil { + l.Error("Failed to fetch default branch", "err", err) + return + } + for _, line := range lines { err := h.insertRefUpdate(line, gitUserDid, repoDid, repoName) if err != nil { @@ -118,6 +138,13 @@ func (h *InternalHandle) PostReceiveHook(w http.ResponseWriter, r *http.Request) // non-fatal } + if (line.NewSha.String() != line.OldSha.String()) && line.OldSha.IsZero() && (line.Ref != fmt.Sprint("refs/heads/", defaultBranch)) { + resp.Messages = append(resp.Messages, "​") + resp.Messages = append(resp.Messages, fmt.Sprintf("Create a PR pointing to %s", defaultBranch)) + resp.Messages = append(resp.Messages, fmt.Sprintf("\t%s/@%s/%s/compare/%s...%s", h.c.AppViewEndpoint, user, repoName, defaultBranch, strings.TrimPrefix(line.Ref, "refs/heads/"))) + resp.Messages = append(resp.Messages, "​") + } + err = h.triggerPipeline(&resp.Messages, line, gitUserDid, repoDid, repoName, pushOptions) if err != nil { l.Error("failed to trigger pipeline", "err", err, "line", line, "did", gitUserDid, "repo", gitRelativeDir) -- 2.43.0