# 
# patch "ChangeLog"
#  from [759652f62c49dd33941686f7dc390269e2cae41e]
#    to [232b63135226322660b916551871ee328c44e4f5]
# 
# patch "commands.cc"
#  from [d3c7c640db9dbd79733ad1cb555759a11f7567ff]
#    to [5be059441db2210d3e50cbeb6ab44aaa0f1ca00b]
# 
========================================================================
--- ChangeLog	759652f62c49dd33941686f7dc390269e2cae41e
+++ ChangeLog	232b63135226322660b916551871ee328c44e4f5
@@ -1,3 +1,11 @@
+2005-10-14  Emile Snyder  <address@hidden>
+
+	* commands.cc: Fix breakage I introduced with the --unknown flag.
+	Rename find_unknown to find_unknown_and_ignored, since that's what
+	it's actually doing.  Likewise ls_unknown ->
+	ls_unknown_or_ignored, and use find_unknown_and_ignored correctly.
+	Fixes t_mt_ignore.at failures.
+	
 2005-10-14  Nathaniel Smith  <address@hidden>
 
 	* key_store.{cc,hh} (get_key_dir): New method.
========================================================================
--- commands.cc	d3c7c640db9dbd79733ad1cb555759a11f7567ff
+++ commands.cc	5be059441db2210d3e50cbeb6ab44aaa0f1ca00b
@@ -1123,7 +1123,8 @@
 }
 
 
-static void find_unknown (app_state & app, bool want_ignored, vector<utf8> const & args, path_set & unknown);
+static void find_unknown_and_ignored (app_state & app, bool want_ignored, vector<utf8> const & args, 
+                                      path_set & unknown, path_set & ignored);
 
 CMD(add, N_("working copy"), N_("[PATH]..."),
     N_("add files to working copy"), OPT_UNKNOWN)
@@ -1145,8 +1146,8 @@
 
   if (app.unknown)
     {
-      path_set unknown;
-      find_unknown(app, false, args, unknown);
+      path_set unknown, ignored;
+      find_unknown_and_ignored(app, false, args, unknown, ignored);
       paths.insert(paths.end(), unknown.begin(), unknown.end());
     }
 
@@ -1639,33 +1640,35 @@
 }
 
 static void
-find_unknown (app_state & app, bool want_ignored, vector<utf8> const & args, path_set & unknown)
+find_unknown_and_ignored (app_state & app, bool want_ignored, vector<utf8> const & args, 
+                          path_set & unknown, path_set & ignored)
 {
   revision_set rev;
   manifest_map m_old, m_new;
   //path_set known, unknown, ignored;
-  path_set known, dummy;
+  path_set known;
 
   calculate_restricted_revision(app, args, rev, m_old, m_new);
 
   extract_path_set(m_new, known);
-  path_set &ignoredref = unknown;
-  if (!want_ignored)
-    ignoredref = dummy;
-  file_itemizer u(app, known, unknown, ignoredref);
+  file_itemizer u(app, known, unknown, ignored);
   walk_tree(file_path(), u);
 }
 
 static void
-ls_unknown (app_state & app, bool want_ignored, vector<utf8> const & args)
+ls_unknown_or_ignored (app_state & app, bool want_ignored, vector<utf8> const & args)
 {
   app.require_working_copy();
 
-  path_set unknown;
-  find_unknown(app, want_ignored, args, unknown);
+  path_set unknown, ignored;
+  find_unknown_and_ignored(app, want_ignored, args, unknown, ignored);
 
-  for (path_set::const_iterator i = unknown.begin(); i != unknown.end(); ++i)
-    cout << *i << endl;
+  if (want_ignored)
+    for (path_set::const_iterator i = ignored.begin(); i != ignored.end(); ++i)
+      cout << *i << endl;
+  else
+    for (path_set::const_iterator i = unknown.begin(); i != unknown.end(); ++i)
+      cout << *i << endl;
 }
 
 static void
@@ -1750,9 +1753,9 @@
   else if (idx(args, 0)() == "known")
     ls_known(app, removed);
   else if (idx(args, 0)() == "unknown")
-    ls_unknown(app, false, removed);
+    ls_unknown_or_ignored(app, false, removed);
   else if (idx(args, 0)() == "ignored")
-    ls_unknown(app, true, removed);
+    ls_unknown_or_ignored(app, true, removed);
   else if (idx(args, 0)() == "missing")
     ls_missing(app, removed);
   else