# 
# 
# patch "ChangeLog"
#  from [b4aadc0c82eab54b7248bb01a72826bb4e09e099]
#    to [9810ac424b8cbf50d4cff1ada017f42a66fbca63]
# 
# patch "app_state.cc"
#  from [c360a84c19153585694de8a4f2e513a1c09c8f3a]
#    to [53c57e2022f837dd367751008d03e64f45c067d3]
# 
# patch "app_state.hh"
#  from [d105167c92048beb737e4144de73efc316c30371]
#    to [136c1cd134c4549ccd3c16b676bbb9a249c41ddd]
# 
# patch "commands.cc"
#  from [393eecd6f12b2419a6fc870dd5a5fd34c9433675]
#    to [50b3887eb01f57759a86a6ea6af692b2a83bcb9d]
# 
# patch "globish.cc"
#  from [989f71f06fc4a19a71280d3459e836dbc4be3b89]
#    to [98f9addeb5052e0c57327dc795a3d570254597ba]
# 
# patch "globish.hh"
#  from [bcbaf2efddd720efb786f5f2843890071e42e3d8]
#    to [a975865b52d39f57e1aea7feacfdfb533da3e2b9]
# 
============================================================
--- ChangeLog	b4aadc0c82eab54b7248bb01a72826bb4e09e099
+++ ChangeLog	9810ac424b8cbf50d4cff1ada017f42a66fbca63
@@ -1,3 +1,9 @@
+2006-02-13  Derek Scherger  <address@hidden>
+
+	* app_state.{cc,hh}: 
+	* globis.{cc,hh}: make exclude_patterns a vector rather than a
+	set so that restriction includes/excludes are of the same type
+
 2006-01-10  Derek Scherger  <address@hidden>
 
 	* tests/t_revert_unchanged.at: new test to check that reverting
============================================================
--- app_state.cc	c360a84c19153585694de8a4f2e513a1c09c8f3a
+++ app_state.cc	53c57e2022f837dd367751008d03e64f45c067d3
@@ -279,7 +279,7 @@
 void
 app_state::add_exclude(utf8 const & exclude_pattern)
 {
-  exclude_patterns.insert(exclude_pattern);
+  exclude_patterns.push_back(exclude_pattern);
 }
 
 void
============================================================
--- app_state.hh	d105167c92048beb737e4144de73efc316c30371
+++ app_state.hh	136c1cd134c4549ccd3c16b676bbb9a249c41ddd
@@ -51,9 +51,8 @@
   utf8 author;
   system_path search_root;
   std::vector<utf8> revision_selectors;
-  std::set<utf8> exclude_patterns;
+  std::vector<utf8> exclude_patterns;
   std::vector<utf8> extra_rcfiles;
-  path_set excludes;
   bool found_working_copy;
   long depth;
   long last;
============================================================
--- commands.cc	393eecd6f12b2419a6fc870dd5a5fd34c9433675
+++ commands.cc	50b3887eb01f57759a86a6ea6af692b2a83bcb9d
@@ -1995,7 +1995,7 @@
   if (serve_mode || (args.size() >= 2 || !app.exclude_patterns.empty()))
     {
       int pattern_offset = (serve_mode ? 0 : 1);
-      std::set<utf8> patterns(args.begin() + pattern_offset, args.end());
+      std::vector<utf8> patterns(args.begin() + pattern_offset, args.end());
       combine_and_check_globish(patterns, include_pattern);
       combine_and_check_globish(app.exclude_patterns, exclude_pattern);
       if (use_defaults &&
============================================================
--- globish.cc	989f71f06fc4a19a71280d3459e836dbc4be3b89
+++ globish.cc	98f9addeb5052e0c57327dc795a3d570254597ba
@@ -100,13 +100,13 @@
 }
 
 void
-combine_and_check_globish(std::set<utf8> const & patterns, utf8 & pattern)
+combine_and_check_globish(std::vector<utf8> const & patterns, utf8 & pattern)
 {
   std::string p;
   if (patterns.size() > 1)
     p += '{';
   bool first = true;
-  for (std::set<utf8>::const_iterator i = patterns.begin(); i != patterns.end(); ++i)
+  for (std::vector<utf8>::const_iterator i = patterns.begin(); i != patterns.end(); ++i)
     {
       std::string tmp;
       // run for the checking it does
@@ -184,10 +184,10 @@
 static void
 combine_and_check_globish_test()
 {
-  std::set<utf8> s;
-  s.insert(utf8("a"));
-  s.insert(utf8("b"));
-  s.insert(utf8("c"));
+  std::vector<utf8> s;
+  s.push_back(utf8("a"));
+  s.push_back(utf8("b"));
+  s.push_back(utf8("c"));
   utf8 combined;
   combine_and_check_globish(s, combined);
   BOOST_CHECK(combined() == "{a,b,c}");
============================================================
--- globish.hh	bcbaf2efddd720efb786f5f2843890071e42e3d8
+++ globish.hh	a975865b52d39f57e1aea7feacfdfb533da3e2b9
@@ -30,7 +30,7 @@
 
 #include "vocab.hh"
 
-void combine_and_check_globish(std::set<utf8> const &patterns, utf8 & pattern);
+void combine_and_check_globish(std::vector<utf8> const &patterns, utf8 & pattern);
 
 class globish_matcher
 {