[Bps-public-commit] SD - A distributed issue tracker branch, master, updated. bdb4f9b9a55fd0d293aadf85b13f7408215c270d

[spang at bestpractical.com]

The branch, master has been updated
       via  bdb4f9b9a55fd0d293aadf85b13f7408215c270d (commit)
       via  c94f96f7447b5b34688befacbe80420b527b5717 (commit)
      from  523b78b28c9a8ccbcd24dee78ac1a8bf2780dfa7 (commit)

Summary of changes:
 lib/App/SD/CLI/Command/Help/Sync.pm |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

- Log -----------------------------------------------------------------
commit c94f96f7447b5b34688befacbe80420b527b5717
Author: Christine Spang <spang at bestpractical.com>
Date:   Mon Feb 16 12:32:03 2009 -0500

    tell people to use --to explicitly in publish/push since we will probably be adding more options to these commands later

diff --git a/lib/App/SD/CLI/Command/Help/Sync.pm b/lib/App/SD/CLI/Command/Help/Sync.pm
index ede532b..ac1f1b4 100644
--- a/lib/App/SD/CLI/Command/Help/Sync.pm
+++ b/lib/App/SD/CLI/Command/Help/Sync.pm
@@ -28,10 +28,7 @@ print <<EOF
       Integrate changes from all replicas currently announcing themselves
       on the local network using Bonjour.
 
-    ${cmd}pull -l
-      -l is a shortcut for --local for this command.
-
-    ${cmd}publish jesse\@server:path/to/destination
+    ${cmd}publish --to jesse\@server:path/to/destination
       Publish a copy of this replica to a remote server using rsync.
 
     ${cmd}publish --html --replica --to jesse\@server:path/to/destination
@@ -59,11 +56,11 @@ replica types for RT (http://bestpractical.com/rt) and Hiveminder
 your bug tracker, you should get in touch with SD's developers (see
 http://syncwith.us/contact).
 
-    ${cmd}push rt:http://rt3.fsck.com|rt3|Owner='jesse'
+    ${cmd}push --to rt:http://rt3.fsck.com|rt3|Owner='jesse'
       Push changes to the given foreign replica. Foreign replica
       schemas will vary based on the replica type.
 
-    ${cmd}pull rt:http://rt3.fsck.com|rt3|Owner='jesse'
+    ${cmd}pull --to rt:http://rt3.fsck.com|rt3|Owner='jesse'
       Pull changes from a foreign replica to be merged into the
       local replica.
 EOF

commit bdb4f9b9a55fd0d293aadf85b13f7408215c270d
Author: Christine Spang <spang at bestpractical.com>
Date:   Mon Feb 16 12:32:59 2009 -0500

    merge some single-option help examples that won't become confusing if we also show the shortcut in the example

diff --git a/lib/App/SD/CLI/Command/Help/Sync.pm b/lib/App/SD/CLI/Command/Help/Sync.pm
index ac1f1b4..7b8f012 100644
--- a/lib/App/SD/CLI/Command/Help/Sync.pm
+++ b/lib/App/SD/CLI/Command/Help/Sync.pm
@@ -17,14 +17,11 @@ print <<EOF
       Integrate changes from a published SD replica over http, ftp or 
       file URL.
 
-    ${cmd}pull --all
+    ${cmd}pull --all (or -a)
       Integrate changes from all replicas this replica has pulled from
       before.
 
-    ${cmd}pull -a
-      -a is a shortcut for --all for this command.
-
-    ${cmd}pull --local
+    ${cmd}pull --local (or -l)
       Integrate changes from all replicas currently announcing themselves
       on the local network using Bonjour.
 

-----------------------------------------------------------------------