# 
# patch "ChangeLog"
#  from [4b511aa2329f261661f2dae6e43a4eb2c40d4999]
#    to [b0f2be2bbdd4d66c404c825fd335d9c446597cdc]
# 
# patch "monotone.texi"
#  from [131933a2c2cd95c13bf8e3b8c988b8e4bc97664d]
#    to [9329f360a56f9f72673f52a94f3293ce9c13a35d]
# 
# patch "tests/t_netsync_permissions.at"
#  from [73b0366351e254dd0c272fc9d01c04d2b5fba795]
#    to [fb766246587fa8cf19f1b2952ec63be65ad82b63]
# 
# patch "tests/t_netsync_single.at"
#  from [10e65a3f83698c36866333909f01cbdb6915efe3]
#    to [b3d48b1881c63ccb549d37726ae2d7144a856820]
# 
# patch "testsuite.at"
#  from [2e17e62213b9878d08d7c792f244b6e193498618]
#    to [e6acd9db25c55028d15b0e56f32214a94e55b4fc]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,13 @@
 2005-07-03  Nathaniel Smith  <address@hidden>
 
+	* monotone.texi (Network Service, Hooks):
+	* testsuite.at: 
+	* tests/t_netsync_permissions.at: 
+	* tests/t_netsync_single.at: Update to match new
+	get_netsync_write_permitted definition.
+
+2005-07-03  Nathaniel Smith  <address@hidden>
+
 	* lua.{cc,hh} (hook_get_netsync_write_permitted): Don't take a
 	branch argument; write permission is now all or none.  (It really
 	was before anyway...)
--- monotone.texi
+++ monotone.texi
@@ -1641,7 +1641,7 @@
   return false
 end
 
-function get_netsync_write_permitted (branch, identity)
+function get_netsync_write_permitted (identity)
   if (identity == "abe@@juicebot.co.jp") then return true end
   if (identity == "beth@@juicebot.co.jp") then return true end
   return false
@@ -5477,17 +5477,13 @@
 access hook. This hook has no default definition, therefore the
 default behavior is to deny all anonymous reads.
 
address@hidden get_netsync_write_permitted (@var{branch}, @var{identity})
address@hidden get_netsync_write_permitted (@var{identity})
 
-Returns @code{true} if a peer authenticated as key @var{identity}
-should be allowed to write into your database certs, revisions,
-manifests, and files associated with @var{branch}; otherwise @code{false}.
-This hook has no default definition, therefore the default behavior is to deny all writes.
+Returns @code{true} if a peer authenticated as key @var{identity} should
+be allowed to write into your database certs, revisions, manifests, and
+files; otherwise @code{false}.  This hook has no default definition,
+therefore the default behavior is to deny all writes.
 
-Note that if write access is granted for one branch it is effectively
-granted for the entire database, as there is currently no way to
-restrict that access to only that branch.
-
 Note that the @var{identity} value is a key ID (such as
 address@hidden@@pobox.com}'') but will correspond to a @emph{unique}
 key fingerprint (hash) in your database. Monotone will not permit two
--- tests/t_netsync_permissions.at
+++ tests/t_netsync_permissions.at
@@ -18,7 +18,7 @@
         return true
 end
 
-function get_netsync_write_permitted(pattern, identity)
+function get_netsync_write_permitted(identity)
         return true
 end
 
@@ -106,7 +106,7 @@
         return false
 end
 
-function get_netsync_write_permitted(pattern, identity)
+function get_netsync_write_permitted(identity)
         if (identity == "address@hidden") then return true end
         return false
 end
--- tests/t_netsync_single.at
+++ tests/t_netsync_single.at
@@ -11,7 +11,7 @@
 	return true
 end
 
-function get_netsync_write_permitted(pattern, identity)
+function get_netsync_write_permitted(identity)
 	return true
 end
 ])
--- testsuite.at
+++ testsuite.at
@@ -327,7 +327,7 @@
 	return true
 end
 
-function get_netsync_write_permitted(pattern, identity)
+function get_netsync_write_permitted(identity)
 	return true
 end
 ])