From cdc320f5b75497c0ac909a36e435110fa1177400 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris+github@qwirx.com>
Date: Sat, 24 Mar 2007 23:41:06 +0000
Subject: Add a quiet mode to compare command, to make test output easier to
 read. (refs #3, merges [1460])

---
 bin/bbackupquery/BackupQueries.cpp | 18 ++++++++++++------
 bin/bbackupquery/BackupQueries.h   |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'bin/bbackupquery')

diff --git a/bin/bbackupquery/BackupQueries.cpp b/bin/bbackupquery/BackupQueries.cpp
index 1726b960..7ab23441 100644
--- a/bin/bbackupquery/BackupQueries.cpp
+++ b/bin/bbackupquery/BackupQueries.cpp
@@ -207,7 +207,7 @@ void BackupQueries::DoCommand(const char *Command, bool isFromCommandLine)
 		{ "sh",   "" },
 		{ "getobject", "" },
 		{ "get",  "i" },
-		{ "compare", "alcqAE" },
+		{ "compare", "alcqAEQ" },
 		{ "restore", "dri" },
 		{ "help", "" },
 		{ "usage", "" },
@@ -1114,6 +1114,7 @@ void BackupQueries::CommandCompare(const std::vector<std::string> &args, const b
 	// Parameters, including count of differences
 	BackupQueries::CompareParams params;
 	params.mQuickCompare = opts['q'];
+	params.mQuietCompare = opts['Q'];
 	params.mIgnoreExcludes = opts['E'];
 	params.mIgnoreAttributes = opts['A'];
 	
@@ -1177,12 +1178,17 @@ void BackupQueries::CommandCompare(const std::vector<std::string> &args, const b
 		printf("Incorrect usage.\ncompare -a\n or compare -l <location-name>\n or compare <store-dir-name> <local-dir-name>\n");
 		return;
 	}
-	
-	printf("\n[ %d (of %d) differences probably due to file "
-		"modifications after the last upload ]\n"
-		"Differences: %d (%d dirs excluded, %d files excluded, "
+
+	if (!params.mQuietCompare)
+	{	
+		printf("\n[ %d (of %d) differences probably due to file "
+			"modifications after the last upload ]\n",
+			params.mDifferencesExplainedByModTime, 
+			params.mDifferences);
+	}
+
+	printf("Differences: %d (%d dirs excluded, %d files excluded, "
 		"%d files not checked)\n",
-		params.mDifferencesExplainedByModTime, params.mDifferences, 
 		params.mDifferences, params.mExcludedDirs, 
 		params.mExcludedFiles, params.mUncheckedFiles);
 	
diff --git a/bin/bbackupquery/BackupQueries.h b/bin/bbackupquery/BackupQueries.h
index c9540110..b2ef8cc2 100644
--- a/bin/bbackupquery/BackupQueries.h
+++ b/bin/bbackupquery/BackupQueries.h
@@ -67,6 +67,7 @@ private:
 		~CompareParams();
 		void DeleteExcludeLists();
 		bool mQuickCompare;
+		bool mQuietCompare;
 		bool mIgnoreExcludes;
 		bool mIgnoreAttributes;
 		int mDifferences;
-- 
cgit v1.2.3