lib/gitolite/config.rb in gitolite-1.0.1 vs lib/gitolite/config.rb in gitolite-1.1.0

@@ -165,10 +165,13 @@
               r.owner = owner
               r.description = description
             when /^include "(.+)"/
               #TODO: implement includes
               #ignore includes for now
+            when /^subconf (\S+)$/
+              #TODO: implement subconfs
+              #ignore subconfs for now
             else
               raise ParseError, "'#{line}' cannot be processed"
           end
         end
       end
@@ -201,18 +204,17 @@
       end
 
       # Builds a dependency tree from the groups in order to ensure all groups
       # are defined before they are used
       def build_groups_depgraph
-        dp = ::Plexus::Digraph.new
+        dp = ::GRATR::Digraph.new
 
         # Add each group to the graph
         @groups.each_value do |group|
           dp.add_vertex! group
 
           # Select group names from the users
-          subgroups = group.users.select {|u| u =~ /^#{Group::PREPEND_CHAR}.*$/}
-                                 .map{|g| get_group g.gsub(Group::PREPEND_CHAR, '') }
+          subgroups = group.users.select {|u| u =~ /^#{Group::PREPEND_CHAR}.*$/}.map{|g| get_group g.gsub(Group::PREPEND_CHAR, '') }
 
           subgroups.each do |subgroup|
             dp.add_edge! subgroup, group
           end
         end