[BACK]Return to commit.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / cvs

Annotation of src/usr.bin/cvs/commit.c, Revision 1.115

1.115   ! joris       1: /*     $OpenBSD: commit.c,v 1.114 2007/10/03 13:12:06 joris Exp $      */
1.1       jfb         2: /*
1.55      joris       3:  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
1.71      xsa         4:  * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
1.1       jfb         5:  *
1.55      joris       6:  * Permission to use, copy, modify, and distribute this software for any
                      7:  * purpose with or without fee is hereby granted, provided that the above
                      8:  * copyright notice and this permission notice appear in all copies.
1.1       jfb         9:  *
1.55      joris      10:  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
                     11:  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
                     12:  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
                     13:  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
                     14:  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
                     15:  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
                     16:  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1.1       jfb        17:  */
                     18:
1.105     otto       19: #include <sys/stat.h>
                     20:
                     21: #include <errno.h>
                     22: #include <fcntl.h>
                     23: #include <string.h>
                     24: #include <unistd.h>
1.1       jfb        25:
                     26: #include "cvs.h"
1.55      joris      27: #include "diff.h"
1.80      joris      28: #include "remote.h"
1.1       jfb        29:
1.55      joris      30: void   cvs_commit_local(struct cvs_file *);
1.86      joris      31: void   cvs_commit_check_files(struct cvs_file *);
1.55      joris      32:
1.112     joris      33: static BUF *commit_diff(struct cvs_file *, RCSNUM *, int);
1.71      xsa        34: static void commit_desc_set(struct cvs_file *);
1.55      joris      35:
                     36: struct cvs_flisthead files_affected;
1.86      joris      37: struct cvs_flisthead files_added;
                     38: struct cvs_flisthead files_removed;
                     39: struct cvs_flisthead files_modified;
                     40:
1.55      joris      41: int    conflicts_found;
1.86      joris      42: char   *logmsg = NULL;
1.34      jfb        43:
                     44: struct cvs_cmd cvs_cmd_commit = {
1.74      joris      45:        CVS_OP_COMMIT, 0, "commit",
1.55      joris      46:        { "ci", "com" },
1.34      jfb        47:        "Check files into the repository",
                     48:        "[-flR] [-F logfile | -m msg] [-r rev] ...",
                     49:        "F:flm:Rr:",
1.18      joris      50:        NULL,
1.55      joris      51:        cvs_commit
1.18      joris      52: };
1.1       jfb        53:
1.55      joris      54: int
                     55: cvs_commit(int argc, char **argv)
