===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/commit.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -c -r1.76 -r1.77
*** src/usr.bin/cvs/commit.c	2006/06/28 17:59:06	1.76
--- src/usr.bin/cvs/commit.c	2006/06/28 18:52:05	1.77
***************
*** 1,4 ****
! /*	$OpenBSD: commit.c,v 1.76 2006/06/28 17:59:06 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: commit.c,v 1.77 2006/06/28 18:52:05 reyk Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
***************
*** 160,166 ****
  	BUF *b;
  	int isnew;
  	int l, openflags, rcsflags;
! 	char *d, *f, rbuf[24];
  	CVSENTRIES *entlist;
  	char *attic, *repo, *rcsfile;
  
--- 160,166 ----
  	BUF *b;
  	int isnew;
  	int l, openflags, rcsflags;
! 	char *d, *f, rbuf[24], nbuf[24];
  	CVSENTRIES *entlist;
  	char *attic, *repo, *rcsfile;
  
***************
*** 231,239 ****
  		commit_desc_set(cf);
  	}
  
! 	cvs_printf("Checking in %s:\n", cf->file_path);
! 	cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path);
! 	cvs_printf("old revision: %s; ", rbuf);
  
  	if (isnew == 0)
  		d = commit_diff_file(cf);
--- 231,241 ----
  		commit_desc_set(cf);
  	}
  
! 	if (verbosity > 1) {
! 		cvs_printf("Checking in %s:\n", cf->file_path);
! 		cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path);
! 		cvs_printf("old revision: %s; ", rbuf);
! 	}
  
  	if (isnew == 0)
  		d = commit_diff_file(cf);
***************
*** 281,298 ****
  	rcs_write(cf->file_rcs);
  
  	if (cf->file_status == FILE_REMOVED) {
! 		strlcpy(rbuf, "Removed", sizeof(rbuf));
  	} else if (cf->file_status == FILE_ADDED) {
  		if (cf->file_rcs->rf_dead == 1)
! 			strlcpy(rbuf, "Initial Revision", sizeof(rbuf));
  		else
  			rcsnum_tostr(cf->file_rcs->rf_head,
! 			    rbuf, sizeof(rbuf));
  	} else if (cf->file_status == FILE_MODIFIED) {
! 		rcsnum_tostr(cf->file_rcs->rf_head, rbuf, sizeof(rbuf));
  	}
  
! 	cvs_printf("new revision: %s\n", rbuf);
  
  	(void)unlink(cf->file_path);
  	(void)close(cf->fd);
--- 283,301 ----
  	rcs_write(cf->file_rcs);
  
  	if (cf->file_status == FILE_REMOVED) {
! 		strlcpy(nbuf, "Removed", sizeof(nbuf));
  	} else if (cf->file_status == FILE_ADDED) {
  		if (cf->file_rcs->rf_dead == 1)
! 			strlcpy(nbuf, "Initial Revision", sizeof(nbuf));
  		else
  			rcsnum_tostr(cf->file_rcs->rf_head,
! 			    nbuf, sizeof(nbuf));
  	} else if (cf->file_status == FILE_MODIFIED) {
! 		rcsnum_tostr(cf->file_rcs->rf_head, nbuf, sizeof(nbuf));
  	}
  
! 	if (verbosity > 1)
! 		cvs_printf("new revision: %s\n", nbuf);
  
  	(void)unlink(cf->file_path);
  	(void)close(cf->fd);
***************
*** 333,340 ****
  		xfree(attic);
  	}
  
! 	cvs_printf("done\n");
! 
  }
  
  static char *
--- 336,347 ----
  		xfree(attic);
  	}
  
! 	if (verbosity > 1)
! 		cvs_printf("done\n");
! 	else {
! 		cvs_log(LP_NOTICE, "checking in '%s'; revision %s -> %s",
! 		    cf->file_path, rbuf, nbuf);
! 	}
  }
  
  static char *