Changeset 380 for trunk/lib

Timestamp:

Jun 21, 2007, 9:25:39 PM (14 years ago)

Author:

Jari Häkkinen

Message:

Addresses #62. First blame output with lines.

Location:

trunk/lib

Files:

• Directory.cc (modified) (1 diff)
• Directory.h (modified) (1 diff)
• File.cc (modified) (3 diffs)
• File.h (modified) (4 diffs)
• HtmlStream.cc (modified) (2 diffs)
• Node.h (modified) (2 diffs)
• SVNblame.h (modified) (2 diffs)
• css.cc (modified) (5 diffs)

trunk/lib/Directory.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2005, 2006 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2007 Peter Johansson
+  Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson
 
   This file is part of svndigest, http://lev.thep.lu.se/trac/svndigest

trunk/lib/Directory.h

@@ -72 +72 @@
     std::string href(void) const;
 
-    ///
-    /// @return directory
-    ///
+    /**
+       @return The explicit string "directory", nothing else.
+    */
     std::string node_type(void) const;
 

trunk/lib/File.cc

@@ -25 +25 @@
 
 #include "Alias.h"
+#include "Date.h"
 #include "html_utility.h"
+#include "HtmlStream.h"
 #include "Stats.h"
+#include "SVNblame.h"
 #include "SVNlog.h"
 
@@ -77 +80 @@
   }
 