1.1       jfb        56: {
1.18      joris      57:        int ch;
1.55      joris      58:        char *arg = ".";
1.58      joris      59:        int flags;
1.55      joris      60:        struct cvs_recursion cr;
1.3       krapht     61:
1.58      joris      62:        flags = CR_RECURSE_DIRS;
                     63:
1.55      joris      64:        while ((ch = getopt(argc, argv, cvs_cmd_commit.cmd_opts)) != -1) {
1.1       jfb        65:                switch (ch) {
                     66:                case 'F':
1.88      joris      67:                        logmsg = cvs_logmsg_read(optarg);
1.1       jfb        68:                        break;
1.82      xsa        69:                case 'f':
                     70:                        break;
1.1       jfb        71:                case 'l':
1.58      joris      72:                        flags &= ~CR_RECURSE_DIRS;
1.1       jfb        73:                        break;
                     74:                case 'm':
1.55      joris      75:                        logmsg = xstrdup(optarg);
                     76:                        break;
1.82      xsa        77:                case 'R':
                     78:                        break;
1.55      joris      79:                case 'r':
1.1       jfb        80:                        break;
                     81:                default:
1.55      joris      82:                        fatal("%s", cvs_cmd_commit.cmd_synopsis);
1.1       jfb        83:                }
                     84:        }
                     85:
1.55      joris      86:        argc -= optind;
                     87:        argv += optind;
1.1       jfb        88:
1.86      joris      89:        TAILQ_INIT(&files_affected);
                     90:        TAILQ_INIT(&files_added);
                     91:        TAILQ_INIT(&files_removed);
                     92:        TAILQ_INIT(&files_modified);
                     93:        conflicts_found = 0;
                     94:
                     95:        cr.enterdir = NULL;
                     96:        cr.leavedir = NULL;
                     97:        cr.fileproc = cvs_commit_check_files;
                     98:        cr.flags = flags;
                     99:
                    100:        if (argc > 0)
                    101:                cvs_file_run(argc, argv, &cr);
                    102:        else
                    103:                cvs_file_run(1, &arg, &cr);
                    104:
                    105:        if (conflicts_found != 0)
                    106:                fatal("%d conflicts found, please correct these first",
                    107:                    conflicts_found);
1.92      joris     108:
                    109:        if (TAILQ_EMPTY(&files_affected))
                    110:                return (0);
1.86      joris     111:
                    112:        if (logmsg == NULL && cvs_server_active == 0) {
                    113:                logmsg = cvs_logmsg_create(&files_added, &files_removed,
                    114:                    &files_modified);
                    115:        }
                    116:
1.55      joris     117:        if (logmsg == NULL)
1.86      joris     118:                fatal("This shouldnt happen, honestly!");
1.87      joris     119:
                    120:        cvs_file_freelist(&files_modified);
                    121:        cvs_file_freelist(&files_removed);
                    122:        cvs_file_freelist(&files_added);
1.80      joris     123:
                    124:        if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
1.89      joris     125:                cvs_client_connect_to_server();
1.80      joris     126:                cr.fileproc = cvs_client_sendfile;
                    127:
                    128:                if (argc > 0)
                    129:                        cvs_file_run(argc, argv, &cr);
                    130:                else
                    131:                        cvs_file_run(1, &arg, &cr);
1.99      xsa       132:
                    133:                if (!(flags & CR_RECURSE_DIRS))
                    134:                        cvs_client_send_request("Argument -l");
1.80      joris     135:
1.109     joris     136:                if (logmsg != NULL)
                    137:                        cvs_client_send_logmsg(logmsg);
1.80      joris     138:
                    139:                cvs_client_send_files(argv, argc);
                    140:                cvs_client_senddir(".");
                    141:                cvs_client_send_request("ci");
                    142:                cvs_client_get_responses();
1.86      joris     143:        } else {
                    144:                cr.fileproc = cvs_commit_local;
                    145:                cvs_file_walklist(&files_affected, &cr);
                    146:                cvs_file_freelist(&files_affected);
1.80      joris     147:        }
1.1       jfb       148:
1.18      joris     149:        return (0);
                    150: }
