# 
# patch "ChangeLog"
#  from [6493dc3c287ce52628b5bb92d13e053bf1e3a83d]
#    to [b1198712c4a780a585024d623c56f2fb106866f7]
# 
# patch "contrib/ciabot_monotone.py"
#  from [0fba88bed29df2383c8a4026def2ef27437c9cc7]
#    to [52e228b933b23db9c2c0b7cb554e1ebf9c3942d2]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,7 @@
+2005-07-05  Nathaniel Smith  <address@hidden>
+
+	* contrib/ciabot_monotone.py: Fix multiple collection support.
+
 2005-07-05  Nathaniel Smith  <address@hidden>
 
 	* NEWS: Add more explicit note on how to upgrade.
--- contrib/ciabot_monotone.py
+++ contrib/ciabot_monotone.py
@@ -37,12 +37,12 @@
         #    return "monotone"
         return "FIXME"
 
-    # Add entries of the form "server address": "collection name" to get
+    # Add entries of the form ("server address", "pattern") to get
     # this script to watch the given collections at the given monotone
     # servers.
-    watch_list = {
-        #"venge.net": "net.venge.monotone"
-        }
+    watch_list = [
+        #("venge.net", "net.venge.monotone"),
+        ]
 
     # If this is non-None, then the web interface will make any file 'foo' a
     # link to 'repository_uri/foo'.
@@ -261,7 +261,7 @@
         c = config()
         m = Monotone(c.monotone_exec, os.path.join(state_dir, "database.db"))
         m.ensure_db_exists()
-        for server, collection in c.watch_list.items():
+        for server, collection in c.watch_list:
             m.pull(server, collection)
         lf = LeafFile(os.path.join(state_dir, "leaves"))
         new_leaves = m.leaves()