bin/braid in braid-1.0.16 vs bin/braid in braid-1.0.17

@@ -38,15 +38,15 @@
     examples <<-TXT
       . braid add http://remote/path.git local/dir
       . braid add http://remote/path local/dir
     TXT
 
-    mixin :argument_url, :optional_path, :option_branch, :option_revision, :option_full, :option_verbose, :option_remote_path
+    mixin :argument_url, :optional_local_path, :option_branch, :option_revision, :option_verbose, :option_path
 
     run {
       Braid.verbose = verbose
-      Braid::Command.run(:add, url, {'path' => path, 'branch' => branch, 'revision' => revision, 'full' => full, 'remote_path' => remote_path})
+      Braid::Command.run(:add, url, {'path' => local_path, 'branch' => branch, 'revision' => revision, 'remote_path' => path})
     }
   }
 
   mode(:update) {
     description <<-TXT
@@ -63,20 +63,20 @@
     examples <<-TXT
       . braid update
       . braid update local/dir
     TXT
 
-    mixin :optional_path, :option_revision, :option_head, :option_verbose, :option_keep_remote
+    mixin :optional_local_path, :option_revision, :option_head, :option_verbose, :option_keep_remote
 
     run {
       options = {
         'revision' => revision,
         'head' => head,
         'keep' => keep
       }
       Braid.verbose = verbose
-      Braid::Command.run(:update, path, options)
+      Braid::Command.run(:update, local_path, options)
     }
   }
 
   mode(:remove) {
     description <<-TXT
@@ -89,65 +89,65 @@
 
     examples <<-TXT
       . braid remove local/dir
     TXT
 
-    mixin :argument_path, :option_verbose, :option_keep_remote
+    mixin :argument_local_path, :option_verbose, :option_keep_remote
 
     run {
       options = {
         :keep => keep
       }
       Braid.verbose = verbose
-      Braid::Command.run(:remove, path, options)
+      Braid::Command.run(:remove, local_path, options)
     }
   }
 
   mode(:diff) {
     description <<-TXT
       Show diff of local changes to mirror.
     TXT
 
-    mixin :optional_path, :option_verbose, :option_keep_remote
+    mixin :optional_local_path, :option_verbose, :option_keep_remote
 
     run {
       options = {
         'keep' => keep
       }
       Braid.verbose = verbose
-      Braid::Command.run(:diff, path, options)
+      Braid::Command.run(:diff, local_path, options)
     }
   }
 
   mode(:push) {
     description <<-TXT
       Push local mirror changes to remote.
     TXT
 
-    mixin :argument_path, :option_branch, :option_verbose, :option_keep_remote
+    mixin :argument_local_path, :option_branch, :option_verbose, :option_keep_remote
 
     run {
       options = {
         'keep' => keep,
         'branch' => branch
       }
       Braid.verbose = verbose
-      Braid::Command.run(:push, path, options)
+      Braid::Command.run(:push, local_path, options)
     }
   }
 
   mode(:setup) {
     description <<-TXT
       Set up git remotes.
     TXT
 
-    mixin :optional_path, :option_verbose, :option_force
+    mixin :optional_local_path, :option_verbose, :option_force
 
     run {
       Braid.verbose = verbose
       Braid.force = force
-      Braid::Command.run(:setup, path)
+      Braid::Command.run(:setup, local_path)
     }
   }
 
   mode(:version) {
     description 'Show braid version.'
@@ -155,40 +155,29 @@
     run {
       puts "braid #{Braid::VERSION}"
     }
   }
 
-  mode(:list) {
-    description 'Show all tracked mirrors (and if updates are available).'
-
-    mixin :option_verbose
-
-    run {
-      Braid.verbose = verbose
-      Braid::Command.run(:list)
-    }
-  }
-
   mode(:status) {
     description 'Show the status of all tracked mirrors (and if updates are available).'
 
-    mixin :optional_path, :option_verbose
+    mixin :optional_local_path, :option_verbose
 
     run {
       Braid.verbose = verbose
-      Braid::Command.run(:status, path)
+      Braid::Command.run(:status, local_path)
     }
   }
 
-  mixin(:argument_path) {
-    argument(:path) {
+  mixin(:argument_local_path) {
+    argument(:local_path) {
       attr
     }
   }
 
-  mixin(:optional_path) {
-    argument(:path) {
+  mixin(:optional_local_path) {
+    argument(:local_path) {
       optional
       attr
     }
   }
 
@@ -205,12 +194,12 @@
       desc 'remote branch name'
       attr
     }
   }
 
-  mixin(:option_remote_path) {
-    option(:remote_path, :p) {
+  mixin(:option_path) {
+    option(:path, :p) {
       optional
       argument :required
       desc 'remote path'
       attr
     }
@@ -227,17 +216,9 @@
 
   mixin(:option_head) {
     option(:head) {
       optional
       desc 'mirror head'
-      attr
-    }
-  }
-
-  mixin(:option_full) {
-    option(:full) {
-      optional
-      desc 'include mirror history' # FIXME
       attr
     }
   }
 
   mixin(:option_verbose) {