1.1       jfb       151:
1.55      joris     152: void
1.86      joris     153: cvs_commit_check_files(struct cvs_file *cf)
1.18      joris     154: {
1.112     joris     155:        char *tag;
                    156:        RCSNUM *branch, *brev;
                    157:        char rev[CVS_REV_BUFSZ];
                    158:
1.86      joris     159:        cvs_log(LP_TRACE, "cvs_commit_check_files(%s)", cf->file_path);
1.44      joris     160:
1.108     joris     161:        if (current_cvsroot->cr_method != CVS_METHOD_LOCAL)
                    162:                cvs_remote_classify_file(cf);
                    163:        else
1.110     joris     164:                cvs_file_classify(cf, cvs_directory_tag);
1.59      joris     165:
                    166:        if (cf->file_type == CVS_DIR) {
                    167:                if (verbosity > 1)
                    168:                        cvs_log(LP_NOTICE, "Examining %s", cf->file_path);
                    169:                return;
                    170:        }
1.32      joris     171:
1.55      joris     172:        if (cf->file_status == FILE_CONFLICT ||
1.79      joris     173:            cf->file_status == FILE_UNLINK) {
1.55      joris     174:                conflicts_found++;
1.79      joris     175:                return;
                    176:        }
1.57      joris     177:
1.63      joris     178:        if (cf->file_status != FILE_REMOVED &&
                    179:            update_has_conflict_markers(cf)) {
1.60      joris     180:                cvs_log(LP_ERR, "conflict: unresolved conflicts in %s from "
                    181:                    "merging, please fix these first", cf->file_path);
                    182:                conflicts_found++;
1.79      joris     183:                return;
1.60      joris     184:        }
                    185:
1.57      joris     186:        if (cf->file_status == FILE_MERGE ||
1.72      joris     187:            cf->file_status == FILE_PATCH ||
1.79      joris     188:            cf->file_status == FILE_CHECKOUT ||
                    189:            cf->file_status == FILE_LOST) {
1.57      joris     190:                cvs_log(LP_ERR, "conflict: %s is not up-to-date",
                    191:                    cf->file_path);
                    192:                conflicts_found++;
1.79      joris     193:                return;
1.57      joris     194:        }
1.55      joris     195:
1.112     joris     196:        if (current_cvsroot->cr_method == CVS_METHOD_LOCAL) {
                    197:                tag = cvs_directory_tag;
                    198:                if (cf->file_ent != NULL)
                    199:                        tag = cf->file_ent->ce_tag;
                    200:
                    201:                if (tag != NULL && cf->file_rcs != NULL) {
                    202:                        brev = rcs_sym_getrev(cf->file_rcs, tag);
                    203:                        if (brev != NULL) {
                    204:                                if (RCSNUM_ISBRANCH(brev))
                    205:                                        goto next;
                    206:                        }
                    207:
                    208:                        brev = rcs_translate_tag(tag, cf->file_rcs);
                    209:
                    210:                        if (brev == NULL) {
                    211:                                fatal("failed to resolve tag: %s",
                    212:                                    cf->file_ent->ce_tag);
                    213:                        }
                    214:
                    215:                        rcsnum_tostr(brev, rev, sizeof(rev));
                    216:                        if ((branch = rcsnum_revtobr(brev)) == NULL) {
                    217:                                cvs_log(LP_ERR, "%s is not a branch revision",
                    218:                                    rev);
                    219:                                conflicts_found++;
                    220:                                return;
                    221:                        }
                    222:
                    223:                        if (!RCSNUM_ISBRANCHREV(brev)) {
                    224:                                cvs_log(LP_ERR, "%s is not a branch revision",
                    225:                                    rev);
                    226:                                conflicts_found++;
                    227:                                return;
                    228:                        }
                    229:
                    230:                        rcsnum_tostr(branch, rev, sizeof(rev));
                    231:                        if (!RCSNUM_ISBRANCH(branch)) {
                    232:                                cvs_log(LP_ERR, "%s (%s) is not a branch",
                    233:                                    cf->file_ent->ce_tag, rev);
                    234:                                conflicts_found++;
                    235:                                return;
                    236:                        }
                    237:                }
                    238:        }
                    239:
                    240: next:
1.55      joris     241:        if (cf->file_status == FILE_ADDED ||
                    242:            cf->file_status == FILE_REMOVED ||
                    243:            cf->file_status == FILE_MODIFIED)
1.110     joris     244:                cvs_file_get(cf->file_path, 0, &files_affected);
1.86      joris     245:
                    246:        switch (cf->file_status) {
                    247:        case FILE_ADDED:
1.110     joris     248:                cvs_file_get(cf->file_path, 0, &files_added);
1.86      joris     249:                break;
                    250:        case FILE_REMOVED:
1.110     joris     251:                cvs_file_get(cf->file_path, 0, &files_removed);
1.86      joris     252:                break;
                    253:        case FILE_MODIFIED:
1.110     joris     254:                cvs_file_get(cf->file_path, 0, &files_modified);
1.86      joris     255:                break;
                    256:        }
1.55      joris     257: }
1.1       jfb       258:
1.55      joris     259: void
                    260: cvs_commit_local(struct cvs_file *cf)
                    261: {
1.112     joris     262:        char *tag;
1.91      joris     263:        BUF *b, *d;
1.112     joris     264:        int onbranch, isnew, histtype;
                    265:        RCSNUM *nrev, *crev, *rrev, *brev;
1.102     xsa       266:        int openflags, rcsflags;
1.113     joris     267:        char rbuf[24], nbuf[24];
1.56      joris     268:        CVSENTRIES *entlist;
1.100     otto      269:        char attic[MAXPATHLEN], repo[MAXPATHLEN], rcsfile[MAXPATHLEN];
1.17      joris     270:
1.55      joris     271:        cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path);
1.110     joris     272:        cvs_file_classify(cf, cvs_directory_tag);
1.69      joris     273:
                    274:        if (cvs_noexec == 1)
                    275:                return;
