version 1.101, 2009/06/27 16:55:31 |
version 1.102, 2010/07/23 21:46:05 |
|
|
import_printf("\nNo conflicts created by this import.\n\n"); |
import_printf("\nNo conflicts created by this import.\n\n"); |
} |
} |
|
|
loginfo = cvs_buf_release(logbuf); |
loginfo = buf_release(logbuf); |
logbuf = NULL; |
logbuf = NULL; |
|
|
line_list = cvs_trigger_getlines(CVS_PATH_LOGINFO, import_repository); |
line_list = cvs_trigger_getlines(CVS_PATH_LOGINFO, import_repository); |
|
|
va_end(vap); |
va_end(vap); |
|
|
cvs_printf("%s", str); |
cvs_printf("%s", str); |
cvs_buf_puts(logbuf, str); |
buf_puts(logbuf, str); |
|
|
xfree(str); |
xfree(str); |
} |
} |
|
|
if (getcwd(pwd, sizeof(pwd)) == NULL) |
if (getcwd(pwd, sizeof(pwd)) == NULL) |
fatal("Can't get working directory"); |
fatal("Can't get working directory"); |
|
|
logbuf = cvs_buf_alloc(1024); |
logbuf = buf_alloc(1024); |
cvs_trigger_loginfo_header(logbuf, repo); |
cvs_trigger_loginfo_header(logbuf, repo); |
|
|
cvs_buf_puts(logbuf, "Log Message:\n"); |
buf_puts(logbuf, "Log Message:\n"); |
cvs_buf_puts(logbuf, logmsg); |
buf_puts(logbuf, logmsg); |
if (logmsg[0] != '\0' && logmsg[strlen(logmsg) - 1] != '\n') |
if (logmsg[0] != '\0' && logmsg[strlen(logmsg) - 1] != '\n') |
cvs_buf_putc(logbuf, '\n'); |
buf_putc(logbuf, '\n'); |
cvs_buf_putc(logbuf, '\n'); |
buf_putc(logbuf, '\n'); |
|
|
cvs_buf_puts(logbuf, "Status:\n\n"); |
buf_puts(logbuf, "Status:\n\n"); |
|
|
cvs_buf_puts(logbuf, "Vendor Tag:\t"); |
buf_puts(logbuf, "Vendor Tag:\t"); |
cvs_buf_puts(logbuf, vendor_tag); |
buf_puts(logbuf, vendor_tag); |
cvs_buf_putc(logbuf, '\n'); |
buf_putc(logbuf, '\n'); |
cvs_buf_puts(logbuf, "Release Tags:\t"); |
buf_puts(logbuf, "Release Tags:\t"); |
|
|
for (i = 0; i < tagcount ; i++) { |
for (i = 0; i < tagcount ; i++) { |
cvs_buf_puts(logbuf, "\t\t"); |
buf_puts(logbuf, "\t\t"); |
cvs_buf_puts(logbuf, release_tags[i]); |
buf_puts(logbuf, release_tags[i]); |
cvs_buf_putc(logbuf, '\n'); |
buf_putc(logbuf, '\n'); |
} |
} |
cvs_buf_putc(logbuf, '\n'); |
buf_putc(logbuf, '\n'); |
cvs_buf_putc(logbuf, '\n'); |
buf_putc(logbuf, '\n'); |
} |
} |
|
|
static void |
static void |
|
|
if ((branch = rcsnum_parse(import_branch)) == NULL) |
if ((branch = rcsnum_parse(import_branch)) == NULL) |
fatal("import_new: failed to parse branch"); |
fatal("import_new: failed to parse branch"); |
|
|
bp = cvs_buf_load_fd(cf->fd); |
bp = buf_load_fd(cf->fd); |
|
|
if ((brev = rcsnum_brtorev(branch)) == NULL) |
if ((brev = rcsnum_brtorev(branch)) == NULL) |
fatal("import_new: failed to get first branch revision"); |
fatal("import_new: failed to get first branch revision"); |
|
|
fatal("import_update: rcsnum_parse failed"); |
fatal("import_update: rcsnum_parse failed"); |
|
|
b1 = rcs_rev_getbuf(cf->file_rcs, rev, RCS_KWEXP_NONE); |
b1 = rcs_rev_getbuf(cf->file_rcs, rev, RCS_KWEXP_NONE); |
b2 = cvs_buf_load_fd(cf->fd); |
b2 = buf_load_fd(cf->fd); |
|
|
ret = cvs_buf_differ(b1, b2); |
ret = buf_differ(b1, b2); |
cvs_buf_free(b1); |
buf_free(b1); |
cvs_buf_free(b2); |
buf_free(b2); |
if (ret == 0) { |
if (ret == 0) { |
import_tag(cf, brev, rev); |
import_tag(cf, brev, rev); |
rcsnum_free(brev); |
rcsnum_free(brev); |
|
|
BUF *b1, *b2; |
BUF *b1, *b2; |
int fd1, fd2; |
int fd1, fd2; |
|
|
b2 = cvs_buf_alloc(128); |
b2 = buf_alloc(128); |
|
|
b1 = cvs_buf_load_fd(cf->fd); |
b1 = buf_load_fd(cf->fd); |
|
|
(void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir); |
(void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir); |
fd1 = cvs_buf_write_stmp(b1, p1, NULL); |
fd1 = buf_write_stmp(b1, p1, NULL); |
cvs_buf_free(b1); |
buf_free(b1); |
|
|
(void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir); |
(void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir); |
fd2 = rcs_rev_write_stmp(cf->file_rcs, rev, p2, RCS_KWEXP_NONE); |
fd2 = rcs_rev_write_stmp(cf->file_rcs, rev, p2, RCS_KWEXP_NONE); |