forked from
tangled.org/core
Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2 (Please be gentle).
appview: state: validate pasted patch
authored by
Anirudh Oppiliappan
and committed by
Akshay
3daf4efb
cee3a69c
+39
-12
+28
-4
appview/state/pull.go
+28
-4
appview/state/pull.go
···
558
558
sourceBranch := r.FormValue("sourceBranch")
559
559
patch := r.FormValue("patch")
560
560
561
-
// Validate required fields for all PR types
562
-
if title == "" || body == "" || targetBranch == "" {
563
-
s.pages.Notice(w, "pull", "Title, body and target branch are required.")
561
+
if targetBranch == "" {
562
+
s.pages.Notice(w, "pull", "Target branch is required.")
564
563
return
565
564
}
566
565
567
566
us, err := NewUnsignedClient(f.Knot, s.config.Dev)
568
567
if err != nil {
569
-
log.Println("failed to create unsigned client to %s: %v", f.Knot, err)
568
+
log.Printf("failed to create unsigned client to %s: %v", f.Knot, err)
570
569
s.pages.Notice(w, "pull", "Failed to create a pull request. Try again later.")
571
570
return
572
571
}
···
815
816
}
816
817
817
818
s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pullId))
819
+
}
820
+
821
+
func (s *State) ValidatePatch(w http.ResponseWriter, r *http.Request) {
822
+
_, err := fullyResolvedRepo(r)
823
+
if err != nil {
824
+
log.Println("failed to get repo and knot", err)
825
+
return
826
+
}
827
+
828
+
patch := r.FormValue("patch")
829
+
if patch == "" {
830
+
s.pages.Notice(w, "patch-error", "Patch is required.")
831
+
return
832
+
}
833
+
834
+
if patch == "" || !patchutil.IsPatchValid(patch) {
835
+
s.pages.Notice(w, "patch-error", "Invalid patch format. Please provide a valid git diff or format-patch.")
836
+
return
837
+
}
838
+
839
+
if patchutil.IsFormatPatch(patch) {
840
+
s.pages.Notice(w, "patch-preview", "Format patch detected. Title and description are optional; if left out, they will be extracted from the first commit.")
841
+
} else {
842
+
s.pages.Notice(w, "patch-preview", "Regular diff detected. Please provide a title and description.")
843
+
}
818
844
}
819
845
820
846
func (s *State) PatchUploadFragment(w http.ResponseWriter, r *http.Request) {
+1
appview/state/router.go
+1
appview/state/router.go
···
96
96
r.With(AuthMiddleware(s)).Route("/new", func(r chi.Router) {
97
97
r.Get("/", s.NewPull)
98
98
r.Get("/patch-upload", s.PatchUploadFragment)
99
+
r.Post("/validate-patch", s.ValidatePatch)
99
100
r.Get("/compare-branches", s.CompareBranchesFragment)
100
101
r.Get("/compare-forks", s.CompareForksFragment)
101
102
r.Get("/fork-branches", s.CompareForksBranchesFragment)
+10
-5
input.css
+10
-5
input.css
···
35
35
font-size: 15px;
36
36
}
37
37
@supports (font-variation-settings: normal) {
38
-
html {
39
-
font-feature-settings: 'ss01' 1, 'kern' 1, 'liga' 1, 'cv05' 1, 'tnum' 1;
40
-
}
38
+
html {
39
+
font-feature-settings:
40
+
"ss01" 1,
41
+
"kern" 1,
42
+
"liga" 1,
43
+
"cv05" 1,
44
+
"tnum" 1;
45
+
}
41
46
}
42
47
43
48
a {
···
53
48
@apply block mb-2 text-gray-900 text-sm font-bold py-2 uppercase dark:text-gray-100;
54
49
}
55
50
input {
56
-
@apply bg-white border border-gray-400 rounded-sm focus:ring-black p-3 dark:bg-gray-800 dark:border-gray-600 dark:text-white dark:focus:ring-gray-400;
51
+
@apply border border-gray-400 block rounded bg-gray-50 focus:ring-black p-3 dark:bg-gray-800 dark:border-gray-600 dark:text-white dark:focus:ring-gray-400;
57
52
}
58
53
textarea {
59
-
@apply bg-white border border-gray-400 rounded-sm focus:ring-black p-3 dark:bg-gray-800 dark:border-gray-600 dark:text-white dark:focus:ring-gray-400;
54
+
@apply border border-gray-400 block rounded bg-gray-50 focus:ring-black p-3 dark:bg-gray-800 dark:border-gray-600 dark:text-white dark:focus:ring-gray-400;
60
55
}
61
56
details summary::-webkit-details-marker {
62
57
display: none;