1.35      xsa       276:
1.64      joris     277:        if (cf->file_type != CVS_FILE)
                    278:                fatal("cvs_commit_local: '%s' is not a file", cf->file_path);
                    279:
1.107     joris     280:        if (cf->file_status != FILE_MODIFIED &&
                    281:            cf->file_status != FILE_ADDED &&
                    282:            cf->file_status != FILE_REMOVED) {
                    283:                cvs_log(LP_ERR, "skipping bogus file `%s'", cf->file_path);
                    284:                return;
                    285:        }
                    286:
1.112     joris     287:        onbranch = 0;
                    288:        nrev = RCS_HEAD_REV;
                    289:        crev = NULL;
                    290:        rrev = NULL;
                    291:
1.115   ! joris     292:        if (cf->file_rcs != NULL && cf->file_rcs->rf_branch != NULL) {
1.114     joris     293:                rcsnum_free(cf->file_rcs->rf_branch);
                    294:                cf->file_rcs->rf_branch = NULL;
                    295:        }
                    296:
1.56      joris     297:        if (cf->file_status == FILE_MODIFIED ||
1.66      joris     298:            cf->file_status == FILE_REMOVED || (cf->file_status == FILE_ADDED
1.93      joris     299:            && cf->file_rcs != NULL && cf->file_rcs->rf_dead == 1)) {
1.112     joris     300:                rrev = rcs_head_get(cf->file_rcs);
                    301:                crev = rcs_head_get(cf->file_rcs);
                    302:
                    303:                tag = cvs_directory_tag;
                    304:                if (cf->file_ent != NULL && cf->file_ent->ce_tag != NULL)
                    305:                        tag = cf->file_ent->ce_tag;
                    306:
                    307:                if (tag != NULL) {
                    308:                        rcsnum_free(crev);
                    309:                        crev = rcs_translate_tag(tag, cf->file_rcs);
                    310:                        if (crev == NULL) {
                    311:                                fatal("failed to resolve existing tag: %s",
                    312:                                    tag);
                    313:                        }
                    314:
                    315:                        if (RCSNUM_ISBRANCHREV(crev)) {
                    316:                                nrev = rcsnum_alloc();
                    317:                                rcsnum_cpy(crev, nrev, 0);
                    318:                                rcsnum_inc(nrev);
                    319:                        } else if (!RCSNUM_ISBRANCH(crev)) {
                    320:                                brev = rcs_sym_getrev(cf->file_rcs, tag);
                    321:                                if (brev == NULL)
                    322:                                        fatal("no more tag?");
                    323:                                nrev = rcsnum_brtorev(brev);
                    324:                                if (nrev == NULL)
                    325:                                        fatal("failed to create branch rev");
                    326:                        } else {
                    327:                                fatal("this isnt suppose to happen, honestly");
                    328:                        }
                    329:
                    330:                        rcsnum_free(rrev);
                    331:                        rrev = rcsnum_branch_root(nrev);
                    332:
                    333:                        /* branch stuff was checked in cvs_commit_check_files */
                    334:                        onbranch = 1;
                    335:                }
                    336:
                    337:                rcsnum_tostr(crev, rbuf, sizeof(rbuf));
1.93      joris     338:        } else {
1.61      joris     339:                strlcpy(rbuf, "Non-existent", sizeof(rbuf));
1.93      joris     340:        }
1.61      joris     341:
1.67      joris     342:        isnew = 0;
1.66      joris     343:        if (cf->file_status == FILE_ADDED) {
1.67      joris     344:                isnew = 1;
1.66      joris     345:                rcsflags = RCS_CREATE;
                    346:                openflags = O_CREAT | O_TRUNC | O_WRONLY;
                    347:                if (cf->file_rcs != NULL) {
1.106     niallo    348:                        if (cf->in_attic == 0)
1.66      joris     349:                                cvs_log(LP_ERR, "warning: expected %s "
                    350:                                    "to be in the Attic", cf->file_path);
                    351:
                    352:                        if (cf->file_rcs->rf_dead == 0)
                    353:                                cvs_log(LP_ERR, "warning: expected %s "
                    354:                                    "to be dead", cf->file_path);
                    355:
                    356:                        cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
1.102     xsa       357:                        (void)xsnprintf(rcsfile, MAXPATHLEN, "%s/%s%s",
1.66      joris     358:                            repo, cf->file_name, RCS_FILE_EXT);
                    359:
                    360:                        if (rename(cf->file_rpath, rcsfile) == -1)
                    361:                                fatal("cvs_commit_local: failed to move %s "
                    362:                                    "outside the Attic: %s", cf->file_path,
                    363:                                    strerror(errno));
                    364:
                    365:                        xfree(cf->file_rpath);
                    366:                        cf->file_rpath = xstrdup(rcsfile);
                    367:
                    368:                        rcsflags = RCS_READ | RCS_PARSE_FULLY;
                    369:                        openflags = O_RDONLY;
                    370:                        rcs_close(cf->file_rcs);
1.67      joris     371:                        isnew = 0;
1.66      joris     372:                }
                    373:
                    374:                cf->repo_fd = open(cf->file_rpath, openflags);
1.61      joris     375:                if (cf->repo_fd < 0)
                    376:                        fatal("cvs_commit_local: %s", strerror(errno));
                    377:
                    378:                cf->file_rcs = rcs_open(cf->file_rpath, cf->repo_fd,
1.103     otto      379:                    rcsflags, 0444);
1.61      joris     380:                if (cf->file_rcs == NULL)
                    381:                        fatal("cvs_commit_local: failed to create RCS file "
                    382:                            "for %s", cf->file_path);
1.71      xsa       383:
                    384:                commit_desc_set(cf);
1.61      joris     385:        }
1.36      joris     386:
1.77      reyk      387:        if (verbosity > 1) {
                    388:                cvs_printf("Checking in %s:\n", cf->file_path);
                    389:                cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path);
                    390:                cvs_printf("old revision: %s; ", rbuf);
                    391:        }
1.7       jfb       392:
1.112     joris     393:        if (isnew == 0 && onbranch == 0)
                    394:                d = commit_diff(cf, cf->file_rcs->rf_head, 0);
1.7       jfb       395:
1.56      joris     396:        if (cf->file_status == FILE_REMOVED) {
1.112     joris     397:                b = rcs_rev_getbuf(cf->file_rcs, crev, 0);
1.56      joris     398:                if (b == NULL)
1.112     joris     399:                        fatal("cvs_commit_local: failed to get crev");
                    400:        } else if (onbranch == 1) {
                    401:                b = commit_diff(cf, crev, 1);
1.61      joris     402:        } else {
1.73      joris     403:                if ((b = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
1.56      joris     404:                        fatal("cvs_commit_local: failed to load file");
                    405:        }
1.7       jfb       406:
1.112     joris     407:        if (isnew == 0 && onbranch == 0) {
                    408:                if (rcs_deltatext_set(cf->file_rcs, crev, d) == -1)
1.61      joris     409:                        fatal("cvs_commit_local: failed to set delta");
                    410:        }
1.3       krapht    411:
1.112     joris     412:        if (rcs_rev_add(cf->file_rcs, nrev, logmsg, -1, NULL) == -1)
1.55      joris     413:                fatal("cvs_commit_local: failed to add new revision");
1.3       krapht    414:
1.112     joris     415:        if (nrev == RCS_HEAD_REV)
                    416:                nrev = cf->file_rcs->rf_head;
                    417:
                    418:        if (rcs_deltatext_set(cf->file_rcs, nrev, b) == -1)
1.55      joris     419:                fatal("cvs_commit_local: failed to set new HEAD delta");
1.3       krapht    420:
1.56      joris     421:        if (cf->file_status == FILE_REMOVED) {
1.112     joris     422:                if (rcs_state_set(cf->file_rcs, nrev, RCS_STATE_DEAD) == -1)
1.56      joris     423:                        fatal("cvs_commit_local: failed to set state");
1.101     xsa       424:        }
                    425:
                    426:        if (cf->file_status == FILE_ADDED && cf->file_ent->ce_opts != NULL) {
                    427:                int kflag;
                    428:
                    429:                kflag = rcs_kflag_get(cf->file_ent->ce_opts + 2);
                    430:                rcs_kwexp_set(cf->file_rcs, kflag);
1.56      joris     431:        }
                    432:
1.55      joris     433:        rcs_write(cf->file_rcs);
1.6       jfb       434:
1.56      joris     435:        if (cf->file_status == FILE_REMOVED) {
1.77      reyk      436:                strlcpy(nbuf, "Removed", sizeof(nbuf));
1.61      joris     437:        } else if (cf->file_status == FILE_ADDED) {
1.66      joris     438:                if (cf->file_rcs->rf_dead == 1)
1.77      reyk      439:                        strlcpy(nbuf, "Initial Revision", sizeof(nbuf));
1.63      joris     440:                else
1.112     joris     441:                        rcsnum_tostr(nrev, nbuf, sizeof(nbuf));
1.56      joris     442:        } else if (cf->file_status == FILE_MODIFIED) {
1.112     joris     443:                rcsnum_tostr(nrev, nbuf, sizeof(nbuf));
1.56      joris     444:        }
                    445:
1.77      reyk      446:        if (verbosity > 1)
                    447:                cvs_printf("new revision: %s\n", nbuf);
1.3       krapht    448:
1.55      joris     449:        (void)unlink(cf->file_path);
                    450:        (void)close(cf->fd);
                    451:        cf->fd = -1;
1.56      joris     452:
                    453:        if (cf->file_status != FILE_REMOVED) {
1.112     joris     454:                cvs_checkout_file(cf, nrev, NULL, CO_COMMIT);
1.56      joris     455:        } else {
                    456:                entlist = cvs_ent_open(cf->file_wd);
                    457:                cvs_ent_remove(entlist, cf->file_name);
                    458:                cvs_ent_close(entlist, ENT_SYNC);
1.64      joris     459:
                    460:                cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
                    461:
1.102     xsa       462:                (void)xsnprintf(attic, MAXPATHLEN, "%s/%s",
                    463:                    repo, CVS_PATH_ATTIC);
1.64      joris     464:
                    465:                if (mkdir(attic, 0755) == -1 && errno != EEXIST)
                    466:                        fatal("cvs_commit_local: failed to create Attic");
                    467:
1.102     xsa       468:                (void)xsnprintf(attic, MAXPATHLEN, "%s/%s/%s%s", repo,
1.64      joris     469:                    CVS_PATH_ATTIC, cf->file_name, RCS_FILE_EXT);
                    470:
                    471:                if (rename(cf->file_rpath, attic) == -1)
                    472:                        fatal("cvs_commit_local: failed to move %s to Attic",
                    473:                            cf->file_path);
                    474:
1.85      joris     475:                if (cvs_server_active == 1)
                    476:                        cvs_server_update_entry("Remove-entry", cf);
1.56      joris     477:        }
1.3       krapht    478:
1.77      reyk      479:        if (verbosity > 1)
                    480:                cvs_printf("done\n");
                    481:        else {
                    482:                cvs_log(LP_NOTICE, "checking in '%s'; revision %s -> %s",
                    483:                    cf->file_path, rbuf, nbuf);
                    484:        }
1.107     joris     485:
                    486:        switch (cf->file_status) {
                    487:        case FILE_MODIFIED:
                    488:                histtype = CVS_HISTORY_COMMIT_MODIFIED;
                    489:                break;
                    490:        case FILE_ADDED:
                    491:                histtype = CVS_HISTORY_COMMIT_ADDED;
                    492:                break;
                    493:        case FILE_REMOVED:
                    494:                histtype = CVS_HISTORY_COMMIT_REMOVED;
                    495:                break;
                    496:        }
                    497:
                    498:        cvs_history_add(histtype, cf, NULL);
1.39      xsa       499: }
                    500:
1.91      joris     501: static BUF *
1.112     joris     502: commit_diff(struct cvs_file *cf, RCSNUM *rev, int reverse)
1.39      xsa       503: {
1.112     joris     504:        char *p1, *p2, *p;
1.97      joris     505:        BUF *b1, *b2;
                    506:
                    507:        (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
1.39      xsa       508:
1.63      joris     509:        if (cf->file_status == FILE_MODIFIED ||
                    510:            cf->file_status == FILE_ADDED) {
1.73      joris     511:                if ((b1 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
1.56      joris     512:                        fatal("commit_diff_file: failed to load '%s'",
                    513:                            cf->file_path);
1.97      joris     514:                cvs_buf_write_stmp(b1, p1, NULL);
                    515:                cvs_buf_free(b1);
1.63      joris     516:        } else {
1.112     joris     517:                rcs_rev_write_stmp(cf->file_rcs, rev, p1, 0);
1.56      joris     518:        }
1.3       krapht    519:
1.97      joris     520:        (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
1.112     joris     521:        rcs_rev_write_stmp(cf->file_rcs, rev, p2, 0);
1.55      joris     522:
1.97      joris     523:        if ((b2 = cvs_buf_alloc(128, BUF_AUTOEXT)) == NULL)
1.112     joris     524:                fatal("commit_diff: failed to create diff buf");
1.55      joris     525:
                    526:        diff_format = D_RCSDIFF;
1.112     joris     527:
                    528:        if (reverse == 1) {
                    529:                p = p1;
                    530:                p1 = p2;
                    531:                p2 = p;
                    532:        }
                    533:
1.97      joris     534:        if (cvs_diffreg(p1, p2, b2) == D_ERROR)
1.112     joris     535:                fatal("commit_diff: failed to get RCS patch");
1.96      joris     536:
                    537:        xfree(p1);
                    538:        xfree(p2);
1.55      joris     539:
1.97      joris     540:        return (b2);
1.71      xsa       541: }
                    542:
                    543: static void
                    544: commit_desc_set(struct cvs_file *cf)
                    545: {
                    546:        BUF *bp;
1.102     xsa       547:        int fd;
1.100     otto      548:        char desc_path[MAXPATHLEN], *desc;
1.71      xsa       549:
1.102     xsa       550:        (void)xsnprintf(desc_path, MAXPATHLEN, "%s/%s%s",
1.71      xsa       551:            CVS_PATH_CVSDIR, cf->file_name, CVS_DESCR_FILE_EXT);
                    552:
1.100     otto      553:        if ((fd = open(desc_path, O_RDONLY)) == -1)
1.71      xsa       554:                return;
                    555:
1.78      joris     556:        bp = cvs_buf_load_fd(fd, BUF_AUTOEXT);
1.71      xsa       557:        cvs_buf_putc(bp, '\0');
                    558:        desc = cvs_buf_release(bp);
                    559:
                    560:        rcs_desc_set(cf->file_rcs, desc);
                    561:
1.76      joris     562:        (void)close(fd);
1.71      xsa       563:        (void)cvs_unlink(desc_path);
                    564:
                    565:        xfree(desc);
1.1       jfb       566: }