From f3c4a45c3d9d8e2da2a01de11a141b464053376e Mon Sep 17 00:00:00 2001 From: bouncepaw Date: Sun, 14 Mar 2021 20:01:32 +0500 Subject: [PATCH] Add primitive diffs accessible from history pages --- history/information.go | 7 +- http_readers.go | 18 +++ user/user.go | 1 + views/history.qtpl | 21 +++ views/history.qtpl.go | 292 ++++++++++++++++++++++++++--------------- 5 files changed, 229 insertions(+), 110 deletions(-) diff --git a/history/information.go b/history/information.go index f3cf8a7..cd22f0c 100644 --- a/history/information.go +++ b/history/information.go @@ -143,7 +143,7 @@ func (rev *Revision) asHistoryEntry(hyphaName string) (html string) {
  • - %[3]s + %[3]s %[4]s %[5]s
    • @@ -175,3 +175,8 @@ func FileAtRevision(filepath, hash string) (string, error) { out, err := gitsh("show", hash+":"+strings.TrimPrefix(filepath, util.WikiDir+"/")) return out.String(), err } + +func PrimitiveDiffAtRevision(filepath, hash string) (string, error) { + out, err := gitsh("diff", "--unified=1", "--no-color", hash+"~", hash, "--", filepath) + return out.String(), err +} diff --git a/http_readers.go b/http_readers.go index 807d478..597d8b8 100644 --- a/http_readers.go +++ b/http_readers.go @@ -24,6 +24,7 @@ func init() { http.HandleFunc("/text/", handlerText) http.HandleFunc("/binary/", handlerBinary) http.HandleFunc("/rev/", handlerRevision) + http.HandleFunc("/primitive-diff/", handlerPrimitiveDiff) http.HandleFunc("/attachment/", handlerAttachment) } @@ -41,6 +42,23 @@ func handlerAttachment(w http.ResponseWriter, rq *http.Request) { u)) } +func handlerPrimitiveDiff(w http.ResponseWriter, rq *http.Request) { + log.Println(rq.URL) + var ( + shorterUrl = strings.TrimPrefix(rq.URL.Path, "/primitive-diff/") + firstSlashIndex = strings.IndexRune(shorterUrl, '/') + revHash = shorterUrl[:firstSlashIndex] + hyphaName = util.CanonicalName(shorterUrl[firstSlashIndex+1:]) + h = hyphae.ByName(hyphaName) + u = user.FromRequest(rq) + ) + util.HTTP200Page(w, + views.BaseHTML( + fmt.Sprintf("Diff of %s at %s", hyphaName, revHash), + views.PrimitiveDiffHTML(rq, h, u, revHash), + u)) +} + // handlerRevision displays a specific revision of text part a page func handlerRevision(w http.ResponseWriter, rq *http.Request) { log.Println(rq.URL) diff --git a/user/user.go b/user/user.go index aa7a74c..e126d76 100644 --- a/user/user.go +++ b/user/user.go @@ -26,6 +26,7 @@ var minimalRights = map[string]int{ "delete-ask": 3, "delete-confirm": 3, "reindex": 4, + "admin": 4, "admin/shutdown": 4, } diff --git a/views/history.qtpl b/views/history.qtpl index e76565f..cf645be 100644 --- a/views/history.qtpl +++ b/views/history.qtpl @@ -1,8 +1,29 @@ {% import "net/http" %} {% import "github.com/bouncepaw/mycorrhiza/util" %} +{% import "github.com/bouncepaw/mycorrhiza/user" %} +{% import "github.com/bouncepaw/mycorrhiza/hyphae" %} {% import "github.com/bouncepaw/mycorrhiza/history" %} + +{% func PrimitiveDiffHTML(rq *http.Request, h *hyphae.Hypha, u *user.User, hash string) %} +{% code +text, err := history.PrimitiveDiffAtRevision(h.TextPath, hash) +if err != nil { + text = err.Error() +} +%} +{%= NavHTML(rq, h.Name, "history") %} +
    +
    +
    +

    Diff {%s util.BeautifulName(h.Name) %} at {%s hash %}

    + 
    {%s text %}
    +
    +
    +
    +{% endfunc %} + {% func RecentChangesHTML(n int) %}
    diff --git a/views/history.qtpl.go b/views/history.qtpl.go index 6d81497..d61101f 100644 --- a/views/history.qtpl.go +++ b/views/history.qtpl.go @@ -11,24 +11,98 @@ import "net/http" import "github.com/bouncepaw/mycorrhiza/util" //line views/history.qtpl:4 -import "github.com/bouncepaw/mycorrhiza/history" +import "github.com/bouncepaw/mycorrhiza/user" + +//line views/history.qtpl:5 +import "github.com/bouncepaw/mycorrhiza/hyphae" //line views/history.qtpl:6 +import "github.com/bouncepaw/mycorrhiza/history" + +//line views/history.qtpl:9 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line views/history.qtpl:6 +//line views/history.qtpl:9 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line views/history.qtpl:6 +//line views/history.qtpl:9 +func StreamPrimitiveDiffHTML(qw422016 *qt422016.Writer, rq *http.Request, h *hyphae.Hypha, u *user.User, hash string) { +//line views/history.qtpl:9 + qw422016.N().S(` +`) +//line views/history.qtpl:11 + text, err := history.PrimitiveDiffAtRevision(h.TextPath, hash) + if err != nil { + text = err.Error() + } + +//line views/history.qtpl:15 + qw422016.N().S(` +`) +//line views/history.qtpl:16 + StreamNavHTML(qw422016, rq, h.Name, "history") +//line views/history.qtpl:16 + qw422016.N().S(` +
    +
    +
    +

    Diff `) +//line views/history.qtpl:20 + qw422016.E().S(util.BeautifulName(h.Name)) +//line views/history.qtpl:20 + qw422016.N().S(` at `) +//line views/history.qtpl:20 + qw422016.E().S(hash) +//line views/history.qtpl:20 + qw422016.N().S(`

    + 
    `)
+//line views/history.qtpl:21
+	qw422016.E().S(text)
+//line views/history.qtpl:21
+	qw422016.N().S(`
    +
    +
    +
    +`) +//line views/history.qtpl:25 +} + +//line views/history.qtpl:25 +func WritePrimitiveDiffHTML(qq422016 qtio422016.Writer, rq *http.Request, h *hyphae.Hypha, u *user.User, hash string) { +//line views/history.qtpl:25 + qw422016 := qt422016.AcquireWriter(qq422016) +//line views/history.qtpl:25 + StreamPrimitiveDiffHTML(qw422016, rq, h, u, hash) +//line views/history.qtpl:25 + qt422016.ReleaseWriter(qw422016) +//line views/history.qtpl:25 +} + +//line views/history.qtpl:25 +func PrimitiveDiffHTML(rq *http.Request, h *hyphae.Hypha, u *user.User, hash string) string { +//line views/history.qtpl:25 + qb422016 := qt422016.AcquireByteBuffer() +//line views/history.qtpl:25 + WritePrimitiveDiffHTML(qb422016, rq, h, u, hash) +//line views/history.qtpl:25 + qs422016 := string(qb422016.B) +//line views/history.qtpl:25 + qt422016.ReleaseByteBuffer(qb422016) +//line views/history.qtpl:25 + return qs422016 +//line views/history.qtpl:25 +} + +//line views/history.qtpl:27 func StreamRecentChangesHTML(qw422016 *qt422016.Writer, n int) { -//line views/history.qtpl:6 +//line views/history.qtpl:27 qw422016.N().S(`
    @@ -38,51 +112,51 @@ func StreamRecentChangesHTML(qw422016 *qt422016.Writer, n int) { @@ -90,216 +164,216 @@ func StreamRecentChangesHTML(qw422016 *qt422016.Writer, n int) {

    Subscribe via RSS, Atom or JSON feed.

    `) -//line views/history.qtpl:34 +//line views/history.qtpl:55 qw422016.N().S(` `) -//line views/history.qtpl:37 +//line views/history.qtpl:58 changes := history.RecentChanges(n) -//line views/history.qtpl:38 +//line views/history.qtpl:59 qw422016.N().S(`
    `) -//line views/history.qtpl:40 +//line views/history.qtpl:61 if len(changes) == 0 { -//line views/history.qtpl:40 +//line views/history.qtpl:61 qw422016.N().S(`

    Could not find any recent changes.

    `) -//line views/history.qtpl:42 +//line views/history.qtpl:63 } else { -//line views/history.qtpl:42 +//line views/history.qtpl:63 qw422016.N().S(` `) -//line views/history.qtpl:43 +//line views/history.qtpl:64 for i, entry := range changes { -//line views/history.qtpl:43 +//line views/history.qtpl:64 qw422016.N().S(`
      `) -//line views/history.qtpl:46 +//line views/history.qtpl:67 qw422016.N().S(recentChangesEntry(entry)) -//line views/history.qtpl:46 +//line views/history.qtpl:67 qw422016.N().S(`
    `) -//line views/history.qtpl:48 +//line views/history.qtpl:69 } -//line views/history.qtpl:48 +//line views/history.qtpl:69 qw422016.N().S(` `) -//line views/history.qtpl:49 +//line views/history.qtpl:70 } -//line views/history.qtpl:49 +//line views/history.qtpl:70 qw422016.N().S(`
    `) -//line views/history.qtpl:53 +//line views/history.qtpl:74 } -//line views/history.qtpl:53 +//line views/history.qtpl:74 func WriteRecentChangesHTML(qq422016 qtio422016.Writer, n int) { -//line views/history.qtpl:53 +//line views/history.qtpl:74 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/history.qtpl:53 +//line views/history.qtpl:74 StreamRecentChangesHTML(qw422016, n) -//line views/history.qtpl:53 +//line views/history.qtpl:74 qt422016.ReleaseWriter(qw422016) -//line views/history.qtpl:53 +//line views/history.qtpl:74 } -//line views/history.qtpl:53 +//line views/history.qtpl:74 func RecentChangesHTML(n int) string { -//line views/history.qtpl:53 +//line views/history.qtpl:74 qb422016 := qt422016.AcquireByteBuffer() -//line views/history.qtpl:53 +//line views/history.qtpl:74 WriteRecentChangesHTML(qb422016, n) -//line views/history.qtpl:53 +//line views/history.qtpl:74 qs422016 := string(qb422016.B) -//line views/history.qtpl:53 +//line views/history.qtpl:74 qt422016.ReleaseByteBuffer(qb422016) -//line views/history.qtpl:53 +//line views/history.qtpl:74 return qs422016 -//line views/history.qtpl:53 +//line views/history.qtpl:74 } -//line views/history.qtpl:55 +//line views/history.qtpl:76 func streamrecentChangesEntry(qw422016 *qt422016.Writer, rev history.Revision) { -//line views/history.qtpl:55 +//line views/history.qtpl:76 qw422016.N().S(`
  • `) -//line views/history.qtpl:57 +//line views/history.qtpl:78 qw422016.E().S(rev.Hash) -//line views/history.qtpl:57 +//line views/history.qtpl:78 qw422016.N().S(`
  • `) -//line views/history.qtpl:58 +//line views/history.qtpl:79 qw422016.N().S(rev.HyphaeLinksHTML()) -//line views/history.qtpl:58 +//line views/history.qtpl:79 qw422016.N().S(`
  • `) -//line views/history.qtpl:59 +//line views/history.qtpl:80 qw422016.E().S(rev.Message) -//line views/history.qtpl:59 +//line views/history.qtpl:80 qw422016.N().S(` `) -//line views/history.qtpl:59 +//line views/history.qtpl:80 if rev.Username != "anon" { -//line views/history.qtpl:59 +//line views/history.qtpl:80 qw422016.N().S(`by `) -//line views/history.qtpl:59 +//line views/history.qtpl:80 } -//line views/history.qtpl:59 +//line views/history.qtpl:80 qw422016.N().S(`
    • `) -//line views/history.qtpl:60 +//line views/history.qtpl:81 } -//line views/history.qtpl:60 +//line views/history.qtpl:81 func writerecentChangesEntry(qq422016 qtio422016.Writer, rev history.Revision) { -//line views/history.qtpl:60 +//line views/history.qtpl:81 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/history.qtpl:60 +//line views/history.qtpl:81 streamrecentChangesEntry(qw422016, rev) -//line views/history.qtpl:60 +//line views/history.qtpl:81 qt422016.ReleaseWriter(qw422016) -//line views/history.qtpl:60 +//line views/history.qtpl:81 } -//line views/history.qtpl:60 +//line views/history.qtpl:81 func recentChangesEntry(rev history.Revision) string { -//line views/history.qtpl:60 +//line views/history.qtpl:81 qb422016 := qt422016.AcquireByteBuffer() -//line views/history.qtpl:60 +//line views/history.qtpl:81 writerecentChangesEntry(qb422016, rev) -//line views/history.qtpl:60 +//line views/history.qtpl:81 qs422016 := string(qb422016.B) -//line views/history.qtpl:60 +//line views/history.qtpl:81 qt422016.ReleaseByteBuffer(qb422016) -//line views/history.qtpl:60 +//line views/history.qtpl:81 return qs422016 -//line views/history.qtpl:60 +//line views/history.qtpl:81 } -//line views/history.qtpl:62 +//line views/history.qtpl:83 func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, list string) { -//line views/history.qtpl:62 +//line views/history.qtpl:83 qw422016.N().S(` `) -//line views/history.qtpl:63 +//line views/history.qtpl:84 StreamNavHTML(qw422016, rq, hyphaName, "history") -//line views/history.qtpl:63 +//line views/history.qtpl:84 qw422016.N().S(`

    History of `) -//line views/history.qtpl:67 +//line views/history.qtpl:88 qw422016.E().S(util.BeautifulName(hyphaName)) -//line views/history.qtpl:67 +//line views/history.qtpl:88 qw422016.N().S(`

    `) -//line views/history.qtpl:68 +//line views/history.qtpl:89 qw422016.N().S(list) -//line views/history.qtpl:68 +//line views/history.qtpl:89 qw422016.N().S(`
    `) -//line views/history.qtpl:72 +//line views/history.qtpl:93 } -//line views/history.qtpl:72 +//line views/history.qtpl:93 func WriteHistoryHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, list string) { -//line views/history.qtpl:72 +//line views/history.qtpl:93 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/history.qtpl:72 +//line views/history.qtpl:93 StreamHistoryHTML(qw422016, rq, hyphaName, list) -//line views/history.qtpl:72 +//line views/history.qtpl:93 qt422016.ReleaseWriter(qw422016) -//line views/history.qtpl:72 +//line views/history.qtpl:93 } -//line views/history.qtpl:72 +//line views/history.qtpl:93 func HistoryHTML(rq *http.Request, hyphaName, list string) string { -//line views/history.qtpl:72 +//line views/history.qtpl:93 qb422016 := qt422016.AcquireByteBuffer() -//line views/history.qtpl:72 +//line views/history.qtpl:93 WriteHistoryHTML(qb422016, rq, hyphaName, list) -//line views/history.qtpl:72 +//line views/history.qtpl:93 qs422016 := string(qb422016.B) -//line views/history.qtpl:72 +//line views/history.qtpl:93 qt422016.ReleaseByteBuffer(qb422016) -//line views/history.qtpl:72 +//line views/history.qtpl:93 return qs422016 -//line views/history.qtpl:72 +//line views/history.qtpl:93 }