File inc/git.inc.php changed (mode: 100644) (index 4c5129a..9b4fe90) |
... |
... |
function rg_git_content_by_file($treeish, $file) |
2296 |
2296 |
*/ |
*/ |
2297 |
2297 |
function rg_git_log2listing($log, $rg, $commit_table) |
function rg_git_log2listing($log, $rg, $commit_table) |
2298 |
2298 |
{ |
{ |
2299 |
|
if ($log === FALSE) |
|
2300 |
|
return rg_template('repo/not_init.html', $rg, TRUE/*xss*/); |
|
|
2299 |
|
rg_log_enter('git_log2listing'); |
2301 |
2300 |
|
|
2302 |
|
$ret = ''; |
|
|
2301 |
|
while (1) { |
|
2302 |
|
if ($log === FALSE) { |
|
2303 |
|
$ret = rg_template('repo/not_init.html', $rg, TRUE /*xss*/); |
|
2304 |
|
break; |
|
2305 |
|
} |
2303 |
2306 |
|
|
2304 |
|
if ($commit_table) { |
|
2305 |
|
// Show a short list of commits |
|
2306 |
|
// Set 'url' |
|
2307 |
|
foreach ($log as $index => $i) |
|
2308 |
|
$log[$index]['vars']['commit_url'] = |
|
2309 |
|
rg_xss_safe($rg['mr']['id']) |
|
2310 |
|
. "#sha1-" . rg_xss_safe($i['vars']['sha1']); |
|
2311 |
|
$ret .= rg_git_log_template($log, 'repo/log', $rg); |
|
2312 |
|
} |
|
|
2307 |
|
$ret = ''; |
2313 |
2308 |
|
|
2314 |
|
// TODO: move this into a template! |
|
2315 |
|
$ret .= '<div style="margin-top: 8pt; margin-left: 8pt">' . "\n"; |
|
2316 |
|
foreach ($log as $junk => $i) { |
|
2317 |
|
//rg_log_ml('DEBUG: i=' . print_r($i, TRUE)); |
|
|
2309 |
|
if ($commit_table) { |
|
2310 |
|
// Show a short list of commits |
|
2311 |
|
// Set 'url' |
|
2312 |
|
foreach ($log as $index => $i) |
|
2313 |
|
$log[$index]['vars']['commit_url'] = |
|
2314 |
|
rg_xss_safe($rg['mr']['id']) |
|
2315 |
|
. "#sha1-" . rg_xss_safe($i['vars']['sha1']); |
|
2316 |
|
$ret .= rg_git_log_template($log, 'repo/log', $rg); |
|
2317 |
|
} |
2318 |
2318 |
|
|
2319 |
|
// Some info about commit |
|
2320 |
|
$ret .= "<b>" |
|
2321 |
|
. "<a name=\"sha1-" . rg_xss_safe($i['vars']['sha1']) . "\">" |
|
2322 |
|
. "Commit " . rg_xss_safe($i['vars']['sha1']) |
|
2323 |
|
. "</a></b> - " . rg_xss_safe($i['vars']['subject']) . "\n"; |
|
|
2319 |
|
// TODO: move this into a template! |
|
2320 |
|
$ret .= '<div style="margin-top: 8pt; margin-left: 8pt">' . "\n"; |
|
2321 |
|
foreach ($log as $junk => $i) { |
|
2322 |
|
//rg_log_ml('DEBUG: i=' . print_r($i, TRUE)); |
2324 |
2323 |
|
|
2325 |
|
if (!empty($i['vars']['body'])) |
|
2326 |
|
$ret .= "<br />\n" |
|
2327 |
|
. nl2br(rg_xss_safe($i['vars']['body'])); |
|
|
2324 |
|
// Some info about commit |
|
2325 |
|
$ret .= "<b>" |
|
2326 |
|
. "<a name=\"sha1-" . rg_xss_safe($i['vars']['sha1']) . "\">" |
|
2327 |
|
. "Commit " . rg_xss_safe($i['vars']['sha1']) |
|
2328 |
|
. "</a></b> - " . rg_xss_safe($i['vars']['subject']) . "\n"; |
2328 |
2329 |
|
|
2329 |
|
$ret .= "<br /><b>Author</b>: " . rg_xss_safe($i['vars']['author name']); |
|
|
2330 |
|
if (!empty($i['vars']['body'])) |
|
2331 |
|
$ret .= "<br />\n" |
|
2332 |
|
. nl2br(rg_xss_safe($i['vars']['body'])); |
2330 |
2333 |
|
|
2331 |
|
$ret .= "<br /><b>Author date (UTC)</b>: " |
|
2332 |
|
. gmdate("Y-m-d H:i", $i['vars']['author date']); |
|
|
2334 |
|
$ret .= "<br /><b>Author</b>: " . rg_xss_safe($i['vars']['author name']); |
2333 |
2335 |
|
|
2334 |
|
if (!empty($i['vars']['committer name'])) |
|
2335 |
|
$ret .= "<br /><b>Committer</b>: " |
|
2336 |
|
. rg_xss_safe($i['vars']['committer name']); |
|
|
2336 |
|
$ret .= "<br /><b>Author date (UTC)</b>: " |
|
2337 |
|
. gmdate("Y-m-d H:i", $i['vars']['author date']); |
2337 |
2338 |
|
|
2338 |
|
$ret .= '<br /><b>Commit date (UTC)</b>: ' |
|
2339 |
|
. gmdate("Y-m-d H:i", $i['vars']['committer date']); |
|
|
2339 |
|
if (!empty($i['vars']['committer name'])) |
|
2340 |
|
$ret .= "<br /><b>Committer</b>: " |
|
2341 |
|
. rg_xss_safe($i['vars']['committer name']); |
2340 |
2342 |
|
|
2341 |
|
$ret .= '<br /><b>Tree</b>: ' . $i['vars']['tree']; |
|
|
2343 |
|
$ret .= '<br /><b>Commit date (UTC)</b>: ' |
|
2344 |
|
. gmdate("Y-m-d H:i", $i['vars']['committer date']); |
2342 |
2345 |
|
|
2343 |
|
if (!empty($i['vars']['parents'])) |
|
2344 |
|
$ret .= '<br /><b>Parents</b>: ' |
|
2345 |
|
. $i['vars']['parents']; |
|
|
2346 |
|
$ret .= '<br /><b>Tree</b>: ' . $i['vars']['tree']; |
2346 |
2347 |
|
|
2347 |
|
if (!empty($i['vars']['sign_key'])) |
|
2348 |
|
$ret .= '<br /><b>Signing key</b>: ' |
|
2349 |
|
. $i['vars']['sign_key']; |
|
|
2348 |
|
if (!empty($i['vars']['parents'])) |
|
2349 |
|
$ret .= '<br /><b>Parents</b>: ' |
|
2350 |
|
. $i['vars']['parents']; |
2350 |
2351 |
|
|
2351 |
|
// stats |
|
2352 |
|
$r = rg_git_files_stats($i['vars']['sha1'], $i['files'], |
|
2353 |
|
'repo/fstat'); |
|
2354 |
|
if ($r === FALSE) |
|
2355 |
|
return "Internal error"; |
|
2356 |
|
$ret .= $r; |
|
|
2352 |
|
if (!empty($i['vars']['sign_key'])) |
|
2353 |
|
$ret .= '<br /><b>Signing key</b>: ' |
|
2354 |
|
. $i['vars']['sign_key']; |
2357 |
2355 |
|
|
2358 |
|
// diff |
|
2359 |
|
//rg_log_ml("DEBUG: i[files]=" . print_r($i['files'], TRUE)); |
|
2360 |
|
$r = rg_git_diff($i['vars']['sha1'], $i['files'], |
|
2361 |
|
'repo/diff.html'); |
|
2362 |
|
if ($r === FALSE) |
|
2363 |
|
return "Internal error"; |
|
2364 |
|
$ret .= $r; |
|
|
2356 |
|
// stats |
|
2357 |
|
$r = rg_git_files_stats($i['vars']['sha1'], $i['files'], |
|
2358 |
|
'repo/fstat'); |
|
2359 |
|
if ($r === FALSE) { |
|
2360 |
|
$ret = FALSE; |
|
2361 |
|
break; |
|
2362 |
|
} |
|
2363 |
|
$ret .= $r; |
|
2364 |
|
|
|
2365 |
|
// diff |
|
2366 |
|
//rg_log_ml("DEBUG: i[files]=" . print_r($i['files'], TRUE)); |
|
2367 |
|
$r = rg_git_diff($i['vars']['sha1'], $i['files'], |
|
2368 |
|
'repo/diff.html'); |
|
2369 |
|
if ($r === FALSE) { |
|
2370 |
|
$ret = FALSE; |
|
2371 |
|
break; |
|
2372 |
|
} |
|
2373 |
|
$ret .= $r; |
|
2374 |
|
} |
|
2375 |
|
break; |
2365 |
2376 |
} |
} |
2366 |
2377 |
|
|
2367 |
2378 |
if (!empty($rg['HTML:commit_labels'])) |
if (!empty($rg['HTML:commit_labels'])) |
2368 |
2379 |
$ret .= '<br />' . $rg['HTML:commit_labels']; |
$ret .= '<br />' . $rg['HTML:commit_labels']; |
2369 |
2380 |
$ret .= '</div>' . "\n"; |
$ret .= '</div>' . "\n"; |
2370 |
2381 |
|
|
|
2382 |
|
rg_log_exit(); |
2371 |
2383 |
return $ret; |
return $ret; |
2372 |
2384 |
} |
} |
2373 |
2385 |
|
|