migrate: always be interactive

This way people can reject changes to their configs that they don't want (or are potentially incorrect, viz. the discussion in qtile#2567). Closes qtile#2353 (we're relying on people to reject incorrect migrations for now) Signed-off-by: Tycho Andersen <[email protected]>
leedre · Jul 4, 2021 · d9e6a7d · d9e6a7d
1 parent d8cbb2c
commit d9e6a7d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libqtile/scripts/migrate.py b/libqtile/scripts/migrate.py
@@ -162,7 +162,7 @@ def do_migrate(args):
 
     for m in MIGRATIONS:
         q = bowler.Query(config_dir)
-        m(q).execute(interactive=args.interactive, write=True)
+        m(q).execute(interactive=not args.yes, write=True)
 
     changed = False
     for py, backup in file_and_backup(config_dir):
@@ -193,8 +193,8 @@ def add_subcommand(subparsers, parents):
         help="Use the specified configuration file (migrates every .py file in this directory)",
     )
     parser.add_argument(
-        "--interactive",
+        "--yes",
         action="store_true",
-        help="Interactively apply diff (similar to git add -p)",
+        help="Automatically apply diffs with no confirmation",
     )
     parser.set_defaults(func=do_migrate)
diff --git a/test/test_migrate.py b/test/test_migrate.py
@@ -13,7 +13,7 @@
 
 def run_qtile_migrate(config):
     cmd = os.path.join(os.path.dirname(__file__), '..', 'bin', 'qtile')
-    argv = [cmd, "migrate", "-c", config]
+    argv = [cmd, "migrate", "--yes", "-c", config]
     subprocess.check_call(argv)