diff options
| -rw-r--r-- | handle_repo_commit.go | 31 | ||||
| -rw-r--r-- | templates/repo_commit.html.tmpl | 4 |
2 files changed, 25 insertions, 10 deletions
diff --git a/handle_repo_commit.go b/handle_repo_commit.go index d45fd1d..5f7d495 100644 --- a/handle_repo_commit.go +++ b/handle_repo_commit.go @@ -1,10 +1,12 @@ package main import ( + "errors" "net/http" "strings" "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/object" "github.com/go-git/go-git/v5/plumbing/filemode" "github.com/go-git/go-git/v5/plumbing/format/diff" "go.lindenii.runxiyu.org/lindenii-common/misc" @@ -51,17 +53,30 @@ func handle_repo_commit(w http.ResponseWriter, r *http.Request) { data["commit_object"] = commit_object data["commit_id"] = commit_id_string + var patch *object.Patch parent_commit_object, err := commit_object.Parent(0) - if err != nil { + if errors.Is(err, object.ErrParentNotFound) { + commit_tree, err := commit_object.Tree() + if err != nil { + _, _ = w.Write([]byte("Error getting commit tree (for comparing against an empty tree): " + err.Error())) + return + } + patch, err = (&object.Tree{}).Patch(commit_tree) + if err != nil { + _, _ = w.Write([]byte("Error getting patch of commit: " + err.Error())) + return + } + } else if err != nil { _, _ = w.Write([]byte("Error getting parent commit object: " + err.Error())) return - } - data["parent_commit_object"] = parent_commit_object - - patch, err := parent_commit_object.Patch(commit_object) - if err != nil { - _, _ = w.Write([]byte("Error getting patch of commit: " + err.Error())) - return + } else { + data["parent_commit_hash"] = parent_commit_object.Hash.String() + + patch, err = parent_commit_object.Patch(commit_object) + if err != nil { + _, _ = w.Write([]byte("Error getting patch of commit: " + err.Error())) + return + } } data["patch"] = patch diff --git a/templates/repo_commit.html.tmpl b/templates/repo_commit.html.tmpl index d568887..13832a8 100644 --- a/templates/repo_commit.html.tmpl +++ b/templates/repo_commit.html.tmpl @@ -46,14 +46,14 @@ </table> </div> <div class="padding-wrapper"> - {{ $parent_commit_object := .parent_commit_object }} + {{ $parent_commit_hash := .parent_commit_hash }} {{ $commit_object := .commit_object }} {{ range .file_patches }} <div class="file-patch toggle-on-wrapper"> <input type="checkbox" id="toggle-{{ .From.Hash }}{{ .To.Hash }}" class="file-toggle toggle-on-toggle"> <label for="toggle-{{ .From.Hash }}{{ .To.Hash }}" class="file-header toggle-on-header"> <span> - --- a/<a href="../tree/{{ .From.Path }}?commit={{ $parent_commit_object.Hash }}">{{ .From.Path }}</a> {{ .From.Mode }} + --- a/<a href="../tree/{{ .From.Path }}?commit={{ $parent_commit_hash }}">{{ .From.Path }}</a> {{ .From.Mode }} <br /> +++ b/<a href="../tree/{{ .To.Path }}?commit={{ $commit_object.Hash }}">{{ .To.Path }}</a> {{ .To.Mode }} </span> |