Commit Diff


commit - 9b9d6a77d4925c1bac43a8a6b9ea12c207bfa6a2
commit + 2ba97f681968a9e42868cc7e7c531cf33af36063
blob - 681cedc2e3bbeb0d09075359cb45e7be7e8a45df (mode 644)
blob + /dev/null
--- regress/gotwebd/action_commit.html
+++ /dev/null
@@ -1,32 +0,0 @@
-Content-Security-Policy: default-src 'self'; script-src 'none'; object-src 'none';

-Content-Type: text/html

-

-<!doctype html><html><head><meta charset="utf-8" /><title>Gotweb</title><meta name="viewport" content="initial-scale=1.0" /><meta name="msapplication-TileColor" content="#da532c" /><meta name="theme-color" content="#ffffff"/><link rel="apple-touch-icon" sizes="180x180" href="/gotwebd_test_harness/apple-touch-icon.png" /><link rel="icon" type="image/png" sizes="32x32" href="/gotwebd_test_harness/favicon-32x32.png" /><link rel="icon" type="image/png" sizes="16x16" href="/gotwebd_test_harness/favicon-16x16.png" /><link rel="manifest" href="/gotwebd_test_harness/site.webmanifest"/><link rel="mask-icon" href="/gotwebd_test_harness/safari-pinned-tab.svg" /><link rel="stylesheet" type="text/css" href="/gotwebd_test_harness/gotweb.css" /></head><body><header id="header"><div id="got_link"><a href="https://gameoftrees.org" target="_blank"><img src="/gotwebd_test_harness/got.png" /></a></div></header><nav id="site_path"><div id="site_link"><a href="?index_page=0">Repos</a> / <a href="?action=summary&path=repo.git">repo.git</a> / diff</div></nav><main class="action-diff"><header class="subtitle"><h2>Commit Diff</h2></header><div id="diff_content"><div class="page_header_wrapper"><dl><dt>Commit:</dt><dd><code class="commit-id">${COMMIT_ID}</code></dd><dt>From:</dt><dd>${COMMITTER} &lt;${COMMITTER_EMAIL}&gt;</dd><dt>Date:</dt><dd><time datetime="${COMMIT_YMDHMS}">${COMMIT_DATE}
- UTC</time></dd><dt>Message:</dt><dd class="commit-msg">import the test tree
-</dd><dt>Actions:</dt><dd><a href="?action=patch&commit=${COMMIT_ID}&path=repo.git">Patch</a> | <a href="?action=tree&commit=${COMMIT_ID}&path=repo.git">Tree</a></dd></dl></div><hr /><pre id="diff"><span class="diff_line diff_meta">commit - /dev/null</span>
-<span class="diff_line diff_meta">commit + ${COMMIT_ID}</span>
-<span class="diff_line diff_meta">blob - /dev/null</span>
-<span class="diff_line diff_meta">blob + ${BLOB_ALPHA} (mode 644)</span>
-<span class="diff_line diff_minus">--- /dev/null</span>
-<span class="diff_line diff_plus">+++ alpha</span>
-<span class="diff_line diff_chunk_header">@@ -0,0 +1 @@</span>
-<span class="diff_line diff_plus">+alpha</span>
-<span class="diff_line diff_meta">blob - /dev/null</span>
-<span class="diff_line diff_meta">blob + ${BLOB_BETA} (mode 644)</span>
-<span class="diff_line diff_minus">--- /dev/null</span>
-<span class="diff_line diff_plus">+++ beta</span>
-<span class="diff_line diff_chunk_header">@@ -0,0 +1 @@</span>
-<span class="diff_line diff_plus">+beta</span>
-<span class="diff_line diff_meta">blob - /dev/null</span>
-<span class="diff_line diff_meta">blob + ${BLOB_ZETA} (mode 644)</span>
-<span class="diff_line diff_minus">--- /dev/null</span>
-<span class="diff_line diff_plus">+++ epsilon/zeta</span>
-<span class="diff_line diff_chunk_header">@@ -0,0 +1 @@</span>
-<span class="diff_line diff_plus">+zeta</span>
-<span class="diff_line diff_meta">blob - /dev/null</span>
-<span class="diff_line diff_meta">blob + ${BLOB_DELTA} (mode 644)</span>
-<span class="diff_line diff_minus">--- /dev/null</span>
-<span class="diff_line diff_plus">+++ gamma/delta</span>
-<span class="diff_line diff_chunk_header">@@ -0,0 +1 @@</span>
-<span class="diff_line diff_plus">+delta</span>
-</pre></div></main><footer id="site_owner_wrapper"><p id="site_owner">Got Owner</p></footer></body></html>

blob - /dev/null
blob + 681cedc2e3bbeb0d09075359cb45e7be7e8a45df (mode 644)
--- /dev/null
+++ regress/gotwebd/action_diff.html
@@ -0,0 +1,32 @@
+Content-Security-Policy: default-src 'self'; script-src 'none'; object-src 'none';

+Content-Type: text/html

+

