From 185abe9ca9738b7265400ddff4f586b11c381b57 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Fri, 27 Jan 2017 19:51:43 +0100
Subject: [PATCH] Disable --list for discover

---
 CHANGELOG.rst              | 2 ++
 vdirsyncer/cli/__init__.py | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 75a2649..fe92d36 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,6 +14,8 @@ Version 0.15
 
 - Deprecated syntax for configuration values is now completely rejected. All
   values now have to be valid JSON.
+- The default of ``--list`` for ``vdirsyncer discover`` has changed to
+  ``false``. See :ghpr:`543`.
 
 Version 0.14.1
 ==============
diff --git a/vdirsyncer/cli/__init__.py b/vdirsyncer/cli/__init__.py
index 0a3e81f..d3f2779 100644
--- a/vdirsyncer/cli/__init__.py
+++ b/vdirsyncer/cli/__init__.py
@@ -172,11 +172,11 @@ def metasync(ctx, collections, max_workers):
 @app.command()
 @click.argument('pairs', nargs=-1)
 @click.option(
-    '--list/--no-list', default=True,
+    '--list/--no-list', default=False,
     help=(
         'Whether to list all collections from both sides during discovery, '
-        'for debugging. This is slow, but enabled by default for usability '
-        'reasons. '
+        'for debugging. This is slow and may crash for broken servers, so it '
+        'is disabled by default.'
     )
 )
 @max_workers_option(default=1)