package server import ( "context" "html/template" "net/http" "sort" "strconv" "strings" "time" "gitlab.com/Timfa/bluegit/internal/access" "gitlab.com/Timfa/bluegit/internal/gitrepo" "gitlab.com/Timfa/bluegit/internal/i18n" "gitlab.com/Timfa/bluegit/internal/markdown" "gitlab.com/Timfa/bluegit/internal/store" ) func (s *Server) compare(w http.ResponseWriter, r *http.Request) { _, repo, role, ok := s.guard(w, r, access.RoleReadonly) if !ok { return } v := s.repoView(w, r, repo, role, "branch.compare") v.Title = s.tr(r, "branch.compare") v.Page = "compare" v.Wide = true s.fillBranchChoices(r, &v, repo) from := safeRev(r.URL.Query().Get("from"), repo.DefaultBranch) to := safeRev(r.URL.Query().Get("to"), "") s.fillCompare(r, &v, repo, from, to) s.render(w, "compare", v) } func (s *Server) newMR(w http.ResponseWriter, r *http.Request) { _, repo, role, ok := s.guard(w, r, access.RoleDeveloper) if !ok { return } if !role.CanWriteCode() { http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden) return } v := s.repoView(w, r, repo, role, "mr.create") v.Title = s.tr(r, "mr.create") v.Page = "newmr" v.Wide = true s.fillBranchChoices(r, &v, repo) source := safeRev(r.URL.Query().Get("source"), "") target := safeRev(r.URL.Query().Get("target"), repo.DefaultBranch) if source == "" { for _, b := range v.Branches { if b.Name != target { source = b.Name break } } } s.fillCompare(r, &v, repo, target, source) v.CompareFrom = source v.CompareTo = target s.fillTpl(r, repo, "mr", &v.FormBody, &v.TplPick, &v.DescTpls) if v.User != nil { v.Fork = s.forkInfo(r.Context(), v.User.ID, repo) if v.Fork.Upstream != nil { up := v.Fork.Upstream v.UpstreamBranches, _ = gitrepo.Branches(r.Context(), s.Git, gitrepo.Dir(s.StoragePath(), up.OwnerPath, up.Name)) } } s.render(w, "newmr", v) } func (s *Server) previewMarkdown(w http.ResponseWriter, r *http.Request) { u, repo, _, ok := s.guard(w, r, access.RoleReadonly) if !ok || !s.csrfOK(w, r) { return } if u.ID == 0 { http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden) return } body := r.FormValue("body") if len(body) > 20000 { body = body[:20000] } w.Header().Set("Content-Type", "text/html; charset=utf-8") _, _ = w.Write([]byte(markdown.RenderTasks(body, "", "", "/"+repo.FullPath(), markdown.Tasks{Count: s.tr(r, "tpl.tasks")}))) } func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) { u, repo, _, ok := s.guard(w, r, access.RoleReadonly) if !ok || !s.csrfOK(w, r) { return } n, err := strconv.ParseInt(r.PathValue("number"), 10, 64) if err != nil { http.NotFound(w, r) return } back := repoURL(repo) + "/-/merge-requests/" + r.PathValue("number") if _, err := s.opUpdateMR(r.Context(), u, repo, n, r.FormValue("title"), r.FormValue("description"), r.FormValue("labels")); !s.uiOK(w, r, back, err) { return } s.redirect(w, r, back, s.tr(r, "flash.mrUpdated"), "") } func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, u store.User) { canText := mr.Status == "open" && u.ID != 0 && (u.ID == mr.AuthorID || v.CanWrite) v.DescHTML = template.HTML(markdown.RenderTasks(mr.Description, "", "", "/"+repo.FullPath(), s.taskOpt(r, v.CSRF, repo, "mr", strconv.FormatInt(mr.Number, 10), canText))) v.Labels = splitLabels(mr.Labels) v.CanEditMR = canText switch r.URL.Query().Get("tab") { case "commits", "pipelines", "changes": v.Tab = r.URL.Query().Get("tab") default: v.Tab = "overview" } s.fillCompare(r, v, repo, mr.TargetBranch, mr.SourceBranch) raw, _ := s.Store.ListNotes(r.Context(), mr.ID) rows := buildNoteRows(raw, s.langOf(r), noteRender{ RepoPath: "/" + repo.FullPath(), Post: repoURL(repo) + "/-/tasks", CSRF: v.CSRF, Count: s.tr(r, "tpl.tasks"), Toggle: s.tr(r, "tpl.toggle"), ViewerID: u.ID, }) v.Notes = stampNotes(v.CommitDiff, rows) s.fillTimeline(r, v, repo, mr, rows) s.fillMRBanner(r, v, repo, mr) } func (s *Server) fillBranchChoices(r *http.Request, v *View, repo store.Repo) { names, _ := s.cBranches(r.Context(), repo) for _, name := range names { v.Branches = append(v.Branches, BranchRow{Name: name, Default: name == repo.DefaultBranch}) } tags, _ := s.cTags(r.Context(), repo) for _, name := range tags { v.Tags = append(v.Tags, TagRow{Name: name}) } } // fillCompare vult commits (from..to) en de three-dot diff (from...to). func (s *Server) fillCompare(r *http.Request, v *View, repo store.Repo, from, to string) { v.CompareFrom = from v.CompareTo = to if from == "" || to == "" || from == to { return } dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name) commits, err := gitrepo.Log(r.Context(), s.Git, dir, from+".."+to, 50) if err == nil && len(commits) > 0 { v.Commits = s.presentCommits(r.Context(), repo.ID, commits, s.langOf(r)) if len(commits) == 1 { v.FormTitle = commits[0].Subject } } if v.FormTitle == "" { v.FormTitle = s.tr(r, "mr.mergeTitle", to, from) } files, err := gitrepo.ComparePatch(r.Context(), s.Git, dir, from, to) if err == nil { v.CommitDiff = presentCommitDiff(repo.FullPath(), to, nil, files) } if stat, err := gitrepo.DiffStat(r.Context(), s.Git, dir, from, to); err == nil { v.Diff = stat } } func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, rows []NoteRow) { lang := s.langOf(r) known := map[string]store.User{} who := func(name string) (string, string) { shown, _, url := s.actorOf(r, name, known) return shown, url } opened, openedURL := who(mr.Author) items := []TimelineItem{{ Kind: "opened", Actor: opened, ActorURL: openedURL, Text: s.tr(r, "mr.opened"), When: i18n.FormatDate(lang, mr.CreatedAt), At: mr.CreatedAt, Rank: 0, }} events, _ := s.Store.ListMREvents(r.Context(), mr.ID) for _, e := range events { key := mrEventKey(e.Kind) if key == "" { continue } actor, actorURL := who(e.Actor) body := e.Body if e.Kind == "merged" && shaLike(strings.TrimSpace(body)) { body = "" } items = append(items, TimelineItem{ Kind: e.Kind, Actor: actor, ActorURL: actorURL, Text: s.tr(r, key), Body: body, When: i18n.FormatDate(lang, e.CreatedAt), At: e.CreatedAt, Rank: 2, }) } revs, _ := s.Store.ListReviews(r.Context(), mr.ID) for _, rev := range revs { actor, actorURL := who(rev.Username) items = append(items, TimelineItem{ Kind: "review", Actor: actor, ActorURL: actorURL, Text: s.tr(r, "rev."+rev.Status), When: i18n.FormatDate(lang, rev.UpdatedAt), At: rev.UpdatedAt, Rank: 3, }) } pipes, _ := s.Store.PipelinesForMR(r.Context(), repo.ID, mr.ID) for _, p := range pipes { jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID) status := displayStatus(p.Status, jobs) label := s.tr(r, "pipe."+status) row := s.pipeRow(r, lang, repo, p, known, s.queueRanks(r.Context())) v.PipeRows = append(v.PipeRows, row) items = append(items, TimelineItem{ Kind: "pipeline", Actor: row.Actor, ActorURL: row.ActorURL, Text: s.tr(r, "mr.pipeEvent", p.ID, label), URL: repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10), When: i18n.FormatDate(lang, p.CreatedAt), At: p.CreatedAt, Rank: 1, }) } for _, n := range rows { if n.ParentID != 0 { continue } item := TimelineItem{ ID: n.ID, Kind: "comment", Actor: n.Author, ActorURL: n.AuthorURL, Text: s.tr(r, "mr.commented"), HTML: n.HTML, When: n.When, At: n.At, Rank: 4, } for _, rp := range n.Replies { item.Replies = append(item.Replies, TimelineItem{Actor: rp.Author, ActorURL: rp.AuthorURL, HTML: rp.HTML, When: rp.When}) } items = append(items, item) } sort.SliceStable(items, func(i, j int) bool { if items[i].At.Equal(items[j].At) { return items[i].Rank < items[j].Rank } return items[i].At.Before(items[j].At) }) v.Timeline = items } func mrEventKey(kind string) string { switch kind { case "pushed": return "mr.pushed" case "retitled": return "mr.retitled" case "relabeled": return "mr.relabeled" case "merged": return "mr.mergedEvent" case "forced": return "mr.forcedEvent" case "closed": return "mr.closedEvent" case "reopened": return "mr.reopenedEvent" default: return "" } } func stampNotes(diff *CommitDiff, rows []NoteRow) []NoteRow { placed := map[int64]bool{} if diff != nil { for i := range diff.Files { for j := range diff.Files[i].Lines { ln := &diff.Files[i].Lines[j] if ln.New == 0 { continue } for _, note := range rows { if note.ParentID != 0 { continue } if note.Path == diff.Files[i].Path && note.End == ln.New { ln.Notes = append(ln.Notes, note) placed[note.ID] = true } } } } } var general []NoteRow for _, note := range rows { if note.ParentID != 0 { continue } if note.Path == "" || !placed[note.ID] { general = append(general, note) } } return general } func splitLabels(raw string) []string { var out []string for _, part := range strings.Split(raw, ",") { part = strings.TrimSpace(part) if part != "" { out = append(out, part) } } return out } func normalizeLabels(raw string) string { return strings.Join(splitLabels(raw), ", ") } func (s *Server) recordMRPushes(repo store.Repo, user store.User, branch, before, after string) { if s.StoragePath() == "" || branch == "" || after == "" { return } ctx := context.Background() mrs, err := s.Store.OpenMergeRequestsBySource(ctx, repo.ID, branch) if err != nil || len(mrs) == 0 { return } dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name) rev := after limit := 1 if before != "" && strings.Trim(before, "0") != "" { rev = before + ".." + after limit = 20 } subjects, err := gitrepo.Subjects(ctx, s.Git, dir, rev, limit) if err != nil || len(subjects) == 0 { return } body := strings.Join(subjects, "\n") for _, mr := range mrs { _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "pushed", body) } } // MRBanner is the header and the counts on a merge request. type MRBanner struct { State, StateLabel string WhenLabel string Author, AuthorURL, Avatar string Initial string CommitPhrase string NCommits, NPipes, NChanges int MergedBy, MergedByURL string MergedDate string MergeSHA, MergeShort string } func (s *Server) fillMRBanner(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest) { lang := s.langOf(r) state := mr.Status if state == "" { state = "open" } label := s.tr(r, "mr.state."+state) if label == "mr.state."+state { label = state } b := &MRBanner{State: state, StateLabel: label} when := mr.CreatedAt whenKey := "mr.when.created" var merger string var mergeAt time.Time var mergeSHA string events, _ := s.Store.ListMREvents(r.Context(), mr.ID) for _, e := range events { if e.Kind != "merged" { continue } merger = e.Actor mergeAt = e.CreatedAt if shaLike(strings.TrimSpace(e.Body)) { mergeSHA = strings.TrimSpace(e.Body) } } switch state { case "merged": whenKey = "mr.when.merged" if !mergeAt.IsZero() { when = mergeAt } else if !mr.UpdatedAt.IsZero() { when = mr.UpdatedAt } b.MergedDate = i18n.FormatDate(lang, when) if merger != "" { b.MergedBy = merger if u, err := s.Store.UserByUsername(r.Context(), merger); err == nil && u.ID != 0 { b.MergedBy = u.Username b.MergedByURL = "/users/" + u.Username } } if mergeSHA == "" { mergeSHA = s.mergeCommitSHA(r.Context(), repo, mr) } if shaLike(mergeSHA) { b.MergeSHA = mergeSHA b.MergeShort = mergeSHA if len(mergeSHA) > 8 { b.MergeShort = mergeSHA[:8] } } case "closed": whenKey = "mr.when.closed" if !mr.UpdatedAt.IsZero() { when = mr.UpdatedAt } } b.WhenLabel = s.tr(r, whenKey, i18n.Ago(lang, when.Unix())) if mr.Author != "" { b.Author = mr.Author b.Initial = initialOf(mr.Author) if u, err := s.Store.UserByUsername(r.Context(), mr.Author); err == nil && u.ID != 0 { b.Author = u.Username b.AuthorURL = "/users/" + u.Username b.Avatar = u.AvatarURL b.Initial = initialOf(u.Username) } } n := s.commitCount(r.Context(), repo, mr.TargetBranch, mr.SourceBranch) if state == "merged" && shaLike(mergeSHA) && (n == 0 || len(v.Commits) == 0 || v.CommitDiff == nil || len(v.CommitDiff.Files) == 0) { if brought := s.fillFromMergeCommit(r, v, repo, mergeSHA); n == 0 && brought > 0 { n = brought } } b.NCommits = n if n == 1 { b.CommitPhrase = s.tr(r, "count.commit.one", n) } else { b.CommitPhrase = s.tr(r, "count.commit.many", n) } b.NPipes = len(v.PipeRows) if v.CommitDiff != nil { b.NChanges = len(v.CommitDiff.Files) } v.Banner = b } func (s *Server) commitCount(ctx context.Context, repo store.Repo, from, to string) int { if s.Git == "" || s.StoragePath() == "" || from == "" || to == "" || from == to { return 0 } dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name) n, err := strconv.Atoi(gitOne(ctx, s.Git, dir, "rev-list", "--count", from+".."+to)) if err != nil || n < 0 { return 0 } return n } // fillFromMergeCommit vult commits en diff vanuit de merge-commit als de bronbranch // al in het doel zit of inmiddels weg is. Het aantal is wat die commit binnenbracht. func (s *Server) fillFromMergeCommit(r *http.Request, v *View, repo store.Repo, sha string) int { if s.Git == "" || s.StoragePath() == "" { return 0 } dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name) parents := strings.Fields(gitOne(r.Context(), s.Git, dir, "rev-list", "--parents", "-n", "1", sha)) if len(parents) < 3 { return 0 } base, tip := parents[1], parents[2] n, err := strconv.Atoi(gitOne(r.Context(), s.Git, dir, "rev-list", "--count", base+".."+tip)) if err != nil || n < 0 { n = 0 } if len(v.Commits) == 0 { if commits, err := gitrepo.Log(r.Context(), s.Git, dir, base+".."+tip, 50); err == nil && len(commits) > 0 { v.Commits = s.presentCommits(r.Context(), repo.ID, commits, s.langOf(r)) } } if v.CommitDiff == nil || len(v.CommitDiff.Files) == 0 { if files, err := gitrepo.ComparePatch(r.Context(), s.Git, dir, base, tip); err == nil && len(files) > 0 { v.CommitDiff = presentCommitDiff(repo.FullPath(), tip, nil, files) } } return n } func (s *Server) mergeCommitSHA(ctx context.Context, repo store.Repo, mr store.MergeRequest) string { if s.Git == "" || s.StoragePath() == "" || mr.SourceBranch == "" || mr.TargetBranch == "" { return "" } dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name) needle := "Merge branch '" + mr.SourceBranch + "'" return gitOne(ctx, s.Git, dir, "log", "-1", "--format=%H", "-F", "--grep="+needle, "refs/heads/"+mr.TargetBranch) } func shaLike(s string) bool { if len(s) < 7 || len(s) > 40 { return false } for _, c := range s { if (c < '0' || c > '9') && (c < 'a' || c > 'f') { return false } } return true }