Merge lp:~dobey/bzr/xdgconfigdir into lp:~bzr/bzr/trunk-old

[Martin Pool]

[Martin Pool (mbp)]

This is mentioned as a possible fix for https://bugs.edge.launchpad.net/bzr/+bug/195397

[Martin Pool (mbp)]

This is not ok to merge as it is because it silently and unconditionally renames ~/.bazaar in to ~/.config/bazaar. Users may wonder where their old files have gone and it'll break them if they try to revert to an older version of Bazaar.

As James says it's probably best for now to just search the xdg direction before searching the .bazaar directory.

review: Needs Fixing

=== modified file 'bzrlib/config.py'
--- bzrlib/config.py	2009-06-11 06:49:21 +0000
+++ bzrlib/config.py	2009-07-07 17:35:29 +0000
@@ -766,8 +766,13 @@
 def config_dir():
     """Return per-user configuration directory.
 
+<<<<<<< TREE
     By default this is ~/.bazaar/
 
+=======
+    By default this is $XDG_CONFIG_HOME/bazaar/
+    
+>>>>>>> MERGE-SOURCE
     TODO: Global option --config-dir to override this.
     """
     base = os.environ.get('BZR_HOME', None)
@@ -783,9 +788,17 @@
     else:
         # cygwin, linux, and darwin all have a $HOME directory
         if base is None:
-            base = os.path.expanduser("~")
-        return osutils.pathjoin(base, ".bazaar")
+            base = os.environ.get('XDG_CONFIG_HOME', None)
+        if base is None:
+            base = osutils.pathjoin(os.path.expanduser("~"), ".config")
+        if (!osutils.isdir(base)):
+            os.mkdir(base)
 
+        newpath = osutils.pathjoin(base, "bazaar")
+        oldpath = osutils.pathjoin(os.path.expanduser("~"), ".bazaar")
+        if (osutils.isdir(oldpath) and not osutils.isdir(newpath)):
+                shutil.move(oldpath, newpath)
+        return newpath
 
 def config_filename():
     """Return per-user configuration ini file filename."""