-  /*
-  void File::blame_anchor(std::ostream& os) const
-  {
-    os << "<h2 class=\"path\">\n";
-    std::vector<std::string> words;
-    words.reserve(level_+1);
-    std::string word;
-    words.push_back(Node::project_);
-    std::stringstream ss(local_path());
-    while(getline(ss,word,'/'))
-      if (!word.empty()) // ignore double slash in path
-        words.push_back(word);
-    if (words.size()==1)
-      os << anchor("index.html", Node::project_,0, "View " + Node::project_);
-    else {
-      for (size_t i=0; i<words.size()-1; ++i){
-        os << anchor("index.html", words[i], level_-i, "View " + words[i]);
-        os << "<span class=\"sep\">/</span>\n";
-      }
-      os << anchor(href(), words.back(), level_+2-words.size(), 
-             "View " + words.back()); 
-    }
-    os << "\n</h2>\n";
-  }
-  */
-
-  void File::print_blame(std::ofstream& os, const std::string line_type) const
-  {
-    os << "<h3>Blame information</h3>";
+
+  void File::print_blame(std::ofstream& os) const
+  {
+    os << "<br><h3>Blame Information</h3>";
     os << "<table class=\"blame\">\n";
     os << "<thead>\n";
     os << "<tr>\n";
-    os << "<th>Rev</th>\n";
-    os << "<th>Author</th>\n";
+    os << "<th class=\"number\">Rev</th>\n";
+    os << "<th class=\"date\">Date</th>\n";
+    os << "<th class=\"author\">Author</th>\n";
+    os << "<th class=\"number\">Lineno</th>\n";
     os << "<th>Line</th>\n";
     os << "</tr>\n</thead>\n";
     os << "<tbody>\n";
-
+    HtmlStream hs(os);
+    SVNblame blame(path_);
+    while (const struct SVNblame::blame_information* bi=blame.next()) {
+      os << "<tr>\n<td class=\"number\">" << bi->revision
+         << "</td>\n<td class=\"date\">"  << Date(bi->date)("%e %b %y")
+         << "</td>\n<td class=\"author\">";
+      hs << bi->author;
+      os << "</td>\n<td class=\"number\">" << bi->line_no+1
+         << "</td>\n<td class=\"code\">";
+      hs << bi->line;
+      os << "</td>\n</tr>\n";
+    }
     os << "</tbody>\n";
     os << "</table>\n";
@@ -259 +250 @@
     os << "</p>\n";
 
-    print_blame(os,line_type);
+    print_blame(os);
 
     print_footer(os);

trunk/lib/File.h

@@ -5 +5 @@
 
 /*
-  Copyright (C) 2005, 2006 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2007 Peter Johansson
+  Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson
 
   This file is part of svndigest, http://lev.thep.lu.se/trac/svndigest
@@ -50 +49 @@
     std::string href(void) const;
 
-    ///
-    /// @return file
-    ///
+    /**
+       @return The explicit string "file", nothing else.
+    */
     std::string node_type(void) const;
 
@@ -66 +65 @@
     ///
     const Stats& parse(const bool verbose=false);
-
-    ///
-    /// print blame output
-    ///
-    void print_blame(std::ofstream&, const std::string line_type) const;
 
     void print_copyright(std::map<std::string, Alias>&) const;
@@ -88 +82 @@
     File(const File&);
 
+    /**
+       @brief Print blame output
+    */
+    void print_blame(std::ofstream&) const;
+
     void print_core(bool verbose=false) const;
 

trunk/lib/HtmlStream.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2007 Peter Johansson
+  Copyright (C) 2007 Jari Häkkinen, Peter Johansson
 
   This file is part of svndigest, http://lev.thep.lu.se/trac/svndigest
@@ -38 +38 @@
     map_['>']=std::string(">");
     map_['&']=std::string("&");
+    map_[' ']=std::string(" ");
     // This should be configurable, but for now indentation is two spaces.
     map_['\t']=std::string("  ");

trunk/lib/Node.h

@@ -5 +5 @@
 
 /*
-  Copyright (C) 2005, 2006 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2007 Peter Johansson
+  Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson
 
   This file is part of svndigest, http://lev.thep.lu.se/trac/svndigest
@@ -114 +113 @@
     { return svninfo_.last_changed_rev(); }
 
-    ///
-    /// @return file or directory
-    ///
+    /**
+       @return The explicit string identifying the underlying derived
+       class.
+    */
     virtual std::string node_type(void) const=0;
 

trunk/lib/SVNblame.h

@@ -5 +5 @@
 
 /*
-  Copyright (C) 2006 Jari Häkkinen
+  Copyright (C) 2006, 2007 Jari Häkkinen
 
   This file is part of svndigest, http://lev.thep.lu.se/trac/svndigest
@@ -84 +84 @@
        item. The pointer is only valid while the SVNblame object is in
        scope.
-    
+
+       @return Pointer to a blame_information struct if more lines are
+       available NULL otherwise.
+
        @see struct blame_information.
     */

trunk/lib/css.cc

@@ -147 +147 @@
     s << "table.main td {\n";
     s << " padding: 0 1em .1em 0;\n";
-    s << "}\n";
+    s << "}\n\n";
 
     s << "table.blame {\n";
@@ -157 +157 @@
     s << " width: 100%;\n";
     s << "}\n";
-    s << "\n";
     s << "table.blame th {\n";
     s << " text-align: left;\n";
@@ -163 +162 @@
     s << " font-size: 12px\n";
     s << "}\n";
+    s << "table.blame th.author { width: 8em; text-align:right }\n";
+    s << "table.blame th.date { width: 8em; text-align:center }\n";
+    s << "table.blame th.number { width: 2em }\n";
     s << "table.blame thead { background: #f7f7f0 }\n";
     s << "table.blame thead th {\n";
@@ -172 +174 @@
     s << " vertical-align: bottom;\n";
     s << "}\n";
-    s << "\n";
-    s << "table.blame tbody td a:hover, table.listing tbody th a:hover {\n";
-    s << " background-color: transparent;\n";
-    s << "}\n";
-    s << "\n";
-    s << "table.blame tbody td, table.listing tbody th {\n";
+    s << "table.blame tbody td a:hover, table.blame tbody th a:hover {\n";
+    s << " background-color: transparent;\n";
+    s << "}\n";
+    s << "table.blame tbody td, table.blame tbody th {\n";
     s << " border: 1px dotted #ddd;\n";
     s << " padding: .33em .5em;\n";
-    s << " vertical-align: top;\n";
-    s << "}\n";
-    s << "\n";
-    s << "table.blame tbody td a:hover, table.listing tbody th a:hover {\n";
+    s << " vertical-align: bottom;\n";
+    s << "}\n";
+    s << "table.blame tbody td a:hover, table.blame tbody th a:hover {\n";
     s << " background-color: transparent;\n";
     s << "}\n";
@@ -191 +190 @@
     s << "table.blame tbody tr:hover { background: #eed }\n";
     s << "table.blame tbody td { text-align: left }\n";
+    s << "table.blame tbody td.author { text-align: right }\n";
+    s << "table.blame tbody td.code { font: normal 12px monospace }\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 a { display: block; }\n";
     s << "table.blame tbody td.directory a { font-weight: bold }\n";