| @@ -824,26 +824,45 @@ log_fileproc (void *callerdat, struct fi | | | @@ -824,26 +824,45 @@ log_fileproc (void *callerdat, struct fi |
| 824 | if (!really_quiet) | | 824 | if (!really_quiet) |
| 825 | error (0, 0, "%s has been added, but not committed", | | 825 | error (0, 0, "%s has been added, but not committed", |
| 826 | finfo->file); | | 826 | finfo->file); |
| 827 | return 0; | | 827 | return 0; |
| 828 | } | | 828 | } |
| 829 | } | | 829 | } |
| 830 | | | 830 | |
| 831 | if (!really_quiet) | | 831 | if (!really_quiet) |
| 832 | error (0, 0, "nothing known about %s", finfo->file); | | 832 | error (0, 0, "nothing known about %s", finfo->file); |
| 833 | | | 833 | |
| 834 | return 1; | | 834 | return 1; |
| 835 | } | | 835 | } |
| 836 | | | 836 | |
| | | 837 | /* cvsacl patch */ |
| | | 838 | #ifdef SERVER_SUPPORT |
| | | 839 | if (use_cvs_acl /* && server_active */) |
| | | 840 | { |
| | | 841 | if (!access_allowed (finfo->file, finfo->repository, NULL, 5, |
| | | 842 | NULL, NULL, 1)) |
| | | 843 | { |
| | | 844 | if (stop_at_first_permission_denied) |
| | | 845 | error (1, 0, "permission denied for %s", |
| | | 846 | Short_Repository (finfo->repository)); |
| | | 847 | else |
| | | 848 | error (0, 0, "permission denied for %s/%s", |
| | | 849 | Short_Repository (finfo->repository), finfo->file); |
| | | 850 | |
| | | 851 | return (0); |
| | | 852 | } |
| | | 853 | } |
| | | 854 | #endif |
| | | 855 | |
| 837 | if (log_data->sup_header || !log_data->nameonly) | | 856 | if (log_data->sup_header || !log_data->nameonly) |
| 838 | { | | 857 | { |
| 839 | | | 858 | |
| 840 | /* We will need all the information in the RCS file. */ | | 859 | /* We will need all the information in the RCS file. */ |
| 841 | RCS_fully_parse (rcsfile); | | 860 | RCS_fully_parse (rcsfile); |
| 842 | | | 861 | |
| 843 | /* Turn any symbolic revisions in the revision list into numeric | | 862 | /* Turn any symbolic revisions in the revision list into numeric |
| 844 | revisions. */ | | 863 | revisions. */ |
| 845 | revlist = log_expand_revlist (rcsfile, baserev, log_data->revlist, | | 864 | revlist = log_expand_revlist (rcsfile, baserev, log_data->revlist, |
| 846 | log_data->default_branch); | | 865 | log_data->default_branch); |
| 847 | if (log_data->sup_header | | 866 | if (log_data->sup_header |
| 848 | || (!log_data->header && !log_data->long_header)) | | 867 | || (!log_data->header && !log_data->long_header)) |
| 849 | { | | 868 | { |