Changeset 403

Timestamp:

Jun 29, 2007, 1:23:12 AM (16 years ago)

Author:

Peter Johansson

Message:

fixes #160 - color coding different linetypes in blame output

Location:

trunk/lib

Files:

• File.cc (modified) (4 diffs)
• css.cc (modified) (2 diffs)

trunk/lib/File.cc

@@ -88 +88 @@
     os << "<thead>\n";
     os << "<tr>\n";
-    os << "<th class=\"number\">Rev</th>\n";
+    os << "<th class=\"rev\">Rev</th>\n";
     os << "<th class=\"date\">Date</th>\n";
     os << "<th class=\"author\">Author</th>\n";
-    os << "<th class=\"number\">Line</th>\n";
+    os << "<th class=\"line\">Line</th>\n";
     os << "<th></th>\n";
     os << "</tr>\n</thead>\n";
@@ -97 +97 @@
     HtmlStream hs(os);
     SVNblame blame(path_);
+    Parser parser(path_);
+    std::vector<Parser::line_type>::const_iterator 
+      line_type(parser.type().begin());
     int last=0;
     int first=0;
@@ -118 +121 @@
       else
         color = hex(static_cast<int>(k*blame.revision()+m),2);
-      os << "<tr>\n<td class=\"number\"><font color=\"#" << color 
+      os << "<tr>\n<td class=\"rev\"><font color=\"#" << color 
          << color << color << "\">" << blame.revision()
          << "</font></td>\n<td class=\"date\"><font color=\"#" << color 
@@ -125 +128 @@
       os << "</font></td>\n<td class=\"author\">";
       hs << blame.author();
-      os << "</td>\n<td class=\"number\">" << blame.line_no()+1
+      os << "</td>\n<td class=\"";
+      assert(line_type!=parser.type().end());
+      if (*line_type==Parser::empty)
+        os << "line-other";
+      else if (*line_type==Parser::comment)
+        os << "line-comment";
+      else
+        os << "line-code";
+      os << "\">" << blame.line_no()+1
          << "</td>\n<td>";
       hs << blame.line();
       os << "</td>\n</tr>\n";
       blame.next_line();
+      ++line_type;
     }
     os << "</tbody>\n";

trunk/lib/css.cc

@@ -177 +177 @@
     s << "table.blame th.author { width: 5em; text-align:right }\n";
     s << "table.blame th.date { width: 8em; text-align:center }\n";
-    s << "table.blame th.number { width: 3em }\n";
+    s << "table.blame th.rev { width: 3em }\n";
+    s << "table.blame th.line { width: 3em }\n";
     s << "table.blame thead th {\n";
     s << " background: #eee;\n";
@@ -195 +196 @@
     s << "table.blame tbody td.author { text-align: right; }\n";
     s << "table.blame tbody td.date { text-align: center; }\n";
-    s << "table.blame tbody td.number { text-align: right; }\n";
+    s << "table.blame tbody td.rev { text-align: right; }\n";
+    s << "table.blame tbody td.line-code { text-align: right; " 
+      << "background: #cfcfff; }\n";
+    s << "table.blame tbody td.line-comment { text-align: right; "
+      << "background: #e8e8ff; }\n";
+    s << "table.blame tbody td.line-other { text-align: right; "
+      << "background: #fffff}\n";
     s << "table.blame tbody tr:hover { background: #eed; }\n";
     s << "\n";