Rev 5796: Merge config-hooks into selftest-config-stats in file:///home/vila/src/bzr/experimental/config/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/config/

------------------------------------------------------------
revno: 5796 [merge]
revision-id: v.ladeuil+lp at free.fr-20110613102354-xaywjfcgwjtlmfqt
parent: v.ladeuil+lp at free.fr-20110613072202-114pzj2lfshce932
parent: v.ladeuil+lp at free.fr-20110613102346-25hem1cl1q05kd1q
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: selftest-config-stats
timestamp: Mon 2011-06-13 12:23:54 +0200
message:
  Merge config-hooks into selftest-config-stats
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-06-13 07:22:02 +0000
+++ b/bzrlib/config.py	2011-06-13 10:23:46 +0000
@@ -857,7 +857,7 @@
         for hook in ConfigHooks['remove']:
             # We're lying here pretending to be a Stack until we get deprecated
             # -- vila 20110610
-            hook(self, name)
+            hook(self, option_name)
 
     def _write_config_file(self):
         if self.file_name is None:
@@ -869,6 +869,10 @@
         atomic_file.commit()
         atomic_file.close()
         osutils.copy_ownership_from_path(self.file_name)
+        for hook in ConfigHooks['save']:
+            # We're lying here pretending to be a Store until we get deprecated
+            # -- vila 20110610
+            hook(self)
 
 
 class LockableConfig(IniBasedConfig):
@@ -1005,7 +1009,7 @@
         for hook in ConfigHooks['set']:
             # We're lying here pretending to be a Store until we get deprecated
             # -- vila 20110610
-            hook(self, name, value)
+            hook(self, option, value)
 
     def _get_sections(self, name=None):
         """See IniBasedConfig._get_sections()."""
@@ -1210,7 +1214,7 @@
         for hook in ConfigHooks['set']:
             # We're lying here pretending to be a Store until we get deprecated
             # -- vila 20110610
-            hook(self, name, value)
+            hook(self, option, value)
 
 
 class BranchConfig(Config):
@@ -2113,7 +2117,12 @@
                 section_obj = configobj[section]
             except KeyError:
                 return default
-        return section_obj.get(name, default)
+        value = section_obj.get(name, default)
+        for hook in ConfigHooks['get']:
+            # We're lying here pretending to be a Stack until we get deprecated
+            # -- vila 20110613
+            hook(self, name, value)        
+        return value
 
     def set_option(self, value, name, section=None):
         """Set the value associated with a named option.
@@ -2127,6 +2136,10 @@
             configobj[name] = value
         else:
             configobj.setdefault(section, {})[name] = value
+        for hook in ConfigHooks['set']:
+            # We're lying here pretending to be a Store until we get deprecated
+            # -- vila 20110610
+            hook(self, name, value)
         self._set_configobj(configobj)
 
     def remove_option(self, option_name, section_name=None):
@@ -2135,11 +2148,20 @@
             del configobj[option_name]
         else:
             del configobj[section_name][option_name]
+        for hook in ConfigHooks['remove']:
+            # We're lying here pretending to be a Store until we get deprecated
+            # -- vila 20110613
+            hook(self, option_name, value)
         self._set_configobj(configobj)
 
     def _get_config_file(self):
         try:
-            return StringIO(self._transport.get_bytes(self._filename))
+            f = StringIO(self._transport.get_bytes(self._filename))
+            for hook in ConfigHooks['load']:
+                # We're lying here pretending to be a Store until we get
+                # deprecated -- vila 20110613
+                hook(self)
+            return f
         except errors.NoSuchFile:
             return StringIO()
 
@@ -2155,6 +2177,10 @@
         configobj.write(out_file)
         out_file.seek(0)
         self._transport.put_file(self._filename, out_file)
+        for hook in ConfigHooks['save']:
+            # We're lying here pretending to be a Store until we get deprecated
+            # -- vila 20110613
+            hook(self)
 
 
 class Option(object):