diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 197487fb..00c1f1e7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -114,7 +114,7 @@ jobs:
- name: Build V
shell: cmd
run: |
- make.bat -gcc
+ makev.bat -gcc
# Must run after "Build V": the script shells out to `v.exe`, which
# does not exist until V is built.
- name: Install SQLite
diff --git a/commit/commit_routes.v b/commit/commit_routes.v
index 35564987..83cf9faa 100644
--- a/commit/commit_routes.v
+++ b/commit/commit_routes.v
@@ -4,6 +4,7 @@ import veb
import time
import api
import git
+import os
@['/api/v1/:user/:repo_name/:branch_name/commits/count']
fn (mut app App) handle_commits_count(mut ctx Context, username string, repo_name string, branch_name string) veb.Result {
@@ -32,7 +33,7 @@ fn (mut app App) handle_commits_count(mut ctx Context, username string, repo_nam
// app.debug("${branch} ${count}" )
return ctx.json(api.ApiCommitCount{
success: true
- result: count
+ result: count
})
}
@@ -140,3 +141,35 @@ pub fn (mut app App) commit(mut ctx Context, username string, repo_name string,
return $veb.html()
}
+
+@['/:username/:repo_name/revert/:hash'; post]
+pub fn (mut app App) handle_revert_commit(mut ctx Context, username string, repo_name string, hash string) veb.Result {
+ repo := app.find_repo_by_name_and_username(repo_name, username) or { return ctx.not_found() }
+ if !app.can_admin_repo(ctx, repo) {
+ return ctx.not_found()
+ }
+ branch := ctx.form['branch'] or { repo.primary_branch }
+ if !is_safe_ref(branch) || !is_valid_commit_hash(hash) {
+ ctx.error('Invalid branch or commit')
+ return ctx.redirect('/${username}/${repo_name}/-/commits/${branch}')
+ }
+ worktree := os.join_path(os.temp_dir(), 'gitly_revert_${os.getpid()}_${time.now().unix_nano()}')
+ os.mkdir_all(worktree) or {
+ ctx.error('Failed to create worktree: ')
+ return ctx.redirect('/${username}/${repo_name}/-/commits/${branch}')
+ }
+ defer { os.rmdir_all(worktree) or {} }
+ add_res := git.Git.exec_in_dir(repo.git_dir, ['worktree', 'add', '--force', worktree, branch])
+ if add_res.exit_code != 0 {
+ ctx.error('Failed to prepare worktree: ')
+ return ctx.redirect('/${username}/${repo_name}/-/commits/${branch}')
+ }
+ revert_res := git.Git.exec_in_dir(worktree, ['revert', '--no-edit', hash])
+ remove_res := git.Git.exec_in_dir(repo.git_dir, ['worktree', 'remove', '--force', worktree])
+ if revert_res.exit_code != 0 {
+ ctx.error('Revert failed: ')
+ return ctx.redirect('/${username}/${repo_name}/-/commits/${branch}')
+ }
+ _ = remove_res
+ return ctx.redirect('/${username}/${repo_name}/-/commits/${branch}')
+}
diff --git a/highlight/markdown_test.v b/highlight/markdown_test.v
index c5823681..8406cb46 100644
--- a/highlight/markdown_test.v
+++ b/highlight/markdown_test.v
@@ -1,9 +1,9 @@
module highlight
-const markdown = ' test'
+const xss_markdown_sample = ' test'
fn test_convert_markdown_to_html() {
- rendered := convert_markdown_to_html(markdown)
+ rendered := convert_markdown_to_html(xss_markdown_sample)
assert !rendered.contains('