From a526eb7222826fbdb15b0d3288de7b73ec8a0853 Mon Sep 17 00:00:00 2001
From: MolarAmbiguity <MolarAmbiguity@gmail.com>
Date: Sat, 15 Apr 2017 09:23:35 +1000
Subject: [PATCH] Implement feedback from sampsyo

---
 beets/ui/__init__.py   | 11 +++++------
 docs/reference/cli.rst |  7 +++++--
 testconfig.yaml        | 10 ++++++++++
 3 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 testconfig.yaml

diff --git a/beets/ui/__init__.py b/beets/ui/__init__.py
index 762a21174..75bce9e7a 100644
--- a/beets/ui/__init__.py
+++ b/beets/ui/__init__.py
@@ -1122,12 +1122,11 @@ def _configure(options):
     # special handling lets specified plugins get loaded before we
     # finish parsing the command line.
     if getattr(options, 'config', None) is not None:
-        overlay_path = True
-        config_path = options.config
+        overlay_path = options.config
         del options.config
-        config.set_file(config_path)
+        config.set_file(overlay_path)
     else:
-        overlay_path = False
+        overlay_path = None
     config.set_args(options)
 
     # Configure the logger.
@@ -1138,11 +1137,11 @@ def _configure(options):
 
     if overlay_path:
         log.debug(u'overlaying configuration: {0}',
-                  util.displayable_path(config_path))
+                  util.displayable_path(overlay_path))
 
     config_path = config.user_config_path()
     if os.path.isfile(config_path):
-        log.debug(u'base user configuration: {0}',
+        log.debug(u'user configuration: {0}',
                   util.displayable_path(config_path))
     else:
         log.debug(u'no user configuration found at {0}',
diff --git a/docs/reference/cli.rst b/docs/reference/cli.rst
index 58ce8c324..37fc31767 100644
--- a/docs/reference/cli.rst
+++ b/docs/reference/cli.rst
@@ -409,8 +409,11 @@ import ...``.
 * ``-v``: verbose mode; prints out a deluge of debugging information. Please use
   this flag when reporting bugs. You can use it twice, as in ``-vv``, to make
   beets even more verbose.
-* ``-c FILE``: read a specified YAML :doc:`configuration file <config>`. any
-  options set in the specified config will override your normal config.
+* ``-c FILE``: read a specified YAML :doc:`configuration file <config>`. This
+  configuration works as an overlay: rather than replacing your normal
+  configuration options entirely, the two are merged. Any individual options set
+  in this config file will override your base configuration.
+
 
 Beets also uses the ``BEETSDIR`` environment variable to look for
 configuration and data.
diff --git a/testconfig.yaml b/testconfig.yaml
new file mode 100644
index 000000000..bd864107f
--- /dev/null
+++ b/testconfig.yaml
@@ -0,0 +1,10 @@
+directory: /home/jack/Music/
+library: /home/jack/Music/library.blb
+import:
+    move: yes
+paths:
+    default: $albumartist/$album%aunique{}/$disc-$track $title
+    singleton: $albumartist/$title
+
+ui:
+    color: no