d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge rev 1.9 (put the blank line back in the beginning of constructed

Browse Source 
log messages being passed to $EDITOR)  into version 1.11.22.
This commit is contained in:
David E. O'Brien 2008-01-13 06:09:41 +00:00
parent 469909901f
commit 78d59c12d4
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
contrib/cvs/src/logmsg.c
View File

@ -1,6 +1,11 @@
/*
* Copyright (c) 1992, Brian Berliner and Jeff Polk
* Copyright (c) 1989-1992, Brian Berliner
* Copyright (C) 1986-2005 The Free Software Foundation, Inc.
*
* Portions Copyright (C) 1998-2005 Derek Price, Ximbiot <http://ximbiot.com>,
* and others.
*
* Portions Copyright (C) 1992, Brian Berliner and Jeff Polk
* Portions Copyright (C) 1989-1992, Brian Berliner
*
* You may distribute under the terms of the GNU General Public License as
* specified in the README file that comes with the CVS source distribution.
@ -198,11 +203,7 @@ do_editor (dir, messagep, repository, changes)
struct stat pre_stbuf, post_stbuf;
int retcode = 0;
#ifdef CLIENT_SUPPORT
assert (!current_parsed_root->isremote != !repository);
#else
assert (repository);
#endif
if (noexec || reuse_log_message)
return;
@ -294,12 +295,7 @@ do_editor (dir, messagep, repository, changes)
if (editinfo_editor)
free (editinfo_editor);
editinfo_editor = (char *) NULL;
#ifdef CLIENT_SUPPORT
if (current_parsed_root->isremote)
; /* nothing, leave editinfo_editor NULL */
else
#endif
if (repository != NULL)
if (!current_parsed_root->isremote && repository != NULL)
(void) Parse_Info (CVSROOTADM_EDITINFO, repository, editinfo_proc, 0);
/* run the editor */
@ -426,11 +422,9 @@ do_verify (messagep, repository)
struct stat pre_stbuf, post_stbuf;
#ifdef CLIENT_SUPPORT
if (current_parsed_root->isremote)
/* The verification will happen on the server. */
return;
#endif
/* FIXME? Do we really want to skip this on noexec? What do we do
for the other administrative files? */
@ -449,7 +443,8 @@ do_verify (messagep, repository)
temp file, and close the file. */
if ((fp = cvs_temp_file (&fname)) == NULL)
error (1, errno, "cannot create temporary file %s", fname);
error (1, errno, "cannot create temporary file %s",
fname ? fname : "(null)");
if (*messagep != NULL)
fputs (*messagep, fp);
@ -555,7 +550,7 @@ do_verify (messagep, repository)
if (unlink_file (fname) < 0)
error (0, errno, "cannot remove %s", fname);
free (fname);
free( verifymsg_script );
free (verifymsg_script);
verifymsg_script = NULL;
}
@ -751,6 +746,8 @@ logfile_write (repository, filter, message, logfp, changes)
char *fmt_percent; /* the location of the percent sign
that starts the format string. */
assert (repository);
/* The user may specify a format string as part of the filter.
Originally, `%s' was the only valid string. The string that
was substituted for it was: