From 25e7e9e9698ccb7f59fabdfbf95eeba080e3996c Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Sat, 23 Jan 2016 06:01:04 +0000
Subject: [PATCH] enhanced auto-corelation between issue and code revision

---
 codepot/etc/post-commit.in                  | 11 +++++++++--
 codepot/etc/post-revprop-change.in          | 11 +++++++++--
 codepot/src/codepot/views/code_revision.php | 18 ++++++++++++++++--
 codepot/src/codepot/views/issue_show.php    |  1 +
 codepot/src/codepot/views/site_home.php     |  5 +++--
 codepot/src/css/common.css                  |  8 ++++----
 codepot/src/css/issue.css                   |  8 ++++++--
 7 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/codepot/etc/post-commit.in b/codepot/etc/post-commit.in
index f5f69741..cb31aabb 100644
--- a/codepot/etc/post-commit.in
+++ b/codepot/etc/post-commit.in
@@ -115,11 +115,18 @@ sub find_issue_reference_in_commit_message
 
 	# find [[#IXXXX]]
 	my @issue_ids = ($commit_message =~ /\[\[#I(\d+)\]\]/g);
+	# find #XXXX
+	my @issue_ids2 = ($commit_message =~ /(^|[^#])#(\d+)(\D|$)/g);
 
 	# find unique issue ids in the findings.
 	my %tmp;
-	@tmp{@issue_ids}=1;
-	my @unique_issue_ids=keys %tmp;
+	@tmp{@issue_ids} = 1;
+	for (my $i = 0; $i < scalar(@issue_ids2); $i += 3)
+	{
+		my $id = @issue_ids2[$i + 1];
+		@tmp{$id} = 1;
+	}
+	my @unique_issue_ids = keys(%tmp);
 
 	$dbh->begin_work ();
 
diff --git a/codepot/etc/post-revprop-change.in b/codepot/etc/post-revprop-change.in
index 932b6bf2..53619894 100644
--- a/codepot/etc/post-revprop-change.in
+++ b/codepot/etc/post-revprop-change.in
@@ -99,11 +99,18 @@ sub find_issue_reference_in_commit_message
 
 	# find [[#IXXXX]]
 	my @issue_ids = ($commit_message =~ /\[\[#I(\d+)\]\]/g);
+	# find #XXXX
+	my @issue_ids2 = ($commit_message =~ /(^|[^#])#(\d+)(\D|$)/g);
 
 	# find unique issue ids in the findings.
 	my %tmp;
-	@tmp{@issue_ids}=1;
-	my @unique_issue_ids=keys %tmp;
+	@tmp{@issue_ids} = 1;
+	for (my $i = 0; $i < scalar(@issue_ids2); $i += 3)
+	{
+		my $id = @issue_ids2[$i + 1];
+		@tmp{$id} = 1;
+	}
+	my @unique_issue_ids = keys(%tmp);
 
 	$dbh->begin_work ();
 
diff --git a/codepot/src/codepot/views/code_revision.php b/codepot/src/codepot/views/code_revision.php
index 35947278..7d5ebd11 100644
--- a/codepot/src/codepot/views/code_revision.php
+++ b/codepot/src/codepot/views/code_revision.php
@@ -680,14 +680,28 @@ $history = $file['history'];
 				foreach ($related_issues as $ri)
 				{
 					$hex_issueid = $this->converter->AsciiToHex ($ri->issueid);
-					//$transformed_message = preg_replace ("/\[\[#I{$ri->issueid}\]\]/", anchor ("/issue/show/{$ri->projectid}/{$hex_issueid}", $ri->issueid . ':' . htmlspecialchars($ri->summary), "class='codepot-issue-type-{$ri->type}'"), $transformed_message);
-					//$transformed_message = preg_replace ("/\[\[(#I{$ri->issueid})\]\]/", "[[<span class='codepot-issue-type-{$ri->type}'>\${1}</span>]]", $transformed_message);
+
+					// handle [[#IXXX]]
 					$transformed_message = preg_replace (
 						"/\[\[(#I{$ri->issueid})\]\]/", 
 						'[[' . anchor ("/issue/show/{$ri->projectid}/{$hex_issueid}", "\${1}", "class='codepot-issue-type-{$ri->type}'") . ']]',
 						$transformed_message
 					);
+
+					// handle #XXXX. ##XXXX or some weird variants are not allowed.
+					$transformed_message = preg_replace (
+						"/(^|[^#])#{$ri->issueid}([^[:digit:]]|$)/", 
+						"\${1}" . anchor ("/issue/show/{$ri->projectid}/{$hex_issueid}", "#{$ri->issueid}", "class='codepot-issue-type-{$ri->type}'") . "\${2}",
+						$transformed_message
+					);
 				}
+
+				// handle [[#RXXX]]
+				$transformed_message = preg_replace (
+					"/\[\[(#R([[:digit:]]+))\]\]/", 
+					'[[' . anchor ("/code/revision/{$project->id}/!./\${2}", "\${1}", "class='codepot-hashed-revision-number'") . ']]',
+					$transformed_message
+				);
 			?>
 			<pre id="code_revision_metadata_text"><?php print $transformed_message; ?></pre>
 		</div>
diff --git a/codepot/src/codepot/views/issue_show.php b/codepot/src/codepot/views/issue_show.php
index a22a6b6e..dc8a955d 100644
--- a/codepot/src/codepot/views/issue_show.php
+++ b/codepot/src/codepot/views/issue_show.php
@@ -1012,6 +1012,7 @@ function print_issue_state ($con, $issue, $old, $issue_type_array, $issue_status
 			if (!empty($related_code_revisions))
 			{
 				print '<ul id="issue_show_coderev_list" class="codepot-horizontal-list">';
+				print '<li><i class="fa fa-hand-o-right"></i> ' . $this->lang->line ('Code') . '</li>';
 				foreach ($related_code_revisions as $r)
 				{
 					print '<li>';
diff --git a/codepot/src/codepot/views/site_home.php b/codepot/src/codepot/views/site_home.php
index d8583160..15251aa1 100644
--- a/codepot/src/codepot/views/site_home.php
+++ b/codepot/src/codepot/views/site_home.php
@@ -291,10 +291,10 @@ foreach ($latest_projects as $project)
 		<?php print $this->lang->line('Open issues')?>
 	</div>
 
-
-
 	<ul id="site_home_result_open_issues_list" class="collapsible-box-list">
 		<?php 
+/*
+TODO: show site issue stats.
 		foreach ($open_issue_counts_per_project as $issue)
 		{
 			$pro = $issue->projectid;
@@ -308,6 +308,7 @@ foreach ($latest_projects as $project)
 			$proissueanc = anchor ("issue/home/{$issue->projectid}", $pro);
 			print "<li>{$proissueanc} <span class='codepot-open-issue-count'>{$issue->issue_count}</span></li>";
 		}
+*/
 
 		foreach ($issues as $issue) 
 		{
diff --git a/codepot/src/css/common.css b/codepot/src/css/common.css
index 39caa812..be11d546 100644
--- a/codepot/src/css/common.css
+++ b/codepot/src/css/common.css
@@ -1046,10 +1046,10 @@ ul.codepot-horizontal-list li {
 	float: left;
 }
 
-.codepot-opacity-85 {
-	filter:alpha(opacity=85); /* IE */
-	opacity: 0.85; /* Safari, Opera */
-	-moz-opacity:0.85; /* FireFox */
+
+.codepot-hashed-revision-number {
+	/* #RXXXX */
+	background-color: #CACACA;
 }
 
 /* === common issue class === */
diff --git a/codepot/src/css/issue.css b/codepot/src/css/issue.css
index c44ca10f..8faa5310 100644
--- a/codepot/src/css/issue.css
+++ b/codepot/src/css/issue.css
@@ -150,9 +150,13 @@ textarea.codepot-issue-edit-comment {
 	margin-top: 2em;
 }
 
+#issue_show_coderev_list li:nth-child(1) i {
+	color: #BB4533;
+}
+
 #issue_show_coderev_list a {
-	color: #FFFFFF;
-	background-color: #45A067;
+	color: #444444;
+	background-color: #CECECE;
 	padding: 0.3em;
 
 	-moz-border-radius: 3px;