Changes in trunk/lib/Trac.cc [288:294]

File:

• trunk/lib/Trac.cc (modified) (6 diffs)

trunk/lib/Trac.cc

@@ -27 +27 @@
 #include "HtmlStream.h"
 #include "html_utility.h"
+#include "utility.h"
 
 namespace theplu{
@@ -34 +35 @@
     : hs_(hs) 
   {}
+
+  bool Trac::changeset(std::string::const_iterator& first, 
+                       const std::string::const_iterator& last)
+  {
+    if (changeset1(first, last))
+      return true;
+    if (changeset2(first, last))
+      return true;
+    if (changeset3(first, last))
+      return true;
+    return false;
+  }
+
+
+  bool Trac::changeset1(std::string::const_iterator& first, 
+                        const std::string::const_iterator& last)
+  {
+    if (first==last)
+      return false;
+    if (*first != 'r')
+      return false;
+    const std::string::const_iterator first_orig(first);
+    ++first;
+    std::string rev = match(first, last, Digit());
+    if (rev.empty()){
+      first = first_orig;
+      return false;
+    }
+    std::string href(Configuration::instance().trac_root()+"changeset/"+rev);
+    hs_.stream() << anchor(href, std::string(first_orig,first)); 
+    return true;
+  }
+
+
+  bool Trac::changeset2(std::string::const_iterator& first, 
+                        const std::string::const_iterator& last)
+  {
+    if (first==last)
+      return false;
+    if (*first != '[')
+      return false;
+    const std::string::const_iterator first_orig(first);
+    ++first;
+    std::string rev = match(first, last, Digit());
+    if (rev.empty() || first==last || *first!=']'){
+      first = first_orig;
+      return false;
+    }
+    ++first;
+    std::string href(Configuration::instance().trac_root()+"changeset/"+rev);
+    hs_.stream() << anchor(href, std::string(first_orig,first)); 
+    return true;
+  }
+
+
+  bool Trac::changeset3(std::string::const_iterator& first, 
+                        const std::string::const_iterator& last)
+  {
+    if (first==last)
+      return false;
+    const std::string::const_iterator first_orig(first);
+    if (match(first, last, Str("changeset:")).empty()){
+      first = first_orig;
+      return false;
+    }
+    std::string rev = match(first, last, Digit());
+    if (rev.empty()){
+      first = first_orig;
+      return false;
+    }
+    std::string href(Configuration::instance().trac_root()+"changeset/"+rev);
+    hs_.stream() << anchor(href, std::string(first_orig,first)); 
+    return true;
+  }
+
 
   void Trac::print(std::string str)
@@ -43 +119 @@
       if (ticket(first, str.end()))
         continue;
+      if (comment(first, str.end()))
+        continue;
+      if (changeset(first, str.end()))
+        continue;
+      if (diff(first, str.end()))
+        continue;
       hs_ << *first;
       ++first;
@@ -49 +131 @@
 
 
+  bool Trac::comment(std::string::const_iterator& first, 
+                     const std::string::const_iterator& last)
+  {
+    if (first==last)
+      return false;
+
+    const std::string::const_iterator first_orig(first);
+    if (match(first, last, Str("comment:ticket:")).empty()){
+      first = first_orig;
+      return false;
+    }
+      
+    std::string ticket = match(first, last, Digit());
+    if (ticket.empty() || first == last || *first != ':') {
+      first = first_orig;
+      return false;
+    }
+    ++first;
+    std::string comment = match(first, last, Digit());
+    if (comment.empty() ) {
+      first = first_orig;
+      return false;
+    }
+    std::string href(Configuration::instance().trac_root()+"ticket/"+ticket+
+                     "#comment:"+comment);
+    std::string str(first_orig, first);
+    hs_.stream() << anchor(href, str); 
+    return true;
+
+
+    const Configuration& conf = Configuration::instance();
+    hs_.stream() << anchor(conf.trac_root()+"ticket/"+ticket,"#"+ticket); 
+    return true;
+
+  }
+
+
   bool Trac::ticket(std::string::const_iterator& first, 
                     const std::string::const_iterator& last)
   {
+    if (ticket1(first, last))
+      return true;
+    if (ticket2(first, last))
+      return true;
+    return false;
+  }
+
+
+  bool Trac::ticket1(std::string::const_iterator& first, 
+                     const std::string::const_iterator& last)
+  {
     if (first==last)
       return false;
@@ -59 +189 @@
       return false;
     ++first;
-    std::string ticket;
-    for (;first!=last && isdigit(*first); ++first) 
-      ticket.append(1,*first);
-
-    if (ticket.empty())
-      return false;
-
-    Configuration* conf = Configuration::instance();
-    hs_.stream() << anchor(conf->trac_ticket()+ticket,"#"+ticket); 
+    std::string ticket = match(first, last, Digit());
+
+    if (ticket.empty()) {
+      first = first_orig;
+      return false;
+    }
+
+    const Configuration& conf = Configuration::instance();
+    hs_.stream() << anchor(conf.trac_root()+"ticket/"+ticket,"#"+ticket); 
+    return true;
+  }
+
+
+  bool Trac::ticket2(std::string::const_iterator& first, 
+                     const std::string::const_iterator& last)
+  {
+    if (first==last)
+      return false;
+
+    const std::string::const_iterator first_orig(first);
+
+    if (match(first, last, Str("ticket:")).empty()){
+      first = first_orig;
+      return false;
+    }
+      
+    std::string ticket = match(first, last, Digit());
+
+    const Configuration& conf = Configuration::instance();
+    hs_.stream() << anchor(conf.trac_root()+"ticket/"+ticket,"#"+ticket); 
+    return true;
+  }
+
+
+  bool Trac::diff(std::string::const_iterator& first, 
+                  const std::string::const_iterator& last)
+  {
+    if (diff1(first, last))
+      return true;
+    if (diff3(first, last))
+      return true;
+    if (diff2(first, last))
+      return true;
+    return false;
+  }
+
+
+  bool Trac::diff1(std::string::const_iterator& first, 
+                   const std::string::const_iterator& last)
+  {
+    if (first==last)
+      return false;
+
+    const std::string::const_iterator first_orig(first);
+    if (match(first, last, Str("diff:")).empty()){
+      first = first_orig;
+      return false;
+    }
+    std::string node = match(first, last, notChar('@'));
+    if (first==last){
+      first = first_orig;
+      return false;
+    }
+    ++first; 
+    std::string old_rev = match(first, last, Digit());
+    if (old_rev.empty() || first == last || *first != ':') {
+      first = first_orig;
+      return false;
+    }
+    ++first;
+    std::string new_rev = match(first, last, Digit());
+    if (new_rev.empty() ) {
+      first = first_orig;
+      return false;
+    }
+    std::string href;
+    if (node.empty())
+      href = std::string(Configuration::instance().trac_root()+
+                         "changeset?new="+new_rev+"&old="+old_rev);
+    else
+      href = std::string(Configuration::instance().trac_root()+
+                         "changeset?new="+new_rev+"&new_path="+node+"&old="+
+                         old_rev+"&oldpath="+node);
+    hs_.stream() << anchor(href, std::string(first_orig, first)); 
+    return true;
+  }
+
+
+  bool Trac::diff2(std::string::const_iterator& first, 
+                   const std::string::const_iterator& last)
+  {
+    if (first==last)
+      return false;
+
+    const std::string::const_iterator first_orig(first);
+    if (match(first, last, Str("diff:")).empty()){
+      first = first_orig;
+      return false;
+    }
+    std::string old_path(match(first, last, not2Str("//", " ")));
+    std::string new_path;
+    if (first==last || *first==' ')
+      new_path = old_path;
+    else {
+      first += 2;
+      new_path = match(first, last, notChar(' '));
+    }
+    if (new_path.empty() || old_path.empty()){
+      first = first_orig;
+      return false;
+    }
+    std::string href(Configuration::instance().trac_root()+
+                     "changeset?new_path="+new_path+"&old_path="+old_path);
+    hs_.stream() << anchor(href, std::string(first_orig, first)); 
+    return true;
+  }
+
+
+  bool Trac::diff3(std::string::const_iterator& first, 
+                   const std::string::const_iterator& last)
+  {
+    if (first==last)
+      return false;
+
+    const std::string::const_iterator first_orig(first);
+    if (match(first, last, Str("diff:")).empty()){
+      first = first_orig;
+      return false;
+    }
+    std::string old_path(match(first, last, not2Char('@', ' ')));
+    if (*first!='@'){
+      first = first_orig;
+      return false;
+    }
+    ++first;
+    std::string old_rev(match(first, last, Digit()));
+    if (!match_begin(first, first+1, std::string("//"))) {
+      first = first_orig;
+      return false;
+    }
+    first+2;
+    std::string new_path = match(first, last, not2Char('@', ' '));
+    if (*first!='@'){
+      first = first_orig;
+      return false;
+    }
+    ++first;
+    std::string new_rev(match(first, last, Digit()));
+    if (new_rev.empty()){
+      first = first_orig;
+      return false;
+    }
+    
+    std::string href(Configuration::instance().trac_root()+
+                     "changeset?new="+new_rev+"&new_path="+new_path+
+                     "&old="+old_rev+"&old_path="+old_path);
+    hs_.stream() << anchor(href, std::string(first_orig, first)); 
     return true;
   }
@@ -75 +353 @@
                  const std::string::const_iterator& last)
   {
-    if (first==last)
-      return false;
-
-    const std::string::const_iterator first_orig(first);
-    if (*first != '#')
-      return false;
-    ++first;
-    std::string ticket;
-    for (;first!=last && isdigit(*first); ++first) 
-      ticket.append(1,*first);
-
-    if (ticket.empty())
-      return false;
-
-    Configuration* conf = Configuration::instance();
-    hs_.stream() << anchor(conf->trac_ticket()+ticket,"#"+ticket); 
+    if (log1(first, last))
+      return true;
+    if (log2(first, last))
+      return true;
+    if (log3(first, last))
+      return true;
+    return false;
+  }
+
+
+  bool Trac::log1(std::string::const_iterator& first, 
+                     const std::string::const_iterator& last)
+  {
+    if (first==last)
+      return false;
+
+    const std::string::const_iterator first_orig(first);
+    if (*first != 'r')
+      return false;
+    ++first;
+
+    std::string stop_rev = match(first, last, Digit());
+    if (stop_rev.empty() || first == last || *first != ':') {
+      first = first_orig;
+      return false;
+    }
+    ++first;
+    std::string rev = match(first, last, Digit());
+    if (rev.empty() ) {
+      first = first_orig;
+      return false;
+    }
+    std::string href(Configuration::instance().trac_root()+"log/?rev="+
+                     rev+"&stop_rev="+stop_rev);
+    hs_.stream() << anchor(href, std::string(first_orig, first)); 
+    return true;
+  }
+
+
+  bool Trac::log2(std::string::const_iterator& first, 
+                     const std::string::const_iterator& last)
+  {
+    if (first==last)
+      return false;
+
+    const std::string::const_iterator first_orig(first);
+    if (*first != '[')
+      return false;
+    ++first;
+
+    std::string stop_rev = match(first, last, Digit());
+    if (stop_rev.empty() || first == last || *first != ':') {
+      first = first_orig;
+      return false;
+    }
+    ++first;
+    std::string rev = match(first, last, Digit());
+    if (rev.empty() || first == last || *first != ']') {
+      first = first_orig;
+      return false;
+    }
+    std::string href(Configuration::instance().trac_root()+"log/?rev="+
+                     rev+"&stop_rev="+stop_rev);
+    hs_.stream() << anchor(href, std::string(first_orig, first)); 
+    return true;
+  }
+
+
+  bool Trac::log3(std::string::const_iterator& first, 
+                  const std::string::const_iterator& last)
+  {
+    if (first==last)
+      return false;
+
+    const std::string::const_iterator first_orig(first);
+
+    const std::string log_str("log:"); 
+    if (!match_begin(first, last, log_str)) {
+      first = first_orig;
+      return false;
+    }
+    first += log_str.size();
+    std::string node = match(first, last, not2Char('#', '@'));
+    ++first;
+    std::string stop_rev = match(first, last, Digit());
+    if (stop_rev.empty() || first == last || *first != ':') {
+      first = first_orig;
+      return false;
+    }
+    ++first;
+    std::string rev = match(first, last, Digit());
+    if (rev.empty() ) {
+      first = first_orig;
+      return false;
+    }
+    std::string href;
+    if (!node.empty() && node[0]=='/')
+      href = std::string(Configuration::instance().trac_root()+"log"+node+
+                         "?rev="+rev+"&stop_rev="+stop_rev);
+    else
+      href = std::string(Configuration::instance().trac_root()+"log/"+node+
+                         "?rev="+rev+"&stop_rev="+stop_rev);
+      
+    hs_.stream() << anchor(href, std::string(first_orig, first)); 
     return true;
   }