From 210eb60c86d502dc489d5a98181d3a35ccc60cf1 Mon Sep 17 00:00:00 2001
From: "Dustin J. Mitchell" <dustin@v.igoro.us>
Date: Sun, 23 Jan 2022 15:27:13 +0000
Subject: [PATCH] 'ta import' -> 'ta import-tw'

---
 cli/src/argparse/subcommand.rs                | 20 +++++++++----------
 .../cmd/{import.rs => import_tw.rs}           |  0
 cli/src/invocation/cmd/mod.rs                 |  2 +-
 cli/src/invocation/mod.rs                     |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename cli/src/invocation/cmd/{import.rs => import_tw.rs} (100%)

diff --git a/cli/src/argparse/subcommand.rs b/cli/src/argparse/subcommand.rs
index 30f56812b..22c270ba3 100644
--- a/cli/src/argparse/subcommand.rs
+++ b/cli/src/argparse/subcommand.rs
@@ -59,7 +59,7 @@ pub(crate) enum Subcommand {
     /// Basic operations without args
     Gc,
     Sync,
-    Import,
+    ImportTW,
     ImportTDB2 {
         path: String,
     },
@@ -77,7 +77,7 @@ impl Subcommand {
             Info::parse,
             Gc::parse,
             Sync::parse,
-            Import::parse,
+            ImportTW::parse,
             ImportTDB2::parse,
             Undo::parse,
             // This must come last since it accepts arbitrary report names
@@ -94,7 +94,7 @@ impl Subcommand {
         Info::get_usage(u);
         Gc::get_usage(u);
         Sync::get_usage(u);
-        Import::get_usage(u);
+        ImportTW::get_usage(u);
         ImportTDB2::get_usage(u);
         Undo::get_usage(u);
         Report::get_usage(u);
@@ -433,21 +433,21 @@ impl Sync {
     }
 }
 
-struct Import;
+struct ImportTW;
 
-impl Import {
+impl ImportTW {
     fn parse(input: ArgList) -> IResult<ArgList, Subcommand> {
         fn to_subcommand(_: &str) -> Result<Subcommand, ()> {
-            Ok(Subcommand::Import)
+            Ok(Subcommand::ImportTW)
         }
-        map_res(arg_matching(literal("import")), to_subcommand)(input)
+        map_res(arg_matching(literal("import-tw")), to_subcommand)(input)
     }
 
     fn get_usage(u: &mut usage::Usage) {
         u.subcommands.push(usage::Subcommand {
-            name: "import",
-            syntax: "import",
-            summary: "Import tasks",
+            name: "import-tw",
+            syntax: "import-tw",
+            summary: "Import tasks from TaskWarrior export",
             description: "
                 Import tasks into this replica.
 
diff --git a/cli/src/invocation/cmd/import.rs b/cli/src/invocation/cmd/import_tw.rs
similarity index 100%
rename from cli/src/invocation/cmd/import.rs
rename to cli/src/invocation/cmd/import_tw.rs
diff --git a/cli/src/invocation/cmd/mod.rs b/cli/src/invocation/cmd/mod.rs
index 59484ea0b..b5d1a21d6 100644
--- a/cli/src/invocation/cmd/mod.rs
+++ b/cli/src/invocation/cmd/mod.rs
@@ -4,8 +4,8 @@ pub(crate) mod add;
 pub(crate) mod config;
 pub(crate) mod gc;
 pub(crate) mod help;
-pub(crate) mod import;
 pub(crate) mod import_tdb2;
+pub(crate) mod import_tw;
 pub(crate) mod info;
 pub(crate) mod modify;
 pub(crate) mod report;
diff --git a/cli/src/invocation/mod.rs b/cli/src/invocation/mod.rs
index 7bc1c5616..0ae3f44e0 100644
--- a/cli/src/invocation/mod.rs
+++ b/cli/src/invocation/mod.rs
@@ -91,10 +91,10 @@ pub(crate) fn invoke(command: Command, settings: Settings) -> Result<(), crate::
         }
 
         Command {
-            subcommand: Subcommand::Import,
+            subcommand: Subcommand::ImportTW,
             ..
         } => {
-            return cmd::import::execute(&mut w, &mut replica);
+            return cmd::import_tw::execute(&mut w, &mut replica);
         }
 
         Command {