# 
# 
# patch "ChangeLog"
#  from [ef2f8665b8252bb10ff0a39ff3c12f13cd225c62]
#    to [ed14b3885b18f12d320b554f75c02329a7b5cbb3]
# 
# patch "cmd_list.cc"
#  from [a3e2bd79d607ce808af2e32d871b5caeaecd8a2c]
#    to [735a51c0fb2d30044075a34c908e639751adcc60]
# 
============================================================
--- ChangeLog	ef2f8665b8252bb10ff0a39ff3c12f13cd225c62
+++ ChangeLog	ed14b3885b18f12d320b554f75c02329a7b5cbb3
@@ -1,3 +1,8 @@
+2006-06-13  Derek Scherger  <address@hidden>
+
+	* cmd_list.cc (ls_changed): roster friendly rewrite using existing
+	select_nodes_modified_by_cset
+
 2006-06-12  Derek Scherger  <address@hidden>
 
 	* cmd_merging.cc (get_roster): allow no arguments and default to
============================================================
--- cmd_list.cc	a3e2bd79d607ce808af2e32d871b5caeaecd8a2c
+++ cmd_list.cc	735a51c0fb2d30044075a34c908e639751adcc60
@@ -25,6 +25,7 @@
 #include "ui.hh"
 
 using std::cout;
+using std::endl;
 using std::make_pair;
 using std::map;
 using std::ostream_iterator;
@@ -412,49 +413,20 @@
 			included, excluded, mask);
   check_restricted_cset(old_roster, included);
 
-  // FIXME: this would probably be better as a function of roster.cc
-  // set<node_id> nodes;
-  // select_nodes_modified_by_cset(included, old_roster, 
-  // new_roster, nodes);
+  set<node_id> nodes;
+  select_nodes_modified_by_cset(included, old_roster, new_roster, nodes);
 
-  for (path_set::const_iterator i = included.nodes_deleted.begin();
-       i != included.nodes_deleted.end(); ++i)
-    {
-      if (mask.includes(*i))
-        files.insert(file_path(*i));
-    }
-  for (map<split_path, split_path>::const_iterator
-         i = included.nodes_renamed.begin();
-       i != included.nodes_renamed.end(); ++i)
-    {
-      // FIXME: is reporting the old name the "right" thing to do?
-      if (mask.includes(i->first))
-        files.insert(file_path(i->first));
-    }
-  for (path_set::const_iterator i = included.dirs_added.begin();
-       i != included.dirs_added.end(); ++i)
-    {
-      if (mask.includes(*i))
-        files.insert(file_path(*i));
-    }
-  for (map<split_path, file_id>::const_iterator 
-	 i = included.files_added.begin();
-       i != included.files_added.end(); ++i)
-    {
-      if (mask.includes(i->first))
-        files.insert(file_path(i->first));
-    }
-  for (map<split_path, pair<file_id, file_id> >::const_iterator
-         i = included.deltas_applied.begin(); i != included.deltas_applied.end();
+  for (set<node_id>::const_iterator i = nodes.begin(); i != nodes.end(); 
        ++i)
     {
-      if (mask.includes(i->first))
-        files.insert(file_path(i->first));
+      split_path sp;
+      if (old_roster.has_node(*i))
+        old_roster.get_name(*i, sp);
+      else
+        new_roster.get_name(*i, sp);
+      cout << sp << endl;
     }
-  // FIXME: should attr changes count?
 
-  copy(files.begin(), files.end(),
-       ostream_iterator<const file_path>(cout, "\n"));
 }