From 82c38f75a4b9d084fa974d71cad65fa4f5c55ab5 Mon Sep 17 00:00:00 2001
From: Peer Sommerlund <peer.sommerlund@gmail.com>
Date: Thu, 11 Oct 2007 16:45:13 +0100
Subject: [PATCH] fix-help-msg.p

Bug: On Windows, one popup pr line
---
 cvsps.c | 86 ++++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/cvsps.c b/cvsps.c
index 0bfc4bc..0bb1ae2 100644
--- a/cvsps.c
+++ b/cvsps.c
@@ -564,49 +564,49 @@ static int usage(const char * str1, const char * str2)
     if (str1)
 	debug(DEBUG_APPERROR, "\nbad usage: %s %s\n", str1, str2);
 
-    debug(DEBUG_APPERROR, "Usage: cvsps [-h] [-x] [-u] [-z <fuzz>] [-g] [-s <range>[,<range>]]  ");
-    debug(DEBUG_APPERROR, "             [-a <author>] [-f <file>] [-d <date1> [-d <date2>]] ");
-    debug(DEBUG_APPERROR, "             [-b <branch>]  [-l <regex>] [-r <tag> [-r <tag>]] ");
-    debug(DEBUG_APPERROR, "             [-p <directory>] [-v] [-t] [--norc] [--summary-first]");
-    debug(DEBUG_APPERROR, "             [--test-log <captured cvs log file>] [--bkcvs]");
-    debug(DEBUG_APPERROR, "             [--no-rlog] [--diff-opts <option string>] [--cvs-direct]");
-    debug(DEBUG_APPERROR, "             [--debuglvl <bitmask>] [-Z <compression>] [--root <cvsroot>]");
-    debug(DEBUG_APPERROR, "             [-q] [-A] [<repository>]");
-    debug(DEBUG_APPERROR, "");
-    debug(DEBUG_APPERROR, "Where:");
-    debug(DEBUG_APPERROR, "  -h display this informative message");
-    debug(DEBUG_APPERROR, "  -x ignore (and rebuild) cvsps.cache file");
-    debug(DEBUG_APPERROR, "  -u update cvsps.cache file");
-    debug(DEBUG_APPERROR, "  -z <fuzz> set the timestamp fuzz factor for identifying patch sets");
-    debug(DEBUG_APPERROR, "  -g generate diffs of the selected patch sets");
-    debug(DEBUG_APPERROR, "  -s <patch set>[-[<patch set>]][,<patch set>...] restrict patch sets by id");
-    debug(DEBUG_APPERROR, "  -a <author> restrict output to patch sets created by author");
-    debug(DEBUG_APPERROR, "  -f <file> restrict output to patch sets involving file");
-    debug(DEBUG_APPERROR, "  -d <date1> -d <date2> if just one date specified, show");
-    debug(DEBUG_APPERROR, "     revisions newer than date1.  If two dates specified,");
-    debug(DEBUG_APPERROR, "     show revisions between two dates.");
-    debug(DEBUG_APPERROR, "  -b <branch> restrict output to patch sets affecting history of branch");
-    debug(DEBUG_APPERROR, "  -l <regex> restrict output to patch sets matching <regex> in log message");
-    debug(DEBUG_APPERROR, "  -r <tag1> -r <tag2> if just one tag specified, show");
-    debug(DEBUG_APPERROR, "     revisions since tag1. If two tags specified, show");
-    debug(DEBUG_APPERROR, "     revisions between the two tags.");
-    debug(DEBUG_APPERROR, "  -p <directory> output patch sets to individual files in <directory>");
-    debug(DEBUG_APPERROR, "  -v show very verbose parsing messages");
-    debug(DEBUG_APPERROR, "  -t show some brief memory usage statistics");
-    debug(DEBUG_APPERROR, "  --norc when invoking cvs, ignore the .cvsrc file");
-    debug(DEBUG_APPERROR, "  --summary-first when multiple patch sets are shown, put all summaries first");
-    debug(DEBUG_APPERROR, "  --test-log <captured cvs log> supply a captured cvs log for testing");
-    debug(DEBUG_APPERROR, "  --diff-opts <option string> supply special set of options to diff");
-    debug(DEBUG_APPERROR, "  --bkcvs special hack for parsing the BK -> CVS log format");
-    debug(DEBUG_APPERROR, "  --no-rlog disable rlog (it's faulty in some setups)");
-    debug(DEBUG_APPERROR, "  --cvs-direct (--no-cvs-direct) enable (disable) built-in cvs client code");
-    debug(DEBUG_APPERROR, "  --debuglvl <bitmask> enable various debug channels.");
-    debug(DEBUG_APPERROR, "  -Z <compression> A value 1-9 which specifies amount of compression");
-    debug(DEBUG_APPERROR, "  --root <cvsroot> specify cvsroot.  overrides env. and working directory (cvs-direct only)");
-    debug(DEBUG_APPERROR, "  -q be quiet about warnings");
-    debug(DEBUG_APPERROR, "  -A track and report branch ancestry");
-    debug(DEBUG_APPERROR, "  <repository> apply cvsps to repository.  overrides working directory");
-    debug(DEBUG_APPERROR, "\ncvsps version %s\n", VERSION);
+    debug(DEBUG_APPMSG1, "Usage: cvsps [-h] [-x] [-u] [-z <fuzz>] [-g] [-s <range>[,<range>]]  ");
+    debug(DEBUG_APPMSG1, "             [-a <author>] [-f <file>] [-d <date1> [-d <date2>]] ");
+    debug(DEBUG_APPMSG1, "             [-b <branch>]  [-l <regex>] [-r <tag> [-r <tag>]] ");
+    debug(DEBUG_APPMSG1, "             [-p <directory>] [-v] [-t] [--norc] [--summary-first]");
+    debug(DEBUG_APPMSG1, "             [--test-log <captured cvs log file>] [--bkcvs]");
+    debug(DEBUG_APPMSG1, "             [--no-rlog] [--diff-opts <option string>] [--cvs-direct]");
+    debug(DEBUG_APPMSG1, "             [--debuglvl <bitmask>] [-Z <compression>] [--root <cvsroot>]");
+    debug(DEBUG_APPMSG1, "             [-q] [-A] [<repository>]");
+    debug(DEBUG_APPMSG1, "");
+    debug(DEBUG_APPMSG1, "Where:");
+    debug(DEBUG_APPMSG1, "  -h display this informative message");
+    debug(DEBUG_APPMSG1, "  -x ignore (and rebuild) cvsps.cache file");
+    debug(DEBUG_APPMSG1, "  -u update cvsps.cache file");
+    debug(DEBUG_APPMSG1, "  -z <fuzz> set the timestamp fuzz factor for identifying patch sets");
+    debug(DEBUG_APPMSG1, "  -g generate diffs of the selected patch sets");
+    debug(DEBUG_APPMSG1, "  -s <patch set>[-[<patch set>]][,<patch set>...] restrict patch sets by id");
+    debug(DEBUG_APPMSG1, "  -a <author> restrict output to patch sets created by author");
+    debug(DEBUG_APPMSG1, "  -f <file> restrict output to patch sets involving file");
+    debug(DEBUG_APPMSG1, "  -d <date1> -d <date2> if just one date specified, show");
+    debug(DEBUG_APPMSG1, "     revisions newer than date1.  If two dates specified,");
+    debug(DEBUG_APPMSG1, "     show revisions between two dates.");
+    debug(DEBUG_APPMSG1, "  -b <branch> restrict output to patch sets affecting history of branch");
+    debug(DEBUG_APPMSG1, "  -l <regex> restrict output to patch sets matching <regex> in log message");
+    debug(DEBUG_APPMSG1, "  -r <tag1> -r <tag2> if just one tag specified, show");
+    debug(DEBUG_APPMSG1, "     revisions since tag1. If two tags specified, show");
+    debug(DEBUG_APPMSG1, "     revisions between the two tags.");
+    debug(DEBUG_APPMSG1, "  -p <directory> output patch sets to individual files in <directory>");
+    debug(DEBUG_APPMSG1, "  -v show very verbose parsing messages");
+    debug(DEBUG_APPMSG1, "  -t show some brief memory usage statistics");
+    debug(DEBUG_APPMSG1, "  --norc when invoking cvs, ignore the .cvsrc file");
+    debug(DEBUG_APPMSG1, "  --summary-first when multiple patch sets are shown, put all summaries first");
+    debug(DEBUG_APPMSG1, "  --test-log <captured cvs log> supply a captured cvs log for testing");
+    debug(DEBUG_APPMSG1, "  --diff-opts <option string> supply special set of options to diff");
+    debug(DEBUG_APPMSG1, "  --bkcvs special hack for parsing the BK -> CVS log format");
+    debug(DEBUG_APPMSG1, "  --no-rlog disable rlog (it's faulty in some setups)");
+    debug(DEBUG_APPMSG1, "  --cvs-direct (--no-cvs-direct) enable (disable) built-in cvs client code");
+    debug(DEBUG_APPMSG1, "  --debuglvl <bitmask> enable various debug channels.");
+    debug(DEBUG_APPMSG1, "  -Z <compression> A value 1-9 which specifies amount of compression");
+    debug(DEBUG_APPMSG1, "  --root <cvsroot> specify cvsroot.  overrides env. and working directory (cvs-direct only)");
+    debug(DEBUG_APPMSG1, "  -q be quiet about warnings");
+    debug(DEBUG_APPMSG1, "  -A track and report branch ancestry");
+    debug(DEBUG_APPMSG1, "  <repository> apply cvsps to repository.  overrides working directory");
+    debug(DEBUG_APPMSG1, "\ncvsps version %s\n", VERSION);
 
     return -1;
 }
-- 
2.11.4.GIT