repos / git-pr

a self-hosted git collaboration server
git clone https://github.com/picosh/git-pr.git

commit
0c5b23a
parent
6055c43
author
Eric Bower
date
2025-03-13 10:36:33 -0400 EDT
refactor: reviews are not a pr status anymore
6 files changed,  +3, -24
M cli.go
M web.go
M __snapshots__/e2e_test.snap
+1, -1
1@@ -35,7 +35,7 @@ ID RepoID           Name                       Status     Patchsets User
2 7  contributor/ai   feat: lets build an rnn    [accepted] 1         admin       
3 6  contributor/test Closed patch with review   [closed]   2         contributor 
4 5  contributor/test Accepted patch with review [accepted] 2         contributor 
5-4  contributor/test Reviewed patch             [reviewed] 2         contributor 
6+4  contributor/test Reviewed patch             [open]     2         contributor 
7 3  contributor/test Closed patch (contributor) [closed]   1         contributor 
8 2  contributor/test Closed patch (admin)       [closed]   1         contributor 
9 1  admin/test       Accepted patch             [accepted] 1         contributor 
M cli.go
+2, -12
 1@@ -368,10 +368,6 @@ Here's how it works:
 2 								Name:  "accepted",
 3 								Usage: "only show accepted PRs",
 4 							},
 5-							&cli.BoolFlag{
 6-								Name:  "reviewed",
 7-								Usage: "only show reviewed PRs",
 8-							},
 9 							&cli.BoolFlag{
10 								Name:  "mine",
11 								Usage: "only show your own PRs",
12@@ -406,7 +402,6 @@ Here's how it works:
13 							onlyOpen := cCtx.Bool("open")
14 							onlyAccepted := cCtx.Bool("accepted")
15 							onlyClosed := cCtx.Bool("closed")
16-							onlyReviewed := cCtx.Bool("reviewed")
17 							onlyMine := cCtx.Bool("mine")
18 
19 							writer := NewTabWriter(sesh)
20@@ -424,10 +419,6 @@ Here's how it works:
21 									continue
22 								}
23 
24-								if onlyReviewed && req.Status != "reviewed" {
25-									continue
26-								}
27-
28 								user, err := pr.GetUserByID(req.UserID)
29 								if err != nil {
30 									be.Logger.Error("could not get user for pr", "err", err)
31@@ -846,7 +837,7 @@ Here's how it works:
32 						Flags: []cli.Flag{
33 							&cli.BoolFlag{
34 								Name:  "review",
35-								Usage: "submit patchset and mark PR as reviewed",
36+								Usage: "submit patchset mark it as a review",
37 							},
38 							&cli.BoolFlag{
39 								Name:  "accept",
40@@ -898,8 +889,7 @@ Here's how it works:
41 							op := OpNormal
42 							nextStatus := "open"
43 							if isReview {
44-								wish.Println(sesh, "Marking PR as reviewed")
45-								nextStatus = "reviewed"
46+								wish.Println(sesh, "Marking patchset as a review")
47 								op = OpReview
48 							} else if isAccept {
49 								wish.Println(sesh, "Marking PR as accepted")
M tmpl/index.html
+0, -2
1@@ -220,8 +220,6 @@ git push origin main
2     filter
3     <a href="/">open</a> <code>{{.NumOpen}}</code>
4     &middot;
5-    <a href="/?status=reviewed">reviewed</a> <code>{{.NumReviewed}}</code>
6-    &middot;
7     <a href="/?status=accepted">accepted</a> <code>{{.NumAccepted}}</code>
8     &middot;
9     <a href="/?status=closed">closed</a> <code>{{.NumClosed}}</code>
M tmpl/repo-detail.html
+0, -2
1@@ -29,8 +29,6 @@ ssh {{.MetaData.URL}} pr ls {{.Username}}/{{.Name}}</pre>
2     filter
3     <a href="/r/{{.Username}}/{{.Name}}">open</a>
4     &middot;
5-    <a href="/r/{{.Username}}/{{.Name}}?status=reviewed">reviewed</a>
6-    &middot;
7     <a href="/r/{{.Username}}/{{.Name}}?status=accepted">accepted</a>
8     &middot;
9     <a href="/r/{{.Username}}/{{.Name}}?status=closed">closed</a>
M tmpl/user-detail.html
+0, -2
1@@ -28,8 +28,6 @@
2     filter
3     <a href="/r/{{.UserData.Name}}">open</a>
4     &middot;
5-    <a href="/r/{{.UserData.Name}}?status=reviewed">reviewed</a>
6-    &middot;
7     <a href="/r/{{.UserData.Name}}?status=accepted">accepted</a>
8     &middot;
9     <a href="/r/{{.UserData.Name}}?status=closed">closed</a>
M web.go
+0, -5
 1@@ -112,7 +112,6 @@ type LinkData struct {
 2 type PrTableData struct {
 3 	Prs         []*PrListData
 4 	NumOpen     int
 5-	NumReviewed int
 6 	NumAccepted int
 7 	NumClosed   int
 8 	MetaData
 9@@ -291,15 +290,12 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
10 	}
11 
12 	numOpen := 0
13-	numReviewed := 0
14 	numAccepted := 0
15 	numClosed := 0
16 	for _, pr := range prs {
17 		switch pr.Status {
18 		case "open":
19 			numOpen += 1
20-		case "reviewed":
21-			numReviewed += 1
22 		case "accepted":
23 			numAccepted += 1
24 		case "closed":
25@@ -311,7 +307,6 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
26 	tmpl := getTemplate("index.html")
27 	err = tmpl.ExecuteTemplate(w, "index.html", PrTableData{
28 		NumOpen:     numOpen,
29-		NumReviewed: numReviewed,
30 		NumAccepted: numAccepted,
31 		NumClosed:   numClosed,
32 		Prs:         prdata,