diff options
| -rw-r--r-- | usr.bin/cvs/log.c | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/log.h | 3 | ||||
| -rw-r--r-- | usr.bin/cvs/update.c | 13 |
3 files changed, 12 insertions, 8 deletions
diff --git a/usr.bin/cvs/log.c b/usr.bin/cvs/log.c index 171155840b7..c46093c6a7c 100644 --- a/usr.bin/cvs/log.c +++ b/usr.bin/cvs/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.40 2007/06/26 02:24:10 niallo Exp $ */ +/* $OpenBSD: log.c,v 1.41 2007/09/07 23:59:01 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -94,7 +94,7 @@ cvs_vlog(u_int level, const char *fmt, va_list vap) else putc('C', out); (void)fputs("-> ", out); - } else { + } else if (level != LP_RCS) { (void)fputs(__progname, out); if (cvs_command != NULL) { /* diff --git a/usr.bin/cvs/log.h b/usr.bin/cvs/log.h index b6ebfe6789a..2e4d3fcfa89 100644 --- a/usr.bin/cvs/log.h +++ b/usr.bin/cvs/log.h @@ -1,4 +1,4 @@ -/* $OpenBSD: log.h,v 1.21 2007/06/26 02:24:10 niallo Exp $ */ +/* $OpenBSD: log.h,v 1.22 2007/09/07 23:59:01 tobias Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -35,6 +35,7 @@ #define LP_ERRNO 2 #define LP_ABORT 3 #define LP_TRACE 4 +#define LP_RCS 5 #define LOG_REVSEP \ "----------------------------" diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index 0897f6f78ce..db0b10427ad 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.108 2007/09/07 23:05:04 joris Exp $ */ +/* $OpenBSD: update.c,v 1.109 2007/09/07 23:59:01 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -321,10 +321,13 @@ cvs_update_local(struct cvs_file *cf) if (print_stdout && cf->file_status != FILE_UNKNOWN) { rcsnum_tostr(cf->file_rcsrev, rbuf, sizeof(rbuf)); - if (verbosity > 1) - cvs_printf("%s\nChecking out %s\n" - "RCS:\t%s\nVERS:\t%s\n***************\n", - RCS_DIFF_DIV, cf->file_path, cf->file_rpath, rbuf); + if (verbosity > 1) { + cvs_log(LP_RCS, RCS_DIFF_DIV); + cvs_log(LP_RCS, "Checking out %s", cf->file_path); + cvs_log(LP_RCS, "RCS: %s", cf->file_rpath); + cvs_log(LP_RCS, "VERS: %s", rbuf); + cvs_log(LP_RCS, "***************"); + } cvs_checkout_file(cf, cf->file_rcsrev, CO_DUMP); return; } |