+<!doctype html><html><head><meta charset="utf-8" /><title>Gotweb</title><meta name="viewport" content="initial-scale=1.0" /><meta name="msapplication-TileColor" content="#da532c" /><meta name="theme-color" content="#ffffff"/><link rel="apple-touch-icon" sizes="180x180" href="/gotwebd_test_harness/apple-touch-icon.png" /><link rel="icon" type="image/png" sizes="32x32" href="/gotwebd_test_harness/favicon-32x32.png" /><link rel="icon" type="image/png" sizes="16x16" href="/gotwebd_test_harness/favicon-16x16.png" /><link rel="manifest" href="/gotwebd_test_harness/site.webmanifest"/><link rel="mask-icon" href="/gotwebd_test_harness/safari-pinned-tab.svg" /><link rel="stylesheet" type="text/css" href="/gotwebd_test_harness/gotweb.css" /></head><body><header id="header"><div id="got_link"><a href="https://gameoftrees.org" target="_blank"><img src="/gotwebd_test_harness/got.png" /></a></div></header><nav id="site_path"><div id="site_link"><a href="?index_page=0">Repos</a> / <a href="?action=summary&path=repo.git">repo.git</a> / diff</div></nav><main class="action-diff"><header class="subtitle"><h2>Commit Diff</h2></header><div id="diff_content"><div class="page_header_wrapper"><dl><dt>Commit:</dt><dd><code class="commit-id">${COMMIT_ID}</code></dd><dt>From:</dt><dd>${COMMITTER} &lt;${COMMITTER_EMAIL}&gt;</dd><dt>Date:</dt><dd><time datetime="${COMMIT_YMDHMS}">${COMMIT_DATE}
+ UTC</time></dd><dt>Message:</dt><dd class="commit-msg">import the test tree
+</dd><dt>Actions:</dt><dd><a href="?action=patch&commit=${COMMIT_ID}&path=repo.git">Patch</a> | <a href="?action=tree&commit=${COMMIT_ID}&path=repo.git">Tree</a></dd></dl></div><hr /><pre id="diff"><span class="diff_line diff_meta">commit - /dev/null</span>
+<span class="diff_line diff_meta">commit + ${COMMIT_ID}</span>
+<span class="diff_line diff_meta">blob - /dev/null</span>
+<span class="diff_line diff_meta">blob + ${BLOB_ALPHA} (mode 644)</span>
+<span class="diff_line diff_minus">--- /dev/null</span>
+<span class="diff_line diff_plus">+++ alpha</span>
+<span class="diff_line diff_chunk_header">@@ -0,0 +1 @@</span>
+<span class="diff_line diff_plus">+alpha</span>
+<span class="diff_line diff_meta">blob - /dev/null</span>
+<span class="diff_line diff_meta">blob + ${BLOB_BETA} (mode 644)</span>
+<span class="diff_line diff_minus">--- /dev/null</span>
+<span class="diff_line diff_plus">+++ beta</span>
+<span class="diff_line diff_chunk_header">@@ -0,0 +1 @@</span>
+<span class="diff_line diff_plus">+beta</span>
+<span class="diff_line diff_meta">blob - /dev/null</span>
+<span class="diff_line diff_meta">blob + ${BLOB_ZETA} (mode 644)</span>
+<span class="diff_line diff_minus">--- /dev/null</span>
+<span class="diff_line diff_plus">+++ epsilon/zeta</span>
+<span class="diff_line diff_chunk_header">@@ -0,0 +1 @@</span>
+<span class="diff_line diff_plus">+zeta</span>
+<span class="diff_line diff_meta">blob - /dev/null</span>
+<span class="diff_line diff_meta">blob + ${BLOB_DELTA} (mode 644)</span>
+<span class="diff_line diff_minus">--- /dev/null</span>
+<span class="diff_line diff_plus">+++ gamma/delta</span>
+<span class="diff_line diff_chunk_header">@@ -0,0 +1 @@</span>
+<span class="diff_line diff_plus">+delta</span>
+</pre></div></main><footer id="site_owner_wrapper"><p id="site_owner">Got Owner</p></footer></body></html>

blob - fdbff948c1319e3534e33a3f99dbae99781322d5
blob + 080047236e919fece5c548e434530b5fa29891fe
--- regress/gotwebd/test_gotwebd.sh
+++ regress/gotwebd/test_gotwebd.sh
@@ -41,9 +41,9 @@ test_gotwebd_action_index()
 	test_done "$testroot" "" "$ret"
 }
 
-test_gotwebd_action_commit()
+test_gotwebd_action_diff()
 {
-	local testroot=$(test_init gotwebd_action_commit 1)
+	local testroot=$(test_init gotwebd_action_diff 1)
 	local repo="${GOTWEBD_TEST_CHROOT}/got/public/repo.git"
 	local id=$(git_show_head $repo)
 	local author_time=$(git_show_author_time $repo)
@@ -58,7 +58,7 @@ test_gotwebd_action_commit()
 	COMMITTER_EMAIL="flan_hacker@openbsd.org" \
 	COMMIT_YMDHMS=$(date -u -r $author_time +"%FT%TZ") \
 	COMMIT_DATE=$(date -u -r $author_time +"%a %b %e %X %Y") \
-	interpolate action_commit.html > $testroot/content.expected
+	interpolate action_diff.html > $testroot/content.expected
 
 	$GOTWEBD_TEST_FCGI -q "$qs" > $testroot/content
 
@@ -161,7 +161,7 @@ test_gotwebd_action_patch()
 
 test_parseargs "$@"
 run_test test_gotwebd_action_index
-run_test test_gotwebd_action_commit
+run_test test_gotwebd_action_diff
 run_test test_gotwebd_action_blame
 run_test test_gotwebd_action_tree
 run_test test_gotwebd_action_patch