Changeset 294

Timestamp:

May 8, 2007, 7:47:12 PM (16 years ago)

Author:

Peter Johansson

Message:

refs #180, support:
diff:@288:294,
diff:tags/release-0.4/bin//tags/release-0.5/bin or
diff:trunk/lib/Trac.cc@288//trunk/lib/Trac.cc@294

Location:

trunk/lib

Files:

• Trac.cc (modified) (5 diffs)
• Trac.h (modified) (1 diff)
• utility.cc (modified) (2 diffs)
• utility.h (modified) (5 diffs)

trunk/lib/Trac.cc

@@ -96 +96 @@
       return false;
     const std::string::const_iterator first_orig(first);
-    if (match(first, last, "changeset:").empty()){
+    if (match(first, last, Str("changeset:")).empty()){
       first = first_orig;
       return false;
@@ -123 +123 @@
       if (changeset(first, str.end()))
         continue;
+      if (diff(first, str.end()))
+        continue;
       hs_ << *first;
       ++first;
@@ -136 +138 @@
 
     const std::string::const_iterator first_orig(first);
-    if (match(first, last, "comment:ticket:").empty()){
+    if (match(first, last, Str("comment:ticket:")).empty()){
       first = first_orig;
       return false;
@@ -208 +210 @@
     const std::string::const_iterator first_orig(first);
 
-    if (match(first, last, "ticket:").empty()){
+    if (match(first, last, Str("ticket:")).empty()){
       first = first_orig;
       return false;
@@ -217 +219 @@
     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;
   }

trunk/lib/Trac.h

@@ -62 +62 @@
                    const std::string::const_iterator& last);
 
+    bool diff(std::string::const_iterator& first, 
+              const std::string::const_iterator& last);
+
+    bool diff1(std::string::const_iterator& first, 
+               const std::string::const_iterator& last);
+
+    bool diff2(std::string::const_iterator& first, 
+               const std::string::const_iterator& last);
+
+    bool diff3(std::string::const_iterator& first, 
+               const std::string::const_iterator& last);
+
     bool comment(std::string::const_iterator& first, 
                  const std::string::const_iterator& last);

trunk/lib/utility.cc

@@ -111 +111 @@
 
 
-  std::string match(std::string::const_iterator& first,
-                    const std::string::const_iterator& last,
-                    const char* c)
-  {
-    std::string str(c);
-    if (match_begin(first, last, str)) {
-      first += str.size();
-      return str;
-    }
-    return std::string();
-  }
-
-
   bool node_exist(const std::string& path)
   {
@@ -188 +175 @@
     
 
+  Str::Str(std::string s)
+    : str_(s)
+  {}
+
+
+  not2Str::not2Str(std::string s1, std::string s2)
+    : str1_(s1), str2_(s2)
+  {}
+    
+
 }} // end of namespace svndigest and namespace theplu

trunk/lib/utility.h

@@ -134 +134 @@
 
 
-  std::string match(std::string::const_iterator& first,
-                    const std::string::const_iterator& last,
-                    const char*);
-
   template <class T>
   std::string match(std::string::const_iterator& first,
@@ -144 +140 @@
   {
     std::string res;
-    for (;first!=last && func(*first); ++first) 
+    for (;first!=last && func(first); ++first) 
       res.append(1,*first);
     return res;
@@ -151 +147 @@
   struct Digit
   {
-    inline bool operator()(char c) const { return isdigit(c); }
+    inline bool operator()(std::string::const_iterator i) const 
+    { return isdigit(*i); }
   };
 
@@ -158 +155 @@
   public:
     notChar(char);
-    inline bool operator()(char c) const { return c!=char_; }
+    inline bool operator()(std::string::const_iterator i) const 
+    { return *i!=char_; }
   private:
     char char_;
@@ -167 +165 @@
   public:
     not2Char(char, char);
-    inline bool operator()(char c) const 
-    { return c!=char1_ && c!=char2_; }
+    inline bool operator()(std::string::const_iterator i) const 
+    { return *i!=char1_ && *i!=char2_; }
   private:
     const char char1_;
     const char char2_;
+  };
+
+  class Str
+  {
+  public:
+    Str(std::string);
+    inline bool operator()(std::string::const_iterator i) const 
+    { return (std::equal(str_.begin(), str_.end(), i)); } 
+
+  private:
+    const std::string str_;
+  };
+
+  class not2Str
+  {
+  public:
+    not2Str(std::string, std::string);
+    inline bool operator()(std::string::const_iterator i) const 
+    { 
+      return !(std::equal(str1_.begin(), str1_.end(), i) ||
+              std::equal(str2_.begin(), str2_.end(), i));
+    } 
+
+  private:
+    const std::string str1_;
+    const std::string str2_;
   };