Rev 5537: Merge 671050-config-policy into 672382-list-values 672382-list-values resolving conflicts in file:///home/vila/src/bzr/experimental/config/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5537 [merge]
revision-id: v.ladeuil+lp at free.fr-20101117155110-0t8hwqz1evvsart8
parent: v.ladeuil+lp at free.fr-20101112093734-8br05asdt8yzmb03
parent: v.ladeuil+lp at free.fr-20101117114546-d4c9o3eu7s5hjiuh
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 672382-list-values
timestamp: Wed 2010-11-17 16:51:10 +0100
message:
  Merge 671050-config-policy into 672382-list-values 672382-list-values resolving conflicts
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2010-11-09 16:26:07 +0000
+++ b/bzrlib/config.py	2010-11-17 15:51:10 +0000
@@ -1866,9 +1866,12 @@
                 break
             for (oname, value, section, conf_id, parser) in c._get_options():
                 if name == oname:
-                    # Display only the first value and exit (We need to use
-                    # get_user_option to take policies into account and we need
-                    # to make sure the option exists too :-/)
+                    # Display only the first value and exit
+
+                    # FIXME: We need to use get_user_option to take policies
+                    # into account and we need to make sure the option exists
+                    # too (hence the two for loops), this needs a better API
+                    # -- vila 20101117
                     value = c.get_user_option(name)
                     # Quote the value appropriately
                     value = parser._quote(value)