# 
# patch "ChangeLog"
#  from [5ed0ea72fb56615cc9edbe8966bbbe219bc587c0]
#    to [314e17a646c60517bedc6de4ac94cde0475fbec1]
# 
# patch "change_set.cc"
#  from [8b9ede4bf381e207b8bd3c8f61b3087474d5c0ed]
#    to [786fb19053df43e4669b3b74f283ce23ccae0c3b]
# 
===============================================
--- ChangeLog	5ed0ea72fb56615cc9edbe8966bbbe219bc587c0
+++ ChangeLog	314e17a646c60517bedc6de4ac94cde0475fbec1
@@ -1,3 +1,8 @@
+2005-07-26  Nathaniel Smith  <address@hidden>
+
+	* change_set.cc (dump): Add path_state dumper.
+	(sanity_check_path_state): Add MM().
+
 2005-07-26  Richard Levitte  <address@hidden>
 
 	* revision.cc (check_sane_history): Convert tabs to the
===============================================
--- change_set.cc	8b9ede4bf381e207b8bd3c8f61b3087474d5c0ed
+++ change_set.cc	786fb19053df43e4669b3b74f283ce23ccae0c3b
@@ -277,6 +277,24 @@
 
 
 
+void
+dump(path_state const & st, std::string & out)
+{
+  for (path_state::const_iterator i = st.begin();
+       i != st.end(); ++i)
+    {
+      std::vector<path_component> tmp_v;
+      tmp_v.push_back(path_item_name(path_state_item(i)));
+      file_path tmp_fp;
+      compose_path(tmp_v, tmp_fp);
+      out += (F("tid %d: parent %d, type %s, name %s\n")
+              % path_state_tid(i) 
+              % path_item_parent(path_state_item(i))
+              % (path_item_type(path_state_item(i)) == ptype_directory ? "dir" : "file")
+              % tmp_fp).str();
+    }
+}
+
 // structure dumping 
 /*
 
@@ -609,6 +627,7 @@
 static void
 sanity_check_path_state(path_state const & ps)
 {
+  MM(ps);
   confirm_proper_tree(ps);
   confirm_unique_entries_in_directories(ps);
 }