version 1.122, 2008/01/28 21:32:00 |
version 1.123, 2008/01/29 11:58:59 |
|
|
if (!(flags & CR_RECURSE_DIRS)) |
if (!(flags & CR_RECURSE_DIRS)) |
cvs_client_send_request("Argument -l"); |
cvs_client_send_request("Argument -l"); |
|
|
if (logmsg != NULL) |
cvs_client_send_logmsg(logmsg); |
cvs_client_send_logmsg(logmsg); |
|
|
|
cvs_client_send_files(argv, argc); |
cvs_client_send_files(argv, argc); |
cvs_client_senddir("."); |
cvs_client_senddir("."); |
cvs_client_send_request("ci"); |
cvs_client_send_request("ci"); |
|
|
cvs_file_freelist(&files_affected); |
cvs_file_freelist(&files_affected); |
} |
} |
|
|
|
xfree(logmsg); |
return (0); |
return (0); |
} |
} |
|
|
|
|
RCSNUM *branch, *brev; |
RCSNUM *branch, *brev; |
char rev[CVS_REV_BUFSZ]; |
char rev[CVS_REV_BUFSZ]; |
|
|
|
branch = brev = NULL; |
|
|
cvs_log(LP_TRACE, "cvs_commit_check_files(%s)", cf->file_path); |
cvs_log(LP_TRACE, "cvs_commit_check_files(%s)", cf->file_path); |
|
|
if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) |
if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) |
|
|
cvs_log(LP_ERR, "%s is not a branch revision", |
cvs_log(LP_ERR, "%s is not a branch revision", |
rev); |
rev); |
conflicts_found++; |
conflicts_found++; |
|
rcsnum_free(brev); |
return; |
return; |
} |
} |
|
|
|
|
cvs_log(LP_ERR, "%s is not a branch revision", |
cvs_log(LP_ERR, "%s is not a branch revision", |
rev); |
rev); |
conflicts_found++; |
conflicts_found++; |
|
rcsnum_free(branch); |
|
rcsnum_free(brev); |
return; |
return; |
} |
} |
|
|
|
|
cvs_log(LP_ERR, "%s (%s) is not a branch", |
cvs_log(LP_ERR, "%s (%s) is not a branch", |
cf->file_ent->ce_tag, rev); |
cf->file_ent->ce_tag, rev); |
conflicts_found++; |
conflicts_found++; |
|
rcsnum_free(branch); |
|
rcsnum_free(brev); |
return; |
return; |
} |
} |
} |
} |
} |
} |
|
|
next: |
next: |
|
if (branch != NULL) |
|
rcsnum_free(branch); |
|
if (brev != NULL) |
|
rcsnum_free(brev); |
|
|
if (cf->file_status == FILE_ADDED || |
if (cf->file_status == FILE_ADDED || |
cf->file_status == FILE_REMOVED || |
cf->file_status == FILE_REMOVED || |
cf->file_status == FILE_MODIFIED) |
cf->file_status == FILE_MODIFIED) |
|
|
nrev = rcsnum_brtorev(brev); |
nrev = rcsnum_brtorev(brev); |
if (nrev == NULL) |
if (nrev == NULL) |
fatal("failed to create branch rev"); |
fatal("failed to create branch rev"); |
|
rcsnum_free(brev); |
} else { |
} else { |
fatal("this isnt suppose to happen, honestly"); |
fatal("this isnt suppose to happen, honestly"); |
} |
} |
|
|
strlcpy(rbuf, "Non-existent", sizeof(rbuf)); |
strlcpy(rbuf, "Non-existent", sizeof(rbuf)); |
} |
} |
|
|
|
if (rrev != NULL) |
|
rcsnum_free(rrev); |
isnew = 0; |
isnew = 0; |
if (cf->file_status == FILE_ADDED) { |
if (cf->file_status == FILE_ADDED) { |
isnew = 1; |
isnew = 1; |