natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Expand the revision and source linking automatisms to support the following

Browse Source 
rev 12345
 added in abc12
 removed in abc12
 src:README@abc12
 src:README, src:COPYING#12
and many more schemes.
This commit is contained in:
Thomas Keller 2010-11-29 21:50:40 +01:00
parent 653299f4d8
commit dc2881ad02
1 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/IDF/Template/IssueComment.php
View File

@ -51,9 +51,13 @@ class IDF_Template_IssueComment extends Pluf_Template_Tag
array($this, 'callbackReviews'), $text); array($this, 'callbackReviews'), $text);
} }
if ($request->rights['hasSourceAccess']) { if ($request->rights['hasSourceAccess']) {
$text = preg_replace_callback('#(commits?\s+)([0-9a-f]{1,40}(?:(?:\s+and|\s+or|,)\s+[0-9a-f]{1,40})*)\b#i', $verbs = array('added', 'fixed', 'reverted', 'changed', 'removed');
$nouns = array('commit', 'commits', 'revision', 'revisions', 'rev', 'revs');
$prefix = implode(' in|', $verbs).' in' . '|'.
implode('|', $nouns);
$text = preg_replace_callback('#((?:'.$prefix.')(?:\s+r?))([0-9a-f]{1,40}((?:\s+and|\s+or|,)\s+r?[0-9a-f]{1,40})*)\b#i',
array($this, 'callbackCommits'), $text); array($this, 'callbackCommits'), $text);
$text = preg_replace_callback('#(src:)([^\s\(\)\\\\]+(?:(\\\\)\s+[^\s\(\)\\\\]+){0,})+#im', $text = preg_replace_callback('=(src:)([^\s@#,\(\)\\\\]+(?:(\\\\)[\s@#][^\s@#,\(\)\\\\]+){0,})+(?:\@([^\s#,]+))(?:#(\d+))?=im',
array($this, 'callbackSource'), $text); array($this, 'callbackSource'), $text);
} }
if ($wordwrap) $text = Pluf_Text::wrapHtml($text, 69, "\n"); if ($wordwrap) $text = Pluf_Text::wrapHtml($text, 69, "\n");
@ -122,15 +126,12 @@ class IDF_Template_IssueComment extends Pluf_Template_Tag
function callbackCommits($m) function callbackCommits($m)
{ {
$keyword = rtrim($m[1]); $keyword = rtrim($m[1]);
if ('commits' === $keyword) { if (empty($m[3])) {
// Multiple commits like 'commits 6e030e6, a25bfc1 and
// 3c094f8'.
return $m[1].preg_replace_callback('#\b[0-9a-f]{4,40}\b#i', array($this, 'callbackCommit'), $m[2]);
} else if ('commit' === $keyword) {
// Single commit like 'commit 6e030e6'. // Single commit like 'commit 6e030e6'.
return $m[1].call_user_func(array($this, 'callbackCommit'), array($m[2])); return $m[1].call_user_func(array($this, 'callbackCommit'), array($m[2]));
} }
return $m[0]; // Multiple commits like 'commits 6e030e6, a25bfc1 and 3c094f8'.
return $m[1].preg_replace_callback('#\b[0-9a-f]{1,40}\b#i', array($this, 'callbackCommit'), $m[2]);
} }
/** /**
@ -189,18 +190,39 @@ class IDF_Template_IssueComment extends Pluf_Template_Tag
function callbackSource($m) function callbackSource($m)
{ {
if (!$this->scm->isAvailable()) return $m[0]; if (!$this->scm->isAvailable())
return $m[0];
$commit = null;
if (!empty($m[4])) {
if (!$this->scm->getCommit($m[4])) {
return $m[0];
}
$commit = $m[4];
}
$file = $m[2]; $file = $m[2];
if (!empty($m[3])) $file = str_replace($m[3], '', $file); if (!empty($m[3]))
$request_file_info = $this->scm->getPathInfo($file); $file = str_replace($m[3], '', $file);
$linktext = $file;
if (!empty($commit))
$linktext .= '@'.$commit;
$request_file_info = $this->scm->getPathInfo($file, $commit);
if (!$request_file_info) { if (!$request_file_info) {
return $m[0]; return $m[0];
} }
if ($request_file_info->type != 'tree') { if ($request_file_info->type == 'tree') {
return $m[1].'<a href="'.Pluf_HTTP_URL_urlForView('IDF_Views_Source::tree', array($this->project->shortname, $this->scm->getMainBranch(), $file)).'">'.$file.'</a>';
}
return $m[0]; return $m[0];
} }
$link = Pluf_HTTP_URL_urlForView('IDF_Views_Source::tree', array(
$this->project->shortname,
$commit == null ? $this->scm->getMainBranch() : $commit,
$file
));
if (!empty($m[5])) {
$link .= '#L'.$m[5];
$linktext .= '#'.$m[5];
}
return $m[1].'<a href="'.$link.'">'.$linktext.'</a>';
}
/** /**
* Generate the link to an issue. * Generate the link to an issue.