# 
# patch "commands.cc"
#  from [6b0093bedfb3a8fece448924f81e73d9ca0a6b0c]
#    to [00a866efd9308bccb954e5b7a00681575cd9ccce]
# 
--- commands.cc
+++ commands.cc
@@ -3104,48 +3104,7 @@
     std::cout << "no common ancestor/dominator found" << std::endl;
 }
 
-/*
-class ancestry_graph_formatter {
-public:
-  virtual void open_graph (std::ostream &os) = 0;
-  virtual void open_node (std::ostream &os) = 0;
-  virtual void node_content (std::ostream &os) = 0;
-  virtual void node_close (std::ostream &os) = 0;
-  virtual void edge (const std::pair<revision_id, string> &e) = 0;
-};
 
-class ancestry_graph_agraph_formatter 
-  : public ancestry_graph_formatter
-{
-public:
-  virtual void open_graph (std::ostream &os) {
-    os << "graph: " << endl << "{" << endl;
-  }
-
-  virtual void open_node (std::ostream &os) {
-    os << "node: { title : \"" << rev << "\"\n"
-       << "        label : \"\\fb" << rev;
-  }
-
-  virtual void node_content (std::ostream &os, const std::string &s) {
-    os << s << endl;
-  }
-
-  virtual void close_node (std::ostream &os) {
-    os << "\"}" << endl;
-  }
-
-  virtual void edge (std::ostream &os, revision_id src_rev, revision_id target_rev) {
-      os << "edge: { sourcename : \"" << src_rev << "\"" << endl
-         << "        targetname : \"" << target_rev << "\" }" << endl;
-  }
-
-  virtual void close_graph (std::ostream &os) {
-    os << "{" << endl << endl;
-  }
-};
-*/
-
 CMD(agraph, "debug", "", "dump ancestry graph to stdout in VCG format")
 {
   set<revision_id> nodes;
@@ -3207,77 +3166,6 @@
 }
 
 
-CMD(agraphviz, "debug", "", "dump ancestry graph to stdout in DOT format")
-{
-  set<revision_id> nodes;
-  multimap<revision_id,string> branches;
-
-  std::multimap<revision_id, revision_id> edges_mmap;
-  set<pair<revision_id, revision_id> > edges;
-
-  app.db.get_revision_ancestry(edges_mmap);
-
-  // convert from a weak lexicographic order to a strong one
-  for (std::multimap<revision_id, revision_id>::const_iterator i = edges_mmap.begin();
-       i != edges_mmap.end(); ++i)
-    edges.insert(std::make_pair(i->first, i->second));
-
-  for (set<pair<revision_id, revision_id> >::const_iterator i = edges.begin();
-       i != edges.end(); ++i)
-    {
-      nodes.insert(i->first);
-      nodes.insert(i->second);
-    }
-
-  /*
-  vector< revision<cert> > certs;
-  app.db.get_revision_certs(branch_cert_name, certs);
-  for(vector< revision<cert> >::iterator i = certs.begin();
-      i != certs.end(); ++i)
-    {
-      cert_value tv;
-      decode_base64(i->inner().value, tv);
-      revision_id tmp(i->inner().ident);
-      nodes.insert(tmp); // in case no edges were connected
-      branches.insert(make_pair(tmp, tv()));
-    }  
-  */
-
-  //cout << "graph: " << endl << "{" << endl; // open graph
-  cout << "digraph \"monotone graph\" {" << endl;
-
-  for (set<revision_id>::iterator i = nodes.begin(); i != nodes.end();
-       ++i)
-    {
-      //cout << "node: { title : \"" << *i << "\"\n"
-      //     << "        label : \"\\fb" << *i;
-      cout << "\"" << *i << "\" [ label = \"" << (*i).inner()().substr(0, 6);
-
-      /*
-      pair<multimap<revision_id,string>::const_iterator,
-        multimap<revision_id,string>::const_iterator> pair =
-        branches.equal_range(*i);
-      for (multimap<revision_id,string>::const_iterator j = pair.first;
-           j != pair.second; ++j)
-        {
-          cout << "\\n\\fn" << j->second;
-        }
-      */
-
-      //cout << "\"}" << endl;
-      cout << "\" ];" << endl;
-    }
-  for (set<pair<revision_id, revision_id> >::iterator i = edges.begin(); i != edges.end();
-       ++i)
-    {
-      //cout << "edge: { sourcename : \"" << i->first << "\"" << endl
-      //     << "        targetname : \"" << i->second << "\" }" << endl;
-      cout << "\"" << i->first << "\" -> \"" << i->second << "\";" << endl;
-    }
-  cout << "}" << endl << endl; // close graph
-}
-
-
 static void
 write_file_targets(change_set const & cs,
                    update_merge_provider & merger,