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

Diff for /src/usr.bin/cvs/commit.c between version 1.60 and 1.61

version 1.60, 2006/05/28 01:24:28 version 1.61, 2006/05/28 04:32:54
Line 149 
Line 149 
 cvs_commit_local(struct cvs_file *cf)  cvs_commit_local(struct cvs_file *cf)
 {  {
         BUF *b;          BUF *b;
         char *d, *f, rbuf[16];          char *d, *f, rbuf[24];
         CVSENTRIES *entlist;          CVSENTRIES *entlist;
   
         cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path);          cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path);
Line 158 
Line 158 
         if (cf->file_status == FILE_MODIFIED ||          if (cf->file_status == FILE_MODIFIED ||
             cf->file_status == FILE_REMOVED)              cf->file_status == FILE_REMOVED)
                 rcsnum_tostr(cf->file_rcs->rf_head, rbuf, sizeof(rbuf));                  rcsnum_tostr(cf->file_rcs->rf_head, rbuf, sizeof(rbuf));
           else
                   strlcpy(rbuf, "Non-existent", sizeof(rbuf));
   
           if (cf->file_status == FILE_ADDED) {
                   cf->repo_fd = open(cf->file_rpath, O_CREAT|O_TRUNC|O_WRONLY);
                   if (cf->repo_fd < 0)
                           fatal("cvs_commit_local: %s", strerror(errno));
   
                   cf->file_rcs = rcs_open(cf->file_rpath, cf->repo_fd,
                       RCS_CREATE, 0600);
                   if (cf->file_rcs == NULL)
                           fatal("cvs_commit_local: failed to create RCS file "
                               "for %s", cf->file_path);
           }
   
         cvs_printf("Checking in %s:\n", cf->file_path);          cvs_printf("Checking in %s:\n", cf->file_path);
         cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path);          cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path);
         cvs_printf("old revision: %s; ", rbuf);          cvs_printf("old revision: %s; ", rbuf);
   
         d = commit_diff_file(cf);          if (cf->file_status != FILE_ADDED)
                   d = commit_diff_file(cf);
   
         if (cf->file_status == FILE_REMOVED) {          if (cf->file_status == FILE_REMOVED) {
                 b = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head);                  b = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head);
                 if (b == NULL)                  if (b == NULL)
                         fatal("cvs_commit_local: failed to get HEAD");                          fatal("cvs_commit_local: failed to get HEAD");
         } else if (cf->file_status == FILE_MODIFIED) {          } else {
                 if ((b = cvs_buf_load(cf->file_path, BUF_AUTOEXT)) == NULL)                  if ((b = cvs_buf_load(cf->file_path, BUF_AUTOEXT)) == NULL)
                         fatal("cvs_commit_local: failed to load file");                          fatal("cvs_commit_local: failed to load file");
         }          }
Line 177 
Line 192 
         cvs_buf_putc(b, '\0');          cvs_buf_putc(b, '\0');
         f = cvs_buf_release(b);          f = cvs_buf_release(b);
   
         if (rcs_deltatext_set(cf->file_rcs, cf->file_rcs->rf_head, d) == -1)          if (cf->file_status != FILE_ADDED) {
                 fatal("cvs_commit_local: failed to set delta");                  if (rcs_deltatext_set(cf->file_rcs,
                       cf->file_rcs->rf_head, d) == -1)
                           fatal("cvs_commit_local: failed to set delta");
           }
   
         if (rcs_rev_add(cf->file_rcs, RCS_HEAD_REV, logmsg, -1, NULL) == -1)          if (rcs_rev_add(cf->file_rcs, RCS_HEAD_REV, logmsg, -1, NULL) == -1)
                 fatal("cvs_commit_local: failed to add new revision");                  fatal("cvs_commit_local: failed to add new revision");
Line 187 
Line 205 
                 fatal("cvs_commit_local: failed to set new HEAD delta");                  fatal("cvs_commit_local: failed to set new HEAD delta");
   
         xfree(f);          xfree(f);
         xfree(d);  
   
           if (cf->file_status != FILE_ADDED)
                   xfree(d);
   
         if (cf->file_status == FILE_REMOVED) {          if (cf->file_status == FILE_REMOVED) {
                 if (rcs_state_set(cf->file_rcs,                  if (rcs_state_set(cf->file_rcs,
                     cf->file_rcs->rf_head, RCS_STATE_DEAD) == -1)                      cf->file_rcs->rf_head, RCS_STATE_DEAD) == -1)
Line 199 
Line 219 
   
         if (cf->file_status == FILE_REMOVED) {          if (cf->file_status == FILE_REMOVED) {
                 strlcpy(rbuf, "Removed", sizeof(rbuf));                  strlcpy(rbuf, "Removed", sizeof(rbuf));
           } else if (cf->file_status == FILE_ADDED) {
                   strlcpy(rbuf, "Initial Revision", sizeof(rbuf));
         } else if (cf->file_status == FILE_MODIFIED) {          } else if (cf->file_status == FILE_MODIFIED) {
                 rcsnum_tostr(cf->file_rcs->rf_head, rbuf, sizeof(rbuf));                  rcsnum_tostr(cf->file_rcs->rf_head, rbuf, sizeof(rbuf));
         }          }
Legend:
Removed from v.1.60  
changed lines
  Added in v.1.61