- renamed two snapper commands

diff --git a/doc/snapper.8.in b/doc/snapper.8.in
index 6c83a78d5e2c05fc95c71491ce52ef0cbac68264..e932f32cdddcb8ca8a22a301d73adfea9f0e5d72 100644 (file)
--- a/doc/snapper.8.in
+++ b/doc/snapper.8.in
@@ -159,7 +159,7 @@ Mount a snapshot. Not required for all filesystem types.
 Unmount a snapshot. Not required for all filesystem types.
 
 .TP
-.B diff [options] <number1>..<number2>
+.B status [options] <number1>..<number2>
 Compare the snapshots number1 and number2. This will show a list of files and
 directories that have been created, modified or deleted in the time between
 the two snapshots have been made.
@@ -168,7 +168,7 @@ the two snapshots have been made.
 Write output to file <file>.
 
 .TP
-.B contentdiff [options] <number1>..<number2> [files]
+.B diff [options] <number1>..<number2> [files]
 Compare the snapshots number1 and number2. This will show a diff of the
 content of files and directories that have been created, modified or deleted
 in the time between the two snapshots have been made.

diff --git a/package/snapper.changes b/package/snapper.changes
index 107423a57fb8e4b21748d12b43bc0e48aa525cfc..6a9800c4c24a60fa1d8ba6aadbf3aaa50f006785 100644 (file)
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 31 15:44:42 CEST 2011 - aschnell@suse.de
+
+- renamed snapper command diff to status and contentdiff to diff
+
 -------------------------------------------------------------------
 Mon Aug 29 16:17:11 CEST 2011 - aschnell@suse.de
 

diff --git a/tools/snapper.cc b/tools/snapper.cc
index b35f7d8223bf5c4bfd1a27c90372fe260d682f6b..68ea7d76470bd92f56b0257147ea453dc70a4193 100644 (file)
--- a/tools/snapper.cc
+++ b/tools/snapper.cc
@@ -593,29 +593,29 @@ command_umount()
 
 
 void
-help_diff()
+help_status()
 {
     cout << _("  Comparing snapshots:") << endl
-        << _("\tsnapper diff <number1>..<number2>") << endl
+        << _("\tsnapper status <number1>..<number2>") << endl
         << endl
-        << _("    Options for 'diff' command:") << endl
-        << _("\t--output, -o <file>\t\tSave diff to file.") << endl
+        << _("    Options for 'status' command:") << endl
+        << _("\t--output, -o <file>\t\tSave status to file.") << endl
         << endl;
 }
 
 
 void
-command_diff()
+command_status()
 {
     const struct option options[] = {
        { "output",             required_argument,      0,      'o' },
        { 0, 0, 0, 0 }
     };
 
-    GetOpts::parsed_opts opts = getopts.parse("diff", options);
+    GetOpts::parsed_opts opts = getopts.parse("status", options);
     if (getopts.numArgs() != 1)
     {
-       cerr << _("Command 'diff' needs one argument.") << endl;
+       cerr << _("Command 'status' needs one argument.") << endl;
        exit(EXIT_FAILURE);
     }
 
@@ -649,18 +649,18 @@ command_diff()
 
 
 void
-help_contentdiff()
+help_diff()
 {
     cout << _("  Comparing snapshots:") << endl
-        << _("\tsnapper contentdiff <number1>..<number2> [files]") << endl
+        << _("\tsnapper diff <number1>..<number2> [files]") << endl
         << endl;
 }
 
 
 void
-command_contentdiff()
+command_diff()
 {
-    GetOpts::parsed_opts opts = getopts.parse("contentdiff", GetOpts::no_options);
+    GetOpts::parsed_opts opts = getopts.parse("diff", GetOpts::no_options);
 
     GetOpts::parsed_opts::const_iterator opt;
 
@@ -775,7 +775,7 @@ command_undo()
            Files::iterator it = files.findAbsolutePath(name);
            if (it == files.end())
            {
-               cerr << sformat(_("File '%s' not found in diff."), name.c_str()) << endl;
+               cerr << sformat(_("File '%s' not found."), name.c_str()) << endl;
                exit(EXIT_FAILURE);
            }
 
@@ -894,8 +894,8 @@ command_help()
     help_delete();
     help_mount();
     help_umount();
+    help_status();
     help_diff();
-    help_contentdiff();
     help_undo();
     help_cleanup();
 }
@@ -948,8 +948,8 @@ main(int argc, char** argv)
     cmds["delete"] = command_delete;
     cmds["mount"] = command_mount;
     cmds["umount"] = command_umount;
+    cmds["status"] = command_status;
     cmds["diff"] = command_diff;
-    cmds["contentdiff"] = command_contentdiff;
     cmds["undochange"] = command_undo;
     cmds["cleanup"] = command_cleanup;
     cmds["help"] = command_help;