2 3d1b16d1 2023-07-08 jrick * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 3d1b16d1 2023-07-08 jrick * Permission to use, copy, modify, and distribute this software for any
5 3d1b16d1 2023-07-08 jrick * purpose with or without fee is hereby granted, provided that the above
6 3d1b16d1 2023-07-08 jrick * copyright notice and this permission notice appear in all copies.
8 3d1b16d1 2023-07-08 jrick * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 3d1b16d1 2023-07-08 jrick * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 3d1b16d1 2023-07-08 jrick * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 3d1b16d1 2023-07-08 jrick * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 3d1b16d1 2023-07-08 jrick * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 3d1b16d1 2023-07-08 jrick * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 3d1b16d1 2023-07-08 jrick * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 3d1b16d1 2023-07-08 jrick #include <sys/stat.h>
18 3d1b16d1 2023-07-08 jrick #include <sys/queue.h>
19 3d1b16d1 2023-07-08 jrick #include <sys/tree.h>
21 3d1b16d1 2023-07-08 jrick #include <dirent.h>
22 3d1b16d1 2023-07-08 jrick #include <limits.h>
23 3d1b16d1 2023-07-08 jrick #include <stddef.h>
24 3d1b16d1 2023-07-08 jrick #include <string.h>
25 3d1b16d1 2023-07-08 jrick #include <stdio.h>
26 3d1b16d1 2023-07-08 jrick #include <stdlib.h>
27 3d1b16d1 2023-07-08 jrick #include <time.h>
28 3d1b16d1 2023-07-08 jrick #include <fcntl.h>
29 3d1b16d1 2023-07-08 jrick #include <errno.h>
30 3d1b16d1 2023-07-08 jrick #include <unistd.h>
31 3d1b16d1 2023-07-08 jrick #include <sha1.h>
32 3d1b16d1 2023-07-08 jrick #include <sha2.h>
33 3d1b16d1 2023-07-08 jrick #include <zlib.h>
34 3d1b16d1 2023-07-08 jrick #include <fnmatch.h>
35 3d1b16d1 2023-07-08 jrick #include <libgen.h>
36 3d1b16d1 2023-07-08 jrick #include <uuid.h>
37 3d1b16d1 2023-07-08 jrick #include <util.h>
39 3d1b16d1 2023-07-08 jrick #include "got_error.h"
40 3d1b16d1 2023-07-08 jrick #include "got_repository.h"
41 3d1b16d1 2023-07-08 jrick #include "got_reference.h"
42 3d1b16d1 2023-07-08 jrick #include "got_object.h"
43 3d1b16d1 2023-07-08 jrick #include "got_path.h"
44 3d1b16d1 2023-07-08 jrick #include "got_cancel.h"
45 3d1b16d1 2023-07-08 jrick #include "got_worktree.h"
46 3d1b16d1 2023-07-08 jrick #include "got_worktree_cvg.h"
47 3d1b16d1 2023-07-08 jrick #include "got_opentemp.h"
48 3d1b16d1 2023-07-08 jrick #include "got_diff.h"
49 3d1b16d1 2023-07-08 jrick #include "got_send.h"
50 3d1b16d1 2023-07-08 jrick #include "got_fetch.h"
52 3d1b16d1 2023-07-08 jrick #include "got_lib_worktree.h"
53 3d1b16d1 2023-07-08 jrick #include "got_lib_hash.h"
54 3d1b16d1 2023-07-08 jrick #include "got_lib_fileindex.h"
55 3d1b16d1 2023-07-08 jrick #include "got_lib_inflate.h"
56 3d1b16d1 2023-07-08 jrick #include "got_lib_delta.h"
57 3d1b16d1 2023-07-08 jrick #include "got_lib_object.h"
58 3d1b16d1 2023-07-08 jrick #include "got_lib_object_parse.h"
59 3d1b16d1 2023-07-08 jrick #include "got_lib_object_create.h"
60 3d1b16d1 2023-07-08 jrick #include "got_lib_object_idset.h"
61 3d1b16d1 2023-07-08 jrick #include "got_lib_diff.h"
63 3d1b16d1 2023-07-08 jrick #ifndef MIN
64 3d1b16d1 2023-07-08 jrick #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
67 3d1b16d1 2023-07-08 jrick #define GOT_MERGE_LABEL_MERGED "merged change"
68 3d1b16d1 2023-07-08 jrick #define GOT_MERGE_LABEL_BASE "3-way merge base"
70 3d1b16d1 2023-07-08 jrick static const struct got_error *
71 3d1b16d1 2023-07-08 jrick lock_worktree(struct got_worktree *worktree, int operation)
73 3d1b16d1 2023-07-08 jrick if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
74 3d1b16d1 2023-07-08 jrick return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
75 3d1b16d1 2023-07-08 jrick : got_error_from_errno2("flock",
76 3d1b16d1 2023-07-08 jrick got_worktree_get_root_path(worktree)));
77 3d1b16d1 2023-07-08 jrick return NULL;
80 3d1b16d1 2023-07-08 jrick static const struct got_error *
81 3d1b16d1 2023-07-08 jrick is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
82 3d1b16d1 2023-07-08 jrick size_t target_len, const char *ondisk_path, const char *wtroot_path)
84 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
85 3d1b16d1 2023-07-08 jrick char canonpath[PATH_MAX];
86 3d1b16d1 2023-07-08 jrick char *path_got = NULL;
88 3d1b16d1 2023-07-08 jrick *is_bad_symlink = 0;
90 3d1b16d1 2023-07-08 jrick if (target_len >= sizeof(canonpath)) {
91 3d1b16d1 2023-07-08 jrick *is_bad_symlink = 1;
92 3d1b16d1 2023-07-08 jrick return NULL;
96 3d1b16d1 2023-07-08 jrick * We do not use realpath(3) to resolve the symlink's target
97 3d1b16d1 2023-07-08 jrick * path because we don't want to resolve symlinks recursively.
98 3d1b16d1 2023-07-08 jrick * Instead we make the path absolute and then canonicalize it.
99 3d1b16d1 2023-07-08 jrick * Relative symlink target lookup should begin at the directory
100 3d1b16d1 2023-07-08 jrick * in which the blob object is being installed.
102 3d1b16d1 2023-07-08 jrick if (!got_path_is_absolute(target_path)) {
103 3d1b16d1 2023-07-08 jrick char *abspath, *parent;
104 3d1b16d1 2023-07-08 jrick err = got_path_dirname(&parent, ondisk_path);
106 3d1b16d1 2023-07-08 jrick return err;
107 3d1b16d1 2023-07-08 jrick if (asprintf(&abspath, "%s/%s", parent, target_path) == -1) {
108 3d1b16d1 2023-07-08 jrick free(parent);
109 3d1b16d1 2023-07-08 jrick return got_error_from_errno("asprintf");
111 3d1b16d1 2023-07-08 jrick free(parent);
112 3d1b16d1 2023-07-08 jrick if (strlen(abspath) >= sizeof(canonpath)) {
113 3d1b16d1 2023-07-08 jrick err = got_error_path(abspath, GOT_ERR_BAD_PATH);
114 3d1b16d1 2023-07-08 jrick free(abspath);
115 3d1b16d1 2023-07-08 jrick return err;
117 3d1b16d1 2023-07-08 jrick err = got_canonpath(abspath, canonpath, sizeof(canonpath));
118 3d1b16d1 2023-07-08 jrick free(abspath);
120 3d1b16d1 2023-07-08 jrick return err;
122 3d1b16d1 2023-07-08 jrick err = got_canonpath(target_path, canonpath, sizeof(canonpath));
124 3d1b16d1 2023-07-08 jrick return err;
127 3d1b16d1 2023-07-08 jrick /* Only allow symlinks pointing at paths within the work tree. */
128 3d1b16d1 2023-07-08 jrick if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
129 3d1b16d1 2023-07-08 jrick *is_bad_symlink = 1;
130 3d1b16d1 2023-07-08 jrick return NULL;
133 3d1b16d1 2023-07-08 jrick /* Do not allow symlinks pointing into the .got directory. */
134 3d1b16d1 2023-07-08 jrick if (asprintf(&path_got, "%s/%s", wtroot_path,
135 3d1b16d1 2023-07-08 jrick GOT_WORKTREE_GOT_DIR) == -1)
136 3d1b16d1 2023-07-08 jrick return got_error_from_errno("asprintf");
137 3d1b16d1 2023-07-08 jrick if (got_path_is_child(canonpath, path_got, strlen(path_got)))
138 3d1b16d1 2023-07-08 jrick *is_bad_symlink = 1;
140 3d1b16d1 2023-07-08 jrick free(path_got);
141 3d1b16d1 2023-07-08 jrick return NULL;
145 3d1b16d1 2023-07-08 jrick * Upgrade STATUS_MODIFY to STATUS_CONFLICT if a
146 3d1b16d1 2023-07-08 jrick * conflict marker is found in newly added lines only.
148 3d1b16d1 2023-07-08 jrick static const struct got_error *
149 3d1b16d1 2023-07-08 jrick get_modified_file_content_status(unsigned char *status,
150 3d1b16d1 2023-07-08 jrick struct got_blob_object *blob, const char *path, struct stat *sb,
151 3d1b16d1 2023-07-08 jrick FILE *ondisk_file)
153 3d1b16d1 2023-07-08 jrick const struct got_error *err, *free_err;
154 3d1b16d1 2023-07-08 jrick const char *markers[3] = {
155 3d1b16d1 2023-07-08 jrick GOT_DIFF_CONFLICT_MARKER_BEGIN,
156 3d1b16d1 2023-07-08 jrick GOT_DIFF_CONFLICT_MARKER_SEP,
157 3d1b16d1 2023-07-08 jrick GOT_DIFF_CONFLICT_MARKER_END
159 3d1b16d1 2023-07-08 jrick FILE *f1 = NULL;
160 3d1b16d1 2023-07-08 jrick struct got_diffreg_result *diffreg_result = NULL;
161 3d1b16d1 2023-07-08 jrick struct diff_result *r;
162 3d1b16d1 2023-07-08 jrick int nchunks_parsed, n, i = 0, ln = 0;
163 3d1b16d1 2023-07-08 jrick char *line = NULL;
164 3d1b16d1 2023-07-08 jrick size_t linesize = 0;
165 3d1b16d1 2023-07-08 jrick ssize_t linelen;
167 3d1b16d1 2023-07-08 jrick if (*status != GOT_STATUS_MODIFY)
168 3d1b16d1 2023-07-08 jrick return NULL;
170 3d1b16d1 2023-07-08 jrick f1 = got_opentemp();
171 3d1b16d1 2023-07-08 jrick if (f1 == NULL)
172 3d1b16d1 2023-07-08 jrick return got_error_from_errno("got_opentemp");
174 3d1b16d1 2023-07-08 jrick if (blob) {
175 3d1b16d1 2023-07-08 jrick got_object_blob_rewind(blob);
176 3d1b16d1 2023-07-08 jrick err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
178 3d1b16d1 2023-07-08 jrick goto done;
181 3d1b16d1 2023-07-08 jrick err = got_diff_files(&diffreg_result, f1, 1, NULL, ondisk_file,
182 3d1b16d1 2023-07-08 jrick 1, NULL, 0, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
184 3d1b16d1 2023-07-08 jrick goto done;
186 3d1b16d1 2023-07-08 jrick r = diffreg_result->result;
188 3d1b16d1 2023-07-08 jrick for (n = 0; n < r->chunks.len; n += nchunks_parsed) {
189 3d1b16d1 2023-07-08 jrick struct diff_chunk *c;
190 3d1b16d1 2023-07-08 jrick struct diff_chunk_context cc = {};
191 3d1b16d1 2023-07-08 jrick off_t pos;
194 3d1b16d1 2023-07-08 jrick * We can optimise a little by advancing straight
195 3d1b16d1 2023-07-08 jrick * to the next chunk if this one has no added lines.
197 3d1b16d1 2023-07-08 jrick c = diff_chunk_get(r, n);
199 3d1b16d1 2023-07-08 jrick if (diff_chunk_type(c) != CHUNK_PLUS) {
200 3d1b16d1 2023-07-08 jrick nchunks_parsed = 1;
201 3d1b16d1 2023-07-08 jrick continue; /* removed or unchanged lines */
204 3d1b16d1 2023-07-08 jrick pos = diff_chunk_get_right_start_pos(c);
205 3d1b16d1 2023-07-08 jrick if (fseek(ondisk_file, pos, SEEK_SET) == -1) {
206 3d1b16d1 2023-07-08 jrick err = got_ferror(ondisk_file, GOT_ERR_IO);
207 3d1b16d1 2023-07-08 jrick goto done;
210 3d1b16d1 2023-07-08 jrick diff_chunk_context_load_change(&cc, &nchunks_parsed, r, n, 0);
211 3d1b16d1 2023-07-08 jrick ln = cc.right.start;
213 3d1b16d1 2023-07-08 jrick while (ln < cc.right.end) {
214 3d1b16d1 2023-07-08 jrick linelen = getline(&line, &linesize, ondisk_file);
215 3d1b16d1 2023-07-08 jrick if (linelen == -1) {
216 3d1b16d1 2023-07-08 jrick if (feof(ondisk_file))
218 3d1b16d1 2023-07-08 jrick err = got_ferror(ondisk_file, GOT_ERR_IO);
222 3d1b16d1 2023-07-08 jrick if (line && strncmp(line, markers[i],
223 3d1b16d1 2023-07-08 jrick strlen(markers[i])) == 0) {
224 3d1b16d1 2023-07-08 jrick if (strcmp(markers[i],
225 3d1b16d1 2023-07-08 jrick GOT_DIFF_CONFLICT_MARKER_END) == 0) {
226 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_CONFLICT;
227 3d1b16d1 2023-07-08 jrick goto done;
236 3d1b16d1 2023-07-08 jrick free(line);
237 3d1b16d1 2023-07-08 jrick if (f1 != NULL && fclose(f1) == EOF && err == NULL)
238 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("fclose");
239 3d1b16d1 2023-07-08 jrick free_err = got_diffreg_result_free(diffreg_result);
240 3d1b16d1 2023-07-08 jrick if (err == NULL)
241 3d1b16d1 2023-07-08 jrick err = free_err;
243 3d1b16d1 2023-07-08 jrick return err;
246 3d1b16d1 2023-07-08 jrick static int
247 3d1b16d1 2023-07-08 jrick xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
249 3d1b16d1 2023-07-08 jrick mode_t ie_mode = got_fileindex_perms_to_st(ie);
250 3d1b16d1 2023-07-08 jrick return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
253 3d1b16d1 2023-07-08 jrick static int
254 3d1b16d1 2023-07-08 jrick stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
256 3d1b16d1 2023-07-08 jrick return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
257 3d1b16d1 2023-07-08 jrick ie->ctime_nsec == sb->st_ctim.tv_nsec &&
258 3d1b16d1 2023-07-08 jrick ie->mtime_sec == sb->st_mtim.tv_sec &&
259 3d1b16d1 2023-07-08 jrick ie->mtime_nsec == sb->st_mtim.tv_nsec &&
260 3d1b16d1 2023-07-08 jrick ie->size == (sb->st_size & 0xffffffff) &&
261 3d1b16d1 2023-07-08 jrick !xbit_differs(ie, sb->st_mode));
264 3d1b16d1 2023-07-08 jrick static unsigned char
265 3d1b16d1 2023-07-08 jrick get_staged_status(struct got_fileindex_entry *ie)
267 3d1b16d1 2023-07-08 jrick switch (got_fileindex_entry_stage_get(ie)) {
268 3d1b16d1 2023-07-08 jrick case GOT_FILEIDX_STAGE_ADD:
269 3d1b16d1 2023-07-08 jrick return GOT_STATUS_ADD;
270 3d1b16d1 2023-07-08 jrick case GOT_FILEIDX_STAGE_DELETE:
271 3d1b16d1 2023-07-08 jrick return GOT_STATUS_DELETE;
272 3d1b16d1 2023-07-08 jrick case GOT_FILEIDX_STAGE_MODIFY:
273 3d1b16d1 2023-07-08 jrick return GOT_STATUS_MODIFY;
275 3d1b16d1 2023-07-08 jrick return GOT_STATUS_NO_CHANGE;
279 3d1b16d1 2023-07-08 jrick static const struct got_error *
280 3d1b16d1 2023-07-08 jrick get_symlink_modification_status(unsigned char *status,
281 3d1b16d1 2023-07-08 jrick struct got_fileindex_entry *ie, const char *abspath,
282 3d1b16d1 2023-07-08 jrick int dirfd, const char *de_name, struct got_blob_object *blob)
284 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
285 3d1b16d1 2023-07-08 jrick char target_path[PATH_MAX];
286 3d1b16d1 2023-07-08 jrick char etarget[PATH_MAX];
287 3d1b16d1 2023-07-08 jrick ssize_t elen;
288 3d1b16d1 2023-07-08 jrick size_t len, target_len = 0;
289 3d1b16d1 2023-07-08 jrick const uint8_t *buf = got_object_blob_get_read_buf(blob);
290 3d1b16d1 2023-07-08 jrick size_t hdrlen = got_object_blob_get_hdrlen(blob);
292 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_NO_CHANGE;
294 3d1b16d1 2023-07-08 jrick /* Blob object content specifies the target path of the link. */
296 3d1b16d1 2023-07-08 jrick err = got_object_blob_read_block(&len, blob);
298 3d1b16d1 2023-07-08 jrick return err;
299 3d1b16d1 2023-07-08 jrick if (len + target_len >= sizeof(target_path)) {
301 3d1b16d1 2023-07-08 jrick * Should not happen. The blob contents were OK
302 3d1b16d1 2023-07-08 jrick * when this symlink was installed.
304 3d1b16d1 2023-07-08 jrick return got_error(GOT_ERR_NO_SPACE);
306 3d1b16d1 2023-07-08 jrick if (len > 0) {
307 3d1b16d1 2023-07-08 jrick /* Skip blob object header first time around. */
308 3d1b16d1 2023-07-08 jrick memcpy(target_path + target_len, buf + hdrlen,
309 3d1b16d1 2023-07-08 jrick len - hdrlen);
310 3d1b16d1 2023-07-08 jrick target_len += len - hdrlen;
311 3d1b16d1 2023-07-08 jrick hdrlen = 0;
313 3d1b16d1 2023-07-08 jrick } while (len != 0);
314 3d1b16d1 2023-07-08 jrick target_path[target_len] = '\0';
316 3d1b16d1 2023-07-08 jrick if (dirfd != -1) {
317 3d1b16d1 2023-07-08 jrick elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
318 3d1b16d1 2023-07-08 jrick if (elen == -1)
319 3d1b16d1 2023-07-08 jrick return got_error_from_errno2("readlinkat", abspath);
321 3d1b16d1 2023-07-08 jrick elen = readlink(abspath, etarget, sizeof(etarget));
322 3d1b16d1 2023-07-08 jrick if (elen == -1)
323 3d1b16d1 2023-07-08 jrick return got_error_from_errno2("readlink", abspath);
326 3d1b16d1 2023-07-08 jrick if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
327 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_MODIFY;
329 3d1b16d1 2023-07-08 jrick return NULL;
332 3d1b16d1 2023-07-08 jrick static const struct got_error *
333 3d1b16d1 2023-07-08 jrick get_file_status(unsigned char *status, struct stat *sb,
334 3d1b16d1 2023-07-08 jrick struct got_fileindex_entry *ie, const char *abspath,
335 3d1b16d1 2023-07-08 jrick int dirfd, const char *de_name, struct got_repository *repo)
337 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
338 3d1b16d1 2023-07-08 jrick struct got_object_id id;
339 3d1b16d1 2023-07-08 jrick size_t hdrlen;
340 3d1b16d1 2023-07-08 jrick int fd = -1, fd1 = -1;
341 3d1b16d1 2023-07-08 jrick FILE *f = NULL;
342 3d1b16d1 2023-07-08 jrick uint8_t fbuf[8192];
343 3d1b16d1 2023-07-08 jrick struct got_blob_object *blob = NULL;
344 3d1b16d1 2023-07-08 jrick size_t flen, blen;
345 3d1b16d1 2023-07-08 jrick unsigned char staged_status;
347 3d1b16d1 2023-07-08 jrick staged_status = get_staged_status(ie);
348 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_NO_CHANGE;
349 3d1b16d1 2023-07-08 jrick memset(sb, 0, sizeof(*sb));
352 3d1b16d1 2023-07-08 jrick * Whenever the caller provides a directory descriptor and a
353 3d1b16d1 2023-07-08 jrick * directory entry name for the file, use them! This prevents
354 3d1b16d1 2023-07-08 jrick * race conditions if filesystem paths change beneath our feet.
356 3d1b16d1 2023-07-08 jrick if (dirfd != -1) {
357 3d1b16d1 2023-07-08 jrick if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
358 3d1b16d1 2023-07-08 jrick if (errno == ENOENT) {
359 3d1b16d1 2023-07-08 jrick if (got_fileindex_entry_has_file_on_disk(ie))
360 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_MISSING;
362 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_DELETE;
363 3d1b16d1 2023-07-08 jrick goto done;
365 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("fstatat", abspath);
366 3d1b16d1 2023-07-08 jrick goto done;
369 3d1b16d1 2023-07-08 jrick fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
370 3d1b16d1 2023-07-08 jrick if (fd == -1 && errno != ENOENT &&
371 3d1b16d1 2023-07-08 jrick !got_err_open_nofollow_on_symlink())
372 3d1b16d1 2023-07-08 jrick return got_error_from_errno2("open", abspath);
373 3d1b16d1 2023-07-08 jrick else if (fd == -1 && got_err_open_nofollow_on_symlink()) {
374 3d1b16d1 2023-07-08 jrick if (lstat(abspath, sb) == -1)
375 3d1b16d1 2023-07-08 jrick return got_error_from_errno2("lstat", abspath);
376 3d1b16d1 2023-07-08 jrick } else if (fd == -1 || fstat(fd, sb) == -1) {
377 3d1b16d1 2023-07-08 jrick if (errno == ENOENT) {
378 3d1b16d1 2023-07-08 jrick if (got_fileindex_entry_has_file_on_disk(ie))
379 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_MISSING;
381 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_DELETE;
382 3d1b16d1 2023-07-08 jrick goto done;
384 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("fstat", abspath);
385 3d1b16d1 2023-07-08 jrick goto done;
389 3d1b16d1 2023-07-08 jrick if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
390 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_OBSTRUCTED;
391 3d1b16d1 2023-07-08 jrick goto done;
394 3d1b16d1 2023-07-08 jrick if (!got_fileindex_entry_has_file_on_disk(ie)) {
395 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_DELETE;
396 3d1b16d1 2023-07-08 jrick goto done;
397 3d1b16d1 2023-07-08 jrick } else if (!got_fileindex_entry_has_blob(ie) &&
398 3d1b16d1 2023-07-08 jrick staged_status != GOT_STATUS_ADD) {
399 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_ADD;
400 3d1b16d1 2023-07-08 jrick goto done;
403 3d1b16d1 2023-07-08 jrick if (!stat_info_differs(ie, sb))
404 3d1b16d1 2023-07-08 jrick goto done;
406 3d1b16d1 2023-07-08 jrick if (S_ISLNK(sb->st_mode) &&
407 3d1b16d1 2023-07-08 jrick got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
408 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_MODIFY;
409 3d1b16d1 2023-07-08 jrick goto done;
412 3d1b16d1 2023-07-08 jrick if (staged_status == GOT_STATUS_MODIFY ||
413 3d1b16d1 2023-07-08 jrick staged_status == GOT_STATUS_ADD)
414 3d1b16d1 2023-07-08 jrick got_fileindex_entry_get_staged_blob_id(&id, ie);
416 3d1b16d1 2023-07-08 jrick got_fileindex_entry_get_blob_id(&id, ie);
418 3d1b16d1 2023-07-08 jrick fd1 = got_opentempfd();
419 3d1b16d1 2023-07-08 jrick if (fd1 == -1) {
420 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
421 3d1b16d1 2023-07-08 jrick goto done;
423 3d1b16d1 2023-07-08 jrick err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf), fd1);
425 3d1b16d1 2023-07-08 jrick goto done;
427 3d1b16d1 2023-07-08 jrick if (S_ISLNK(sb->st_mode)) {
428 3d1b16d1 2023-07-08 jrick err = get_symlink_modification_status(status, ie,
429 3d1b16d1 2023-07-08 jrick abspath, dirfd, de_name, blob);
430 3d1b16d1 2023-07-08 jrick goto done;
433 3d1b16d1 2023-07-08 jrick if (dirfd != -1) {
434 3d1b16d1 2023-07-08 jrick fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
435 3d1b16d1 2023-07-08 jrick if (fd == -1) {
436 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("openat", abspath);
437 3d1b16d1 2023-07-08 jrick goto done;
441 3d1b16d1 2023-07-08 jrick f = fdopen(fd, "r");
442 3d1b16d1 2023-07-08 jrick if (f == NULL) {
443 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("fdopen", abspath);
444 3d1b16d1 2023-07-08 jrick goto done;
447 3d1b16d1 2023-07-08 jrick hdrlen = got_object_blob_get_hdrlen(blob);
448 3d1b16d1 2023-07-08 jrick for (;;) {
449 3d1b16d1 2023-07-08 jrick const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
450 3d1b16d1 2023-07-08 jrick err = got_object_blob_read_block(&blen, blob);
452 3d1b16d1 2023-07-08 jrick goto done;
453 3d1b16d1 2023-07-08 jrick /* Skip length of blob object header first time around. */
454 3d1b16d1 2023-07-08 jrick flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
455 3d1b16d1 2023-07-08 jrick if (flen == 0 && ferror(f)) {
456 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("fread");
457 3d1b16d1 2023-07-08 jrick goto done;
459 3d1b16d1 2023-07-08 jrick if (blen - hdrlen == 0) {
460 3d1b16d1 2023-07-08 jrick if (flen != 0)
461 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_MODIFY;
463 3d1b16d1 2023-07-08 jrick } else if (flen == 0) {
464 3d1b16d1 2023-07-08 jrick if (blen - hdrlen != 0)
465 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_MODIFY;
467 3d1b16d1 2023-07-08 jrick } else if (blen - hdrlen == flen) {
468 3d1b16d1 2023-07-08 jrick /* Skip blob object header first time around. */
469 3d1b16d1 2023-07-08 jrick if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
470 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_MODIFY;
474 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_MODIFY;
477 3d1b16d1 2023-07-08 jrick hdrlen = 0;
480 3d1b16d1 2023-07-08 jrick if (*status == GOT_STATUS_MODIFY) {
481 3d1b16d1 2023-07-08 jrick rewind(f);
482 3d1b16d1 2023-07-08 jrick err = get_modified_file_content_status(status, blob, ie->path,
484 3d1b16d1 2023-07-08 jrick } else if (xbit_differs(ie, sb->st_mode))
485 3d1b16d1 2023-07-08 jrick *status = GOT_STATUS_MODE_CHANGE;
487 3d1b16d1 2023-07-08 jrick if (fd1 != -1 && close(fd1) == -1 && err == NULL)
488 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("close");
490 3d1b16d1 2023-07-08 jrick got_object_blob_close(blob);
491 3d1b16d1 2023-07-08 jrick if (f != NULL && fclose(f) == EOF && err == NULL)
492 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("fclose", abspath);
493 3d1b16d1 2023-07-08 jrick if (fd != -1 && close(fd) == -1 && err == NULL)
494 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("close", abspath);
495 3d1b16d1 2023-07-08 jrick return err;
498 3d1b16d1 2023-07-08 jrick static const struct got_error *
499 3d1b16d1 2023-07-08 jrick get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
501 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
502 3d1b16d1 2023-07-08 jrick char *uuidstr = NULL;
504 3d1b16d1 2023-07-08 jrick *refname = NULL;
506 3d1b16d1 2023-07-08 jrick err = got_worktree_get_uuid(&uuidstr, worktree);
508 3d1b16d1 2023-07-08 jrick return err;
510 3d1b16d1 2023-07-08 jrick if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
511 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("asprintf");
512 3d1b16d1 2023-07-08 jrick *refname = NULL;
514 3d1b16d1 2023-07-08 jrick free(uuidstr);
515 3d1b16d1 2023-07-08 jrick return err;
518 3d1b16d1 2023-07-08 jrick static const struct got_error *
519 3d1b16d1 2023-07-08 jrick get_base_ref_name(char **refname, struct got_worktree *worktree)
521 3d1b16d1 2023-07-08 jrick return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
525 3d1b16d1 2023-07-08 jrick * Prevent Git's garbage collector from deleting our base commit by
526 3d1b16d1 2023-07-08 jrick * setting a reference to our base commit's ID.
528 3d1b16d1 2023-07-08 jrick static const struct got_error *
529 3d1b16d1 2023-07-08 jrick ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
531 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
532 3d1b16d1 2023-07-08 jrick struct got_reference *ref = NULL;
533 3d1b16d1 2023-07-08 jrick char *refname;
535 3d1b16d1 2023-07-08 jrick err = get_base_ref_name(&refname, worktree);
537 3d1b16d1 2023-07-08 jrick return err;
539 3d1b16d1 2023-07-08 jrick err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
541 3d1b16d1 2023-07-08 jrick goto done;
543 3d1b16d1 2023-07-08 jrick err = got_ref_write(ref, repo);
545 3d1b16d1 2023-07-08 jrick free(refname);
547 3d1b16d1 2023-07-08 jrick got_ref_close(ref);
548 3d1b16d1 2023-07-08 jrick return err;
551 3d1b16d1 2023-07-08 jrick static const struct got_error *
552 3d1b16d1 2023-07-08 jrick get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
554 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
556 3d1b16d1 2023-07-08 jrick if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
557 3d1b16d1 2023-07-08 jrick GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
558 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("asprintf");
559 3d1b16d1 2023-07-08 jrick *fileindex_path = NULL;
561 3d1b16d1 2023-07-08 jrick return err;
564 3d1b16d1 2023-07-08 jrick static const struct got_error *
565 3d1b16d1 2023-07-08 jrick open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
566 3d1b16d1 2023-07-08 jrick struct got_worktree *worktree)
568 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
569 3d1b16d1 2023-07-08 jrick FILE *index = NULL;
571 3d1b16d1 2023-07-08 jrick *fileindex_path = NULL;
572 3d1b16d1 2023-07-08 jrick *fileindex = got_fileindex_alloc();
573 3d1b16d1 2023-07-08 jrick if (*fileindex == NULL)
574 3d1b16d1 2023-07-08 jrick return got_error_from_errno("got_fileindex_alloc");
576 3d1b16d1 2023-07-08 jrick err = get_fileindex_path(fileindex_path, worktree);
578 3d1b16d1 2023-07-08 jrick goto done;
580 3d1b16d1 2023-07-08 jrick index = fopen(*fileindex_path, "rbe");
581 3d1b16d1 2023-07-08 jrick if (index == NULL) {
582 3d1b16d1 2023-07-08 jrick if (errno != ENOENT)
583 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("fopen", *fileindex_path);
585 3d1b16d1 2023-07-08 jrick err = got_fileindex_read(*fileindex, index);
586 3d1b16d1 2023-07-08 jrick if (fclose(index) == EOF && err == NULL)
587 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("fclose");
590 3d1b16d1 2023-07-08 jrick if (err) {
591 3d1b16d1 2023-07-08 jrick free(*fileindex_path);
592 3d1b16d1 2023-07-08 jrick *fileindex_path = NULL;
593 3d1b16d1 2023-07-08 jrick got_fileindex_free(*fileindex);
594 3d1b16d1 2023-07-08 jrick *fileindex = NULL;
596 3d1b16d1 2023-07-08 jrick return err;
599 3d1b16d1 2023-07-08 jrick static const struct got_error *
600 3d1b16d1 2023-07-08 jrick sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
602 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
603 3d1b16d1 2023-07-08 jrick char *new_fileindex_path = NULL;
604 3d1b16d1 2023-07-08 jrick FILE *new_index = NULL;
605 3d1b16d1 2023-07-08 jrick struct timespec timeout;
607 3d1b16d1 2023-07-08 jrick err = got_opentemp_named(&new_fileindex_path, &new_index,
608 3d1b16d1 2023-07-08 jrick fileindex_path, "");
610 3d1b16d1 2023-07-08 jrick goto done;
612 3d1b16d1 2023-07-08 jrick err = got_fileindex_write(fileindex, new_index);
614 3d1b16d1 2023-07-08 jrick goto done;
616 3d1b16d1 2023-07-08 jrick if (rename(new_fileindex_path, fileindex_path) != 0) {
617 3d1b16d1 2023-07-08 jrick err = got_error_from_errno3("rename", new_fileindex_path,
618 3d1b16d1 2023-07-08 jrick fileindex_path);
619 3d1b16d1 2023-07-08 jrick unlink(new_fileindex_path);
623 3d1b16d1 2023-07-08 jrick * Sleep for a short amount of time to ensure that files modified after
624 3d1b16d1 2023-07-08 jrick * this program exits have a different time stamp from the one which
625 3d1b16d1 2023-07-08 jrick * was recorded in the file index.
627 3d1b16d1 2023-07-08 jrick timeout.tv_sec = 0;
628 3d1b16d1 2023-07-08 jrick timeout.tv_nsec = 1;
629 3d1b16d1 2023-07-08 jrick nanosleep(&timeout, NULL);
631 3d1b16d1 2023-07-08 jrick if (new_index)
632 3d1b16d1 2023-07-08 jrick fclose(new_index);
633 3d1b16d1 2023-07-08 jrick free(new_fileindex_path);
634 3d1b16d1 2023-07-08 jrick return err;
637 3d1b16d1 2023-07-08 jrick struct diff_dir_cb_arg {
638 3d1b16d1 2023-07-08 jrick struct got_fileindex *fileindex;
639 3d1b16d1 2023-07-08 jrick struct got_worktree *worktree;
640 3d1b16d1 2023-07-08 jrick const char *status_path;
641 3d1b16d1 2023-07-08 jrick size_t status_path_len;
642 3d1b16d1 2023-07-08 jrick struct got_repository *repo;
643 3d1b16d1 2023-07-08 jrick got_worktree_status_cb status_cb;
644 3d1b16d1 2023-07-08 jrick void *status_arg;
645 3d1b16d1 2023-07-08 jrick got_cancel_cb cancel_cb;
646 3d1b16d1 2023-07-08 jrick void *cancel_arg;
647 3d1b16d1 2023-07-08 jrick /* A pathlist containing per-directory pathlists of ignore patterns. */
648 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *ignores;
649 3d1b16d1 2023-07-08 jrick int report_unchanged;
650 3d1b16d1 2023-07-08 jrick int no_ignores;
653 3d1b16d1 2023-07-08 jrick static const struct got_error *
654 3d1b16d1 2023-07-08 jrick report_file_status(struct got_fileindex_entry *ie, const char *abspath,
655 3d1b16d1 2023-07-08 jrick int dirfd, const char *de_name,
656 3d1b16d1 2023-07-08 jrick got_worktree_status_cb status_cb, void *status_arg,
657 3d1b16d1 2023-07-08 jrick struct got_repository *repo, int report_unchanged)
659 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
660 3d1b16d1 2023-07-08 jrick unsigned char status = GOT_STATUS_NO_CHANGE;
661 3d1b16d1 2023-07-08 jrick unsigned char staged_status;
662 3d1b16d1 2023-07-08 jrick struct stat sb;
663 3d1b16d1 2023-07-08 jrick struct got_object_id blob_id, commit_id, staged_blob_id;
664 3d1b16d1 2023-07-08 jrick struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
665 3d1b16d1 2023-07-08 jrick struct got_object_id *staged_blob_idp = NULL;
667 3d1b16d1 2023-07-08 jrick staged_status = get_staged_status(ie);
668 3d1b16d1 2023-07-08 jrick err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
670 3d1b16d1 2023-07-08 jrick return err;
672 3d1b16d1 2023-07-08 jrick if (status == GOT_STATUS_NO_CHANGE &&
673 3d1b16d1 2023-07-08 jrick staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
674 3d1b16d1 2023-07-08 jrick return NULL;
676 3d1b16d1 2023-07-08 jrick if (got_fileindex_entry_has_blob(ie))
677 3d1b16d1 2023-07-08 jrick blob_idp = got_fileindex_entry_get_blob_id(&blob_id, ie);
678 3d1b16d1 2023-07-08 jrick if (got_fileindex_entry_has_commit(ie))
679 3d1b16d1 2023-07-08 jrick commit_idp = got_fileindex_entry_get_commit_id(&commit_id, ie);
680 3d1b16d1 2023-07-08 jrick if (staged_status == GOT_STATUS_ADD ||
681 3d1b16d1 2023-07-08 jrick staged_status == GOT_STATUS_MODIFY) {
682 3d1b16d1 2023-07-08 jrick staged_blob_idp = got_fileindex_entry_get_staged_blob_id(
683 3d1b16d1 2023-07-08 jrick &staged_blob_id, ie);
686 3d1b16d1 2023-07-08 jrick return (*status_cb)(status_arg, status, staged_status,
687 3d1b16d1 2023-07-08 jrick ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
690 3d1b16d1 2023-07-08 jrick static const struct got_error *
691 3d1b16d1 2023-07-08 jrick status_old_new(void *arg, struct got_fileindex_entry *ie,
692 3d1b16d1 2023-07-08 jrick struct dirent *de, const char *parent_path, int dirfd)
694 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
695 3d1b16d1 2023-07-08 jrick struct diff_dir_cb_arg *a = arg;
696 3d1b16d1 2023-07-08 jrick char *abspath;
698 f6b8c3c2 2023-07-24 stsp if (a->cancel_cb) {
699 f6b8c3c2 2023-07-24 stsp err = a->cancel_cb(a->cancel_arg);
701 f6b8c3c2 2023-07-24 stsp return err;
704 3d1b16d1 2023-07-08 jrick if (got_path_cmp(parent_path, a->status_path,
705 3d1b16d1 2023-07-08 jrick strlen(parent_path), a->status_path_len) != 0 &&
706 3d1b16d1 2023-07-08 jrick !got_path_is_child(parent_path, a->status_path, a->status_path_len))
707 3d1b16d1 2023-07-08 jrick return NULL;
709 3d1b16d1 2023-07-08 jrick if (parent_path[0]) {
710 3d1b16d1 2023-07-08 jrick if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
711 3d1b16d1 2023-07-08 jrick parent_path, de->d_name) == -1)
712 3d1b16d1 2023-07-08 jrick return got_error_from_errno("asprintf");
714 3d1b16d1 2023-07-08 jrick if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
715 3d1b16d1 2023-07-08 jrick de->d_name) == -1)
716 3d1b16d1 2023-07-08 jrick return got_error_from_errno("asprintf");
719 3d1b16d1 2023-07-08 jrick err = report_file_status(ie, abspath, dirfd, de->d_name,
720 3d1b16d1 2023-07-08 jrick a->status_cb, a->status_arg, a->repo, a->report_unchanged);
721 3d1b16d1 2023-07-08 jrick free(abspath);
722 3d1b16d1 2023-07-08 jrick return err;
725 3d1b16d1 2023-07-08 jrick static const struct got_error *
726 3d1b16d1 2023-07-08 jrick status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
728 f6b8c3c2 2023-07-24 stsp const struct got_error *err = NULL;
729 3d1b16d1 2023-07-08 jrick struct diff_dir_cb_arg *a = arg;
730 3d1b16d1 2023-07-08 jrick struct got_object_id blob_id, commit_id;
731 3d1b16d1 2023-07-08 jrick unsigned char status;
733 f6b8c3c2 2023-07-24 stsp if (a->cancel_cb) {
734 f6b8c3c2 2023-07-24 stsp err = a->cancel_cb(a->cancel_arg);
736 f6b8c3c2 2023-07-24 stsp return err;
739 3d1b16d1 2023-07-08 jrick if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
740 3d1b16d1 2023-07-08 jrick return NULL;
742 3d1b16d1 2023-07-08 jrick got_fileindex_entry_get_blob_id(&blob_id, ie);
743 3d1b16d1 2023-07-08 jrick got_fileindex_entry_get_commit_id(&commit_id, ie);
744 3d1b16d1 2023-07-08 jrick if (got_fileindex_entry_has_file_on_disk(ie))
745 3d1b16d1 2023-07-08 jrick status = GOT_STATUS_MISSING;
747 3d1b16d1 2023-07-08 jrick status = GOT_STATUS_DELETE;
748 3d1b16d1 2023-07-08 jrick return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
749 3d1b16d1 2023-07-08 jrick ie->path, &blob_id, NULL, &commit_id, -1, NULL);
752 3d1b16d1 2023-07-08 jrick static void
753 3d1b16d1 2023-07-08 jrick free_ignores(struct got_pathlist_head *ignores)
755 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *pe;
757 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pe, ignores, entry) {
758 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *ignorelist = pe->data;
760 3d1b16d1 2023-07-08 jrick got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
762 3d1b16d1 2023-07-08 jrick got_pathlist_free(ignores, GOT_PATHLIST_FREE_PATH);
765 3d1b16d1 2023-07-08 jrick static const struct got_error *
766 3d1b16d1 2023-07-08 jrick read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
768 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
769 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *pe = NULL;
770 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *ignorelist;
771 3d1b16d1 2023-07-08 jrick char *line = NULL, *pattern, *dirpath = NULL;
772 3d1b16d1 2023-07-08 jrick size_t linesize = 0;
773 3d1b16d1 2023-07-08 jrick ssize_t linelen;
775 3d1b16d1 2023-07-08 jrick ignorelist = calloc(1, sizeof(*ignorelist));
776 3d1b16d1 2023-07-08 jrick if (ignorelist == NULL)
777 3d1b16d1 2023-07-08 jrick return got_error_from_errno("calloc");
778 3d1b16d1 2023-07-08 jrick TAILQ_INIT(ignorelist);
780 3d1b16d1 2023-07-08 jrick while ((linelen = getline(&line, &linesize, f)) != -1) {
781 3d1b16d1 2023-07-08 jrick if (linelen > 0 && line[linelen - 1] == '\n')
782 3d1b16d1 2023-07-08 jrick line[linelen - 1] = '\0';
784 3d1b16d1 2023-07-08 jrick /* Git's ignores may contain comments. */
785 3d1b16d1 2023-07-08 jrick if (line[0] == '#')
788 3d1b16d1 2023-07-08 jrick /* Git's negated patterns are not (yet?) supported. */
789 3d1b16d1 2023-07-08 jrick if (line[0] == '!')
792 3d1b16d1 2023-07-08 jrick if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
793 3d1b16d1 2023-07-08 jrick line) == -1) {
794 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("asprintf");
795 3d1b16d1 2023-07-08 jrick goto done;
797 3d1b16d1 2023-07-08 jrick err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
799 3d1b16d1 2023-07-08 jrick goto done;
801 3d1b16d1 2023-07-08 jrick if (ferror(f)) {
802 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("getline");
803 3d1b16d1 2023-07-08 jrick goto done;
806 3d1b16d1 2023-07-08 jrick dirpath = strdup(path);
807 3d1b16d1 2023-07-08 jrick if (dirpath == NULL) {
808 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("strdup");
809 3d1b16d1 2023-07-08 jrick goto done;
811 3d1b16d1 2023-07-08 jrick err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
813 3d1b16d1 2023-07-08 jrick free(line);
814 3d1b16d1 2023-07-08 jrick if (err || pe == NULL) {
815 3d1b16d1 2023-07-08 jrick free(dirpath);
816 3d1b16d1 2023-07-08 jrick got_pathlist_free(ignorelist, GOT_PATHLIST_FREE_PATH);
818 3d1b16d1 2023-07-08 jrick return err;
821 3d1b16d1 2023-07-08 jrick static int
822 3d1b16d1 2023-07-08 jrick match_path(const char *pattern, size_t pattern_len, const char *path,
823 3d1b16d1 2023-07-08 jrick int flags)
825 3d1b16d1 2023-07-08 jrick char buf[PATH_MAX];
828 3d1b16d1 2023-07-08 jrick * Trailing slashes signify directories.
829 3d1b16d1 2023-07-08 jrick * Append a * to make such patterns conform to fnmatch rules.
831 3d1b16d1 2023-07-08 jrick if (pattern_len > 0 && pattern[pattern_len - 1] == '/') {
832 3d1b16d1 2023-07-08 jrick if (snprintf(buf, sizeof(buf), "%s*", pattern) >= sizeof(buf))
833 3d1b16d1 2023-07-08 jrick return FNM_NOMATCH; /* XXX */
835 3d1b16d1 2023-07-08 jrick return fnmatch(buf, path, flags);
838 3d1b16d1 2023-07-08 jrick return fnmatch(pattern, path, flags);
841 3d1b16d1 2023-07-08 jrick static int
842 3d1b16d1 2023-07-08 jrick match_ignores(struct got_pathlist_head *ignores, const char *path)
844 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *pe;
846 3d1b16d1 2023-07-08 jrick /* Handle patterns which match in all directories. */
847 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pe, ignores, entry) {
848 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *ignorelist = pe->data;
849 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *pi;
851 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pi, ignorelist, entry) {
852 3d1b16d1 2023-07-08 jrick const char *p;
854 3d1b16d1 2023-07-08 jrick if (pi->path_len < 3 ||
855 3d1b16d1 2023-07-08 jrick strncmp(pi->path, "**/", 3) != 0)
858 3d1b16d1 2023-07-08 jrick while (*p) {
859 3d1b16d1 2023-07-08 jrick if (match_path(pi->path + 3,
860 3d1b16d1 2023-07-08 jrick pi->path_len - 3, p,
861 3d1b16d1 2023-07-08 jrick FNM_PATHNAME | FNM_LEADING_DIR)) {
862 3d1b16d1 2023-07-08 jrick /* Retry in next directory. */
863 3d1b16d1 2023-07-08 jrick while (*p && *p != '/')
865 3d1b16d1 2023-07-08 jrick while (*p == '/')
875 3d1b16d1 2023-07-08 jrick * The ignores pathlist contains ignore lists from children before
876 3d1b16d1 2023-07-08 jrick * parents, so we can find the most specific ignorelist by walking
877 3d1b16d1 2023-07-08 jrick * ignores backwards.
879 3d1b16d1 2023-07-08 jrick pe = TAILQ_LAST(ignores, got_pathlist_head);
880 3d1b16d1 2023-07-08 jrick while (pe) {
881 3d1b16d1 2023-07-08 jrick if (got_path_is_child(path, pe->path, pe->path_len)) {
882 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *ignorelist = pe->data;
883 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *pi;
884 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pi, ignorelist, entry) {
885 3d1b16d1 2023-07-08 jrick int flags = FNM_LEADING_DIR;
886 3d1b16d1 2023-07-08 jrick if (strstr(pi->path, "/**/") == NULL)
887 3d1b16d1 2023-07-08 jrick flags |= FNM_PATHNAME;
888 3d1b16d1 2023-07-08 jrick if (match_path(pi->path, pi->path_len,
889 3d1b16d1 2023-07-08 jrick path, flags))
894 3d1b16d1 2023-07-08 jrick pe = TAILQ_PREV(pe, got_pathlist_head, entry);
900 3d1b16d1 2023-07-08 jrick static const struct got_error *
901 3d1b16d1 2023-07-08 jrick add_ignores(struct got_pathlist_head *ignores, const char *root_path,
902 3d1b16d1 2023-07-08 jrick const char *path, int dirfd, const char *ignores_filename)
904 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
905 3d1b16d1 2023-07-08 jrick char *ignorespath;
906 3d1b16d1 2023-07-08 jrick int fd = -1;
907 3d1b16d1 2023-07-08 jrick FILE *ignoresfile = NULL;
909 3d1b16d1 2023-07-08 jrick if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
910 3d1b16d1 2023-07-08 jrick path[0] ? "/" : "", ignores_filename) == -1)
911 3d1b16d1 2023-07-08 jrick return got_error_from_errno("asprintf");
913 3d1b16d1 2023-07-08 jrick if (dirfd != -1) {
914 3d1b16d1 2023-07-08 jrick fd = openat(dirfd, ignores_filename,
915 3d1b16d1 2023-07-08 jrick O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
916 3d1b16d1 2023-07-08 jrick if (fd == -1) {
917 3d1b16d1 2023-07-08 jrick if (errno != ENOENT && errno != EACCES)
918 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("openat",
919 3d1b16d1 2023-07-08 jrick ignorespath);
921 3d1b16d1 2023-07-08 jrick ignoresfile = fdopen(fd, "r");
922 3d1b16d1 2023-07-08 jrick if (ignoresfile == NULL)
923 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("fdopen",
924 3d1b16d1 2023-07-08 jrick ignorespath);
927 3d1b16d1 2023-07-08 jrick err = read_ignores(ignores, path, ignoresfile);
931 3d1b16d1 2023-07-08 jrick ignoresfile = fopen(ignorespath, "re");
932 3d1b16d1 2023-07-08 jrick if (ignoresfile == NULL) {
933 3d1b16d1 2023-07-08 jrick if (errno != ENOENT && errno != EACCES)
934 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("fopen",
935 3d1b16d1 2023-07-08 jrick ignorespath);
937 3d1b16d1 2023-07-08 jrick err = read_ignores(ignores, path, ignoresfile);
940 3d1b16d1 2023-07-08 jrick if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
941 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("fclose", path);
942 3d1b16d1 2023-07-08 jrick if (fd != -1 && close(fd) == -1 && err == NULL)
943 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("close", path);
944 3d1b16d1 2023-07-08 jrick free(ignorespath);
945 3d1b16d1 2023-07-08 jrick return err;
948 3d1b16d1 2023-07-08 jrick static const struct got_error *
949 3d1b16d1 2023-07-08 jrick status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
950 3d1b16d1 2023-07-08 jrick int dirfd)
952 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
953 3d1b16d1 2023-07-08 jrick struct diff_dir_cb_arg *a = arg;
954 3d1b16d1 2023-07-08 jrick char *path = NULL;
956 3d1b16d1 2023-07-08 jrick if (ignore != NULL)
957 3d1b16d1 2023-07-08 jrick *ignore = 0;
959 f6b8c3c2 2023-07-24 stsp if (a->cancel_cb) {
960 f6b8c3c2 2023-07-24 stsp err = a->cancel_cb(a->cancel_arg);
962 f6b8c3c2 2023-07-24 stsp return err;
965 3d1b16d1 2023-07-08 jrick if (parent_path[0]) {
966 3d1b16d1 2023-07-08 jrick if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
967 3d1b16d1 2023-07-08 jrick return got_error_from_errno("asprintf");
969 3d1b16d1 2023-07-08 jrick path = de->d_name;
972 3d1b16d1 2023-07-08 jrick if (de->d_type == DT_DIR) {
973 3d1b16d1 2023-07-08 jrick if (!a->no_ignores && ignore != NULL &&
974 3d1b16d1 2023-07-08 jrick match_ignores(a->ignores, path))
975 3d1b16d1 2023-07-08 jrick *ignore = 1;
976 3d1b16d1 2023-07-08 jrick } else if (!match_ignores(a->ignores, path) &&
977 3d1b16d1 2023-07-08 jrick got_path_is_child(path, a->status_path, a->status_path_len))
978 3d1b16d1 2023-07-08 jrick err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
979 3d1b16d1 2023-07-08 jrick GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
980 3d1b16d1 2023-07-08 jrick if (parent_path[0])
981 3d1b16d1 2023-07-08 jrick free(path);
982 3d1b16d1 2023-07-08 jrick return err;
985 3d1b16d1 2023-07-08 jrick static const struct got_error *
986 3d1b16d1 2023-07-08 jrick status_traverse(void *arg, const char *path, int dirfd)
988 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
989 3d1b16d1 2023-07-08 jrick struct diff_dir_cb_arg *a = arg;
991 3d1b16d1 2023-07-08 jrick if (a->no_ignores)
992 3d1b16d1 2023-07-08 jrick return NULL;
994 3d1b16d1 2023-07-08 jrick err = add_ignores(a->ignores, a->worktree->root_path,
995 3d1b16d1 2023-07-08 jrick path, dirfd, ".cvsignore");
997 3d1b16d1 2023-07-08 jrick return err;
999 3d1b16d1 2023-07-08 jrick err = add_ignores(a->ignores, a->worktree->root_path, path,
1000 3d1b16d1 2023-07-08 jrick dirfd, ".gitignore");
1002 3d1b16d1 2023-07-08 jrick return err;
1005 3d1b16d1 2023-07-08 jrick static const struct got_error *
1006 3d1b16d1 2023-07-08 jrick report_single_file_status(const char *path, const char *ondisk_path,
1007 3d1b16d1 2023-07-08 jrick struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
1008 3d1b16d1 2023-07-08 jrick void *status_arg, struct got_repository *repo, int report_unchanged,
1009 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *ignores, int no_ignores)
1011 3d1b16d1 2023-07-08 jrick struct got_fileindex_entry *ie;
1012 3d1b16d1 2023-07-08 jrick struct stat sb;
1014 3d1b16d1 2023-07-08 jrick ie = got_fileindex_entry_get(fileindex, path, strlen(path));
1016 3d1b16d1 2023-07-08 jrick return report_file_status(ie, ondisk_path, -1, NULL,
1017 3d1b16d1 2023-07-08 jrick status_cb, status_arg, repo, report_unchanged);
1019 3d1b16d1 2023-07-08 jrick if (lstat(ondisk_path, &sb) == -1) {
1020 3d1b16d1 2023-07-08 jrick if (errno != ENOENT)
1021 3d1b16d1 2023-07-08 jrick return got_error_from_errno2("lstat", ondisk_path);
1022 3d1b16d1 2023-07-08 jrick return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
1023 3d1b16d1 2023-07-08 jrick GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
1026 3d1b16d1 2023-07-08 jrick if (!no_ignores && match_ignores(ignores, path))
1027 3d1b16d1 2023-07-08 jrick return NULL;
1029 3d1b16d1 2023-07-08 jrick if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1030 3d1b16d1 2023-07-08 jrick return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
1031 3d1b16d1 2023-07-08 jrick GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
1033 3d1b16d1 2023-07-08 jrick return NULL;
1036 3d1b16d1 2023-07-08 jrick static const struct got_error *
1037 3d1b16d1 2023-07-08 jrick add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
1038 3d1b16d1 2023-07-08 jrick const char *root_path, const char *path)
1040 3d1b16d1 2023-07-08 jrick const struct got_error *err;
1041 3d1b16d1 2023-07-08 jrick char *parent_path, *next_parent_path = NULL;
1043 3d1b16d1 2023-07-08 jrick err = add_ignores(ignores, root_path, "", -1,
1044 3d1b16d1 2023-07-08 jrick ".cvsignore");
1046 3d1b16d1 2023-07-08 jrick return err;
1048 3d1b16d1 2023-07-08 jrick err = add_ignores(ignores, root_path, "", -1,
1049 3d1b16d1 2023-07-08 jrick ".gitignore");
1051 3d1b16d1 2023-07-08 jrick return err;
1053 3d1b16d1 2023-07-08 jrick err = got_path_dirname(&parent_path, path);
1054 3d1b16d1 2023-07-08 jrick if (err) {
1055 3d1b16d1 2023-07-08 jrick if (err->code == GOT_ERR_BAD_PATH)
1056 3d1b16d1 2023-07-08 jrick return NULL; /* cannot traverse parent */
1057 3d1b16d1 2023-07-08 jrick return err;
1059 3d1b16d1 2023-07-08 jrick for (;;) {
1060 3d1b16d1 2023-07-08 jrick err = add_ignores(ignores, root_path, parent_path, -1,
1061 3d1b16d1 2023-07-08 jrick ".cvsignore");
1064 3d1b16d1 2023-07-08 jrick err = add_ignores(ignores, root_path, parent_path, -1,
1065 3d1b16d1 2023-07-08 jrick ".gitignore");
1068 3d1b16d1 2023-07-08 jrick err = got_path_dirname(&next_parent_path, parent_path);
1069 3d1b16d1 2023-07-08 jrick if (err) {
1070 3d1b16d1 2023-07-08 jrick if (err->code == GOT_ERR_BAD_PATH)
1071 3d1b16d1 2023-07-08 jrick err = NULL; /* traversed everything */
1074 3d1b16d1 2023-07-08 jrick if (got_path_is_root_dir(parent_path))
1076 3d1b16d1 2023-07-08 jrick free(parent_path);
1077 3d1b16d1 2023-07-08 jrick parent_path = next_parent_path;
1078 3d1b16d1 2023-07-08 jrick next_parent_path = NULL;
1081 3d1b16d1 2023-07-08 jrick free(parent_path);
1082 3d1b16d1 2023-07-08 jrick free(next_parent_path);
1083 3d1b16d1 2023-07-08 jrick return err;
1086 3d1b16d1 2023-07-08 jrick struct find_missing_children_args {
1087 3d1b16d1 2023-07-08 jrick const char *parent_path;
1088 3d1b16d1 2023-07-08 jrick size_t parent_len;
1089 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *children;
1090 3d1b16d1 2023-07-08 jrick got_cancel_cb cancel_cb;
1091 3d1b16d1 2023-07-08 jrick void *cancel_arg;
1094 3d1b16d1 2023-07-08 jrick static const struct got_error *
1095 3d1b16d1 2023-07-08 jrick find_missing_children(void *arg, struct got_fileindex_entry *ie)
1097 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
1098 3d1b16d1 2023-07-08 jrick struct find_missing_children_args *a = arg;
1100 3d1b16d1 2023-07-08 jrick if (a->cancel_cb) {
1101 3d1b16d1 2023-07-08 jrick err = a->cancel_cb(a->cancel_arg);
1103 3d1b16d1 2023-07-08 jrick return err;
1106 3d1b16d1 2023-07-08 jrick if (got_path_is_child(ie->path, a->parent_path, a->parent_len))
1107 3d1b16d1 2023-07-08 jrick err = got_pathlist_append(a->children, ie->path, NULL);
1109 3d1b16d1 2023-07-08 jrick return err;
1112 3d1b16d1 2023-07-08 jrick static const struct got_error *
1113 3d1b16d1 2023-07-08 jrick report_children(struct got_pathlist_head *children,
1114 3d1b16d1 2023-07-08 jrick struct got_worktree *worktree, struct got_fileindex *fileindex,
1115 3d1b16d1 2023-07-08 jrick struct got_repository *repo, int is_root_dir, int report_unchanged,
1116 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *ignores, int no_ignores,
1117 3d1b16d1 2023-07-08 jrick got_worktree_status_cb status_cb, void *status_arg,
1118 3d1b16d1 2023-07-08 jrick got_cancel_cb cancel_cb, void *cancel_arg)
1120 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
1121 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *pe;
1122 3d1b16d1 2023-07-08 jrick char *ondisk_path = NULL;
1124 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pe, children, entry) {
1125 3d1b16d1 2023-07-08 jrick if (cancel_cb) {
1126 3d1b16d1 2023-07-08 jrick err = cancel_cb(cancel_arg);
1131 3d1b16d1 2023-07-08 jrick if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
1132 3d1b16d1 2023-07-08 jrick !is_root_dir ? "/" : "", pe->path) == -1) {
1133 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("asprintf");
1134 3d1b16d1 2023-07-08 jrick ondisk_path = NULL;
1138 3d1b16d1 2023-07-08 jrick err = report_single_file_status(pe->path, ondisk_path,
1139 3d1b16d1 2023-07-08 jrick fileindex, status_cb, status_arg, repo, report_unchanged,
1140 3d1b16d1 2023-07-08 jrick ignores, no_ignores);
1144 3d1b16d1 2023-07-08 jrick free(ondisk_path);
1145 3d1b16d1 2023-07-08 jrick ondisk_path = NULL;
1148 3d1b16d1 2023-07-08 jrick free(ondisk_path);
1149 3d1b16d1 2023-07-08 jrick return err;
1152 3d1b16d1 2023-07-08 jrick static const struct got_error *
1153 3d1b16d1 2023-07-08 jrick worktree_status(struct got_worktree *worktree, const char *path,
1154 3d1b16d1 2023-07-08 jrick struct got_fileindex *fileindex, struct got_repository *repo,
1155 3d1b16d1 2023-07-08 jrick got_worktree_status_cb status_cb, void *status_arg,
1156 3d1b16d1 2023-07-08 jrick got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
1157 3d1b16d1 2023-07-08 jrick int report_unchanged)
1159 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
1160 3d1b16d1 2023-07-08 jrick int fd = -1;
1161 3d1b16d1 2023-07-08 jrick struct got_fileindex_diff_dir_cb fdiff_cb;
1162 3d1b16d1 2023-07-08 jrick struct diff_dir_cb_arg arg;
1163 3d1b16d1 2023-07-08 jrick char *ondisk_path = NULL;
1164 3d1b16d1 2023-07-08 jrick struct got_pathlist_head ignores, missing_children;
1165 3d1b16d1 2023-07-08 jrick struct got_fileindex_entry *ie;
1167 3d1b16d1 2023-07-08 jrick TAILQ_INIT(&ignores);
1168 3d1b16d1 2023-07-08 jrick TAILQ_INIT(&missing_children);
1170 3d1b16d1 2023-07-08 jrick if (asprintf(&ondisk_path, "%s%s%s",
1171 3d1b16d1 2023-07-08 jrick worktree->root_path, path[0] ? "/" : "", path) == -1)
1172 3d1b16d1 2023-07-08 jrick return got_error_from_errno("asprintf");
1174 3d1b16d1 2023-07-08 jrick ie = got_fileindex_entry_get(fileindex, path, strlen(path));
1175 3d1b16d1 2023-07-08 jrick if (ie) {
1176 3d1b16d1 2023-07-08 jrick err = report_single_file_status(path, ondisk_path,
1177 3d1b16d1 2023-07-08 jrick fileindex, status_cb, status_arg, repo,
1178 3d1b16d1 2023-07-08 jrick report_unchanged, &ignores, no_ignores);
1179 3d1b16d1 2023-07-08 jrick goto done;
1181 3d1b16d1 2023-07-08 jrick struct find_missing_children_args fmca;
1182 3d1b16d1 2023-07-08 jrick fmca.parent_path = path;
1183 3d1b16d1 2023-07-08 jrick fmca.parent_len = strlen(path);
1184 3d1b16d1 2023-07-08 jrick fmca.children = &missing_children;
1185 3d1b16d1 2023-07-08 jrick fmca.cancel_cb = cancel_cb;
1186 3d1b16d1 2023-07-08 jrick fmca.cancel_arg = cancel_arg;
1187 3d1b16d1 2023-07-08 jrick err = got_fileindex_for_each_entry_safe(fileindex,
1188 3d1b16d1 2023-07-08 jrick find_missing_children, &fmca);
1190 3d1b16d1 2023-07-08 jrick goto done;
1193 3d1b16d1 2023-07-08 jrick fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
1194 3d1b16d1 2023-07-08 jrick if (fd == -1) {
1195 3d1b16d1 2023-07-08 jrick if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
1196 3d1b16d1 2023-07-08 jrick !got_err_open_nofollow_on_symlink())
1197 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("open", ondisk_path);
1199 3d1b16d1 2023-07-08 jrick if (!no_ignores) {
1200 3d1b16d1 2023-07-08 jrick err = add_ignores_from_parent_paths(&ignores,
1201 3d1b16d1 2023-07-08 jrick worktree->root_path, ondisk_path);
1203 3d1b16d1 2023-07-08 jrick goto done;
1205 3d1b16d1 2023-07-08 jrick if (TAILQ_EMPTY(&missing_children)) {
1206 3d1b16d1 2023-07-08 jrick err = report_single_file_status(path,
1207 3d1b16d1 2023-07-08 jrick ondisk_path, fileindex,
1208 3d1b16d1 2023-07-08 jrick status_cb, status_arg, repo,
1209 3d1b16d1 2023-07-08 jrick report_unchanged, &ignores, no_ignores);
1211 3d1b16d1 2023-07-08 jrick goto done;
1213 3d1b16d1 2023-07-08 jrick err = report_children(&missing_children,
1214 3d1b16d1 2023-07-08 jrick worktree, fileindex, repo,
1215 3d1b16d1 2023-07-08 jrick (path[0] == '\0'), report_unchanged,
1216 3d1b16d1 2023-07-08 jrick &ignores, no_ignores,
1217 3d1b16d1 2023-07-08 jrick status_cb, status_arg,
1218 3d1b16d1 2023-07-08 jrick cancel_cb, cancel_arg);
1220 3d1b16d1 2023-07-08 jrick goto done;
1224 3d1b16d1 2023-07-08 jrick fdiff_cb.diff_old_new = status_old_new;
1225 3d1b16d1 2023-07-08 jrick fdiff_cb.diff_old = status_old;
1226 3d1b16d1 2023-07-08 jrick fdiff_cb.diff_new = status_new;
1227 3d1b16d1 2023-07-08 jrick fdiff_cb.diff_traverse = status_traverse;
1228 3d1b16d1 2023-07-08 jrick arg.fileindex = fileindex;
1229 3d1b16d1 2023-07-08 jrick arg.worktree = worktree;
1230 3d1b16d1 2023-07-08 jrick arg.status_path = path;
1231 3d1b16d1 2023-07-08 jrick arg.status_path_len = strlen(path);
1232 3d1b16d1 2023-07-08 jrick arg.repo = repo;
1233 3d1b16d1 2023-07-08 jrick arg.status_cb = status_cb;
1234 3d1b16d1 2023-07-08 jrick arg.status_arg = status_arg;
1235 3d1b16d1 2023-07-08 jrick arg.cancel_cb = cancel_cb;
1236 3d1b16d1 2023-07-08 jrick arg.cancel_arg = cancel_arg;
1237 3d1b16d1 2023-07-08 jrick arg.report_unchanged = report_unchanged;
1238 3d1b16d1 2023-07-08 jrick arg.no_ignores = no_ignores;
1239 3d1b16d1 2023-07-08 jrick if (!no_ignores) {
1240 3d1b16d1 2023-07-08 jrick err = add_ignores_from_parent_paths(&ignores,
1241 3d1b16d1 2023-07-08 jrick worktree->root_path, path);
1243 3d1b16d1 2023-07-08 jrick goto done;
1245 3d1b16d1 2023-07-08 jrick arg.ignores = &ignores;
1246 3d1b16d1 2023-07-08 jrick err = got_fileindex_diff_dir(fileindex, fd,
1247 3d1b16d1 2023-07-08 jrick worktree->root_path, path, repo, &fdiff_cb, &arg);
1250 3d1b16d1 2023-07-08 jrick free_ignores(&ignores);
1251 3d1b16d1 2023-07-08 jrick if (fd != -1 && close(fd) == -1 && err == NULL)
1252 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("close");
1253 3d1b16d1 2023-07-08 jrick free(ondisk_path);
1254 3d1b16d1 2023-07-08 jrick return err;
1257 3d1b16d1 2023-07-08 jrick static void
1258 3d1b16d1 2023-07-08 jrick free_commitable(struct got_commitable *ct)
1260 3d1b16d1 2023-07-08 jrick free(ct->path);
1261 3d1b16d1 2023-07-08 jrick free(ct->in_repo_path);
1262 3d1b16d1 2023-07-08 jrick free(ct->ondisk_path);
1263 3d1b16d1 2023-07-08 jrick free(ct->blob_id);
1264 3d1b16d1 2023-07-08 jrick free(ct->base_blob_id);
1265 3d1b16d1 2023-07-08 jrick free(ct->staged_blob_id);
1266 3d1b16d1 2023-07-08 jrick free(ct->base_commit_id);
1267 3d1b16d1 2023-07-08 jrick free(ct);
1270 3d1b16d1 2023-07-08 jrick struct collect_commitables_arg {
1271 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *commitable_paths;
1272 3d1b16d1 2023-07-08 jrick struct got_repository *repo;
1273 3d1b16d1 2023-07-08 jrick struct got_worktree *worktree;
1274 3d1b16d1 2023-07-08 jrick struct got_fileindex *fileindex;
1275 3d1b16d1 2023-07-08 jrick int have_staged_files;
1276 3d1b16d1 2023-07-08 jrick int allow_bad_symlinks;
1277 3d1b16d1 2023-07-08 jrick int diff_header_shown;
1278 3d1b16d1 2023-07-08 jrick int commit_conflicts;
1279 3d1b16d1 2023-07-08 jrick FILE *diff_outfile;
1280 3d1b16d1 2023-07-08 jrick FILE *f1;
1281 3d1b16d1 2023-07-08 jrick FILE *f2;
1285 3d1b16d1 2023-07-08 jrick * Create a file which contains the target path of a symlink so we can feed
1286 3d1b16d1 2023-07-08 jrick * it as content to the diff engine.
1288 3d1b16d1 2023-07-08 jrick static const struct got_error *
1289 3d1b16d1 2023-07-08 jrick get_symlink_target_file(int *fd, int dirfd, const char *de_name,
1290 3d1b16d1 2023-07-08 jrick const char *abspath)
1292 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
1293 3d1b16d1 2023-07-08 jrick char target_path[PATH_MAX];
1294 3d1b16d1 2023-07-08 jrick ssize_t target_len, outlen;
1296 3d1b16d1 2023-07-08 jrick *fd = -1;
1298 3d1b16d1 2023-07-08 jrick if (dirfd != -1) {
1299 3d1b16d1 2023-07-08 jrick target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
1300 3d1b16d1 2023-07-08 jrick if (target_len == -1)
1301 3d1b16d1 2023-07-08 jrick return got_error_from_errno2("readlinkat", abspath);
1303 3d1b16d1 2023-07-08 jrick target_len = readlink(abspath, target_path, PATH_MAX);
1304 3d1b16d1 2023-07-08 jrick if (target_len == -1)
1305 3d1b16d1 2023-07-08 jrick return got_error_from_errno2("readlink", abspath);
1308 3d1b16d1 2023-07-08 jrick *fd = got_opentempfd();
1309 3d1b16d1 2023-07-08 jrick if (*fd == -1)
1310 3d1b16d1 2023-07-08 jrick return got_error_from_errno("got_opentempfd");
1312 3d1b16d1 2023-07-08 jrick outlen = write(*fd, target_path, target_len);
1313 3d1b16d1 2023-07-08 jrick if (outlen == -1) {
1314 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
1315 3d1b16d1 2023-07-08 jrick goto done;
1318 3d1b16d1 2023-07-08 jrick if (lseek(*fd, 0, SEEK_SET) == -1) {
1319 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("lseek", abspath);
1320 3d1b16d1 2023-07-08 jrick goto done;
1323 3d1b16d1 2023-07-08 jrick if (err) {
1324 3d1b16d1 2023-07-08 jrick close(*fd);
1325 3d1b16d1 2023-07-08 jrick *fd = -1;
1327 3d1b16d1 2023-07-08 jrick return err;
1330 3d1b16d1 2023-07-08 jrick static const struct got_error *
1331 3d1b16d1 2023-07-08 jrick append_ct_diff(struct got_commitable *ct, int *diff_header_shown,
1332 3d1b16d1 2023-07-08 jrick FILE *diff_outfile, FILE *f1, FILE *f2, int dirfd, const char *de_name,
1333 3d1b16d1 2023-07-08 jrick int diff_staged, struct got_repository *repo, struct got_worktree *worktree)
1335 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
1336 3d1b16d1 2023-07-08 jrick struct got_blob_object *blob1 = NULL;
1337 3d1b16d1 2023-07-08 jrick int fd = -1, fd1 = -1, fd2 = -1;
1338 3d1b16d1 2023-07-08 jrick FILE *ondisk_file = NULL;
1339 3d1b16d1 2023-07-08 jrick char *label1 = NULL;
1340 3d1b16d1 2023-07-08 jrick struct stat sb;
1341 3d1b16d1 2023-07-08 jrick off_t size1 = 0;
1342 3d1b16d1 2023-07-08 jrick int f2_exists = 0;
1343 3d1b16d1 2023-07-08 jrick char *id_str = NULL;
1345 3d1b16d1 2023-07-08 jrick memset(&sb, 0, sizeof(sb));
1347 3d1b16d1 2023-07-08 jrick if (diff_staged) {
1348 3d1b16d1 2023-07-08 jrick if (ct->staged_status != GOT_STATUS_MODIFY &&
1349 3d1b16d1 2023-07-08 jrick ct->staged_status != GOT_STATUS_ADD &&
1350 3d1b16d1 2023-07-08 jrick ct->staged_status != GOT_STATUS_DELETE)
1351 3d1b16d1 2023-07-08 jrick return NULL;
1353 3d1b16d1 2023-07-08 jrick if (ct->status != GOT_STATUS_MODIFY &&
1354 3d1b16d1 2023-07-08 jrick ct->status != GOT_STATUS_ADD &&
1355 3d1b16d1 2023-07-08 jrick ct->status != GOT_STATUS_DELETE &&
1356 3d1b16d1 2023-07-08 jrick ct->status != GOT_STATUS_CONFLICT)
1357 3d1b16d1 2023-07-08 jrick return NULL;
1360 3d1b16d1 2023-07-08 jrick err = got_opentemp_truncate(f1);
1362 3d1b16d1 2023-07-08 jrick return got_error_from_errno("got_opentemp_truncate");
1363 3d1b16d1 2023-07-08 jrick err = got_opentemp_truncate(f2);
1365 3d1b16d1 2023-07-08 jrick return got_error_from_errno("got_opentemp_truncate");
1367 3d1b16d1 2023-07-08 jrick if (!*diff_header_shown) {
1368 3d1b16d1 2023-07-08 jrick err = got_object_id_str(&id_str, worktree->base_commit_id);
1370 3d1b16d1 2023-07-08 jrick return err;
1371 3d1b16d1 2023-07-08 jrick fprintf(diff_outfile, "diff %s%s\n", diff_staged ? "-s " : "",
1372 3d1b16d1 2023-07-08 jrick got_worktree_get_root_path(worktree));
1373 3d1b16d1 2023-07-08 jrick fprintf(diff_outfile, "commit - %s\n", id_str);
1374 3d1b16d1 2023-07-08 jrick fprintf(diff_outfile, "path + %s%s\n",
1375 3d1b16d1 2023-07-08 jrick got_worktree_get_root_path(worktree),
1376 3d1b16d1 2023-07-08 jrick diff_staged ? " (staged changes)" : "");
1377 3d1b16d1 2023-07-08 jrick *diff_header_shown = 1;
1380 3d1b16d1 2023-07-08 jrick if (diff_staged) {
1381 3d1b16d1 2023-07-08 jrick const char *label1 = NULL, *label2 = NULL;
1382 3d1b16d1 2023-07-08 jrick switch (ct->staged_status) {
1383 3d1b16d1 2023-07-08 jrick case GOT_STATUS_MODIFY:
1384 3d1b16d1 2023-07-08 jrick label1 = ct->path;
1385 3d1b16d1 2023-07-08 jrick label2 = ct->path;
1387 3d1b16d1 2023-07-08 jrick case GOT_STATUS_ADD:
1388 3d1b16d1 2023-07-08 jrick label2 = ct->path;
1390 3d1b16d1 2023-07-08 jrick case GOT_STATUS_DELETE:
1391 3d1b16d1 2023-07-08 jrick label1 = ct->path;
1394 3d1b16d1 2023-07-08 jrick return got_error(GOT_ERR_FILE_STATUS);
1396 3d1b16d1 2023-07-08 jrick fd1 = got_opentempfd();
1397 3d1b16d1 2023-07-08 jrick if (fd1 == -1) {
1398 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
1399 3d1b16d1 2023-07-08 jrick goto done;
1401 3d1b16d1 2023-07-08 jrick fd2 = got_opentempfd();
1402 3d1b16d1 2023-07-08 jrick if (fd2 == -1) {
1403 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
1404 3d1b16d1 2023-07-08 jrick goto done;
1406 3d1b16d1 2023-07-08 jrick err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
1407 3d1b16d1 2023-07-08 jrick fd1, fd2, ct->base_blob_id, ct->staged_blob_id,
1408 3d1b16d1 2023-07-08 jrick label1, label2, GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0,
1409 3d1b16d1 2023-07-08 jrick NULL, repo, diff_outfile);
1410 3d1b16d1 2023-07-08 jrick goto done;
1413 3d1b16d1 2023-07-08 jrick fd1 = got_opentempfd();
1414 3d1b16d1 2023-07-08 jrick if (fd1 == -1) {
1415 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("got_opentempfd");
1416 3d1b16d1 2023-07-08 jrick goto done;
1419 3d1b16d1 2023-07-08 jrick if (ct->status != GOT_STATUS_ADD) {
1420 3d1b16d1 2023-07-08 jrick err = got_object_open_as_blob(&blob1, repo, ct->base_blob_id,
1421 3d1b16d1 2023-07-08 jrick 8192, fd1);
1423 3d1b16d1 2023-07-08 jrick goto done;
1426 3d1b16d1 2023-07-08 jrick if (ct->status != GOT_STATUS_DELETE) {
1427 3d1b16d1 2023-07-08 jrick if (dirfd != -1) {
1428 3d1b16d1 2023-07-08 jrick fd = openat(dirfd, de_name,
1429 3d1b16d1 2023-07-08 jrick O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1430 3d1b16d1 2023-07-08 jrick if (fd == -1) {
1431 3d1b16d1 2023-07-08 jrick if (!got_err_open_nofollow_on_symlink()) {
1432 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("openat",
1433 3d1b16d1 2023-07-08 jrick ct->ondisk_path);
1434 3d1b16d1 2023-07-08 jrick goto done;
1436 3d1b16d1 2023-07-08 jrick err = get_symlink_target_file(&fd, dirfd,
1437 3d1b16d1 2023-07-08 jrick de_name, ct->ondisk_path);
1439 3d1b16d1 2023-07-08 jrick goto done;
1442 3d1b16d1 2023-07-08 jrick fd = open(ct->ondisk_path,
1443 3d1b16d1 2023-07-08 jrick O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1444 3d1b16d1 2023-07-08 jrick if (fd == -1) {
1445 3d1b16d1 2023-07-08 jrick if (!got_err_open_nofollow_on_symlink()) {
1446 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("open",
1447 3d1b16d1 2023-07-08 jrick ct->ondisk_path);
1448 3d1b16d1 2023-07-08 jrick goto done;
1450 3d1b16d1 2023-07-08 jrick err = get_symlink_target_file(&fd, dirfd,
1451 3d1b16d1 2023-07-08 jrick de_name, ct->ondisk_path);
1453 3d1b16d1 2023-07-08 jrick goto done;
1456 3d1b16d1 2023-07-08 jrick if (fstatat(fd, ct->ondisk_path, &sb,
1457 3d1b16d1 2023-07-08 jrick AT_SYMLINK_NOFOLLOW) == -1) {
1458 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("fstatat", ct->ondisk_path);
1459 3d1b16d1 2023-07-08 jrick goto done;
1461 3d1b16d1 2023-07-08 jrick ondisk_file = fdopen(fd, "r");
1462 3d1b16d1 2023-07-08 jrick if (ondisk_file == NULL) {
1463 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("fdopen", ct->ondisk_path);
1464 3d1b16d1 2023-07-08 jrick goto done;
1467 3d1b16d1 2023-07-08 jrick f2_exists = 1;
1470 3d1b16d1 2023-07-08 jrick if (blob1) {
1471 3d1b16d1 2023-07-08 jrick err = got_object_blob_dump_to_file(&size1, NULL, NULL,
1472 3d1b16d1 2023-07-08 jrick f1, blob1);
1474 3d1b16d1 2023-07-08 jrick goto done;
1477 3d1b16d1 2023-07-08 jrick err = got_diff_blob_file(blob1, f1, size1, label1,
1478 3d1b16d1 2023-07-08 jrick ondisk_file ? ondisk_file : f2, f2_exists, &sb, ct->path,
1479 3d1b16d1 2023-07-08 jrick GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0, NULL, diff_outfile);
1481 3d1b16d1 2023-07-08 jrick if (fd1 != -1 && close(fd1) == -1 && err == NULL)
1482 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("close");
1483 3d1b16d1 2023-07-08 jrick if (fd2 != -1 && close(fd2) == -1 && err == NULL)
1484 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("close");
1485 3d1b16d1 2023-07-08 jrick if (blob1)
1486 3d1b16d1 2023-07-08 jrick got_object_blob_close(blob1);
1487 3d1b16d1 2023-07-08 jrick if (fd != -1 && close(fd) == -1 && err == NULL)
1488 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("close");
1489 3d1b16d1 2023-07-08 jrick if (ondisk_file && fclose(ondisk_file) == EOF && err == NULL)
1490 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("fclose");
1491 3d1b16d1 2023-07-08 jrick return err;
1494 3d1b16d1 2023-07-08 jrick static const struct got_error *
1495 3d1b16d1 2023-07-08 jrick collect_commitables(void *arg, unsigned char status,
1496 3d1b16d1 2023-07-08 jrick unsigned char staged_status, const char *relpath,
1497 3d1b16d1 2023-07-08 jrick struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
1498 3d1b16d1 2023-07-08 jrick struct got_object_id *commit_id, int dirfd, const char *de_name)
1500 3d1b16d1 2023-07-08 jrick struct collect_commitables_arg *a = arg;
1501 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
1502 3d1b16d1 2023-07-08 jrick struct got_commitable *ct = NULL;
1503 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *new = NULL;
1504 3d1b16d1 2023-07-08 jrick char *parent_path = NULL, *path = NULL;
1505 3d1b16d1 2023-07-08 jrick struct stat sb;
1507 3d1b16d1 2023-07-08 jrick if (a->have_staged_files) {
1508 3d1b16d1 2023-07-08 jrick if (staged_status != GOT_STATUS_MODIFY &&
1509 3d1b16d1 2023-07-08 jrick staged_status != GOT_STATUS_ADD &&
1510 3d1b16d1 2023-07-08 jrick staged_status != GOT_STATUS_DELETE)
1511 3d1b16d1 2023-07-08 jrick return NULL;
1513 3d1b16d1 2023-07-08 jrick if (status == GOT_STATUS_CONFLICT && !a->commit_conflicts) {
1514 3d1b16d1 2023-07-08 jrick printf("C %s\n", relpath);
1515 3d1b16d1 2023-07-08 jrick return got_error(GOT_ERR_COMMIT_CONFLICT);
1518 3d1b16d1 2023-07-08 jrick if (status != GOT_STATUS_MODIFY &&
1519 3d1b16d1 2023-07-08 jrick status != GOT_STATUS_MODE_CHANGE &&
1520 3d1b16d1 2023-07-08 jrick status != GOT_STATUS_ADD &&
1521 3d1b16d1 2023-07-08 jrick status != GOT_STATUS_DELETE &&
1522 3d1b16d1 2023-07-08 jrick status != GOT_STATUS_CONFLICT)
1523 3d1b16d1 2023-07-08 jrick return NULL;
1526 3d1b16d1 2023-07-08 jrick if (asprintf(&path, "/%s", relpath) == -1) {
1527 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("asprintf");
1528 3d1b16d1 2023-07-08 jrick goto done;
1530 3d1b16d1 2023-07-08 jrick if (strcmp(path, "/") == 0) {
1531 3d1b16d1 2023-07-08 jrick parent_path = strdup("");
1532 3d1b16d1 2023-07-08 jrick if (parent_path == NULL)
1533 3d1b16d1 2023-07-08 jrick return got_error_from_errno("strdup");
1535 3d1b16d1 2023-07-08 jrick err = got_path_dirname(&parent_path, path);
1537 3d1b16d1 2023-07-08 jrick return err;
1540 3d1b16d1 2023-07-08 jrick ct = calloc(1, sizeof(*ct));
1541 3d1b16d1 2023-07-08 jrick if (ct == NULL) {
1542 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("calloc");
1543 3d1b16d1 2023-07-08 jrick goto done;
1546 3d1b16d1 2023-07-08 jrick if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
1547 3d1b16d1 2023-07-08 jrick relpath) == -1) {
1548 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("asprintf");
1549 3d1b16d1 2023-07-08 jrick goto done;
1552 3d1b16d1 2023-07-08 jrick if (staged_status == GOT_STATUS_ADD ||
1553 3d1b16d1 2023-07-08 jrick staged_status == GOT_STATUS_MODIFY) {
1554 3d1b16d1 2023-07-08 jrick struct got_fileindex_entry *ie;
1555 3d1b16d1 2023-07-08 jrick ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
1556 3d1b16d1 2023-07-08 jrick switch (got_fileindex_entry_staged_filetype_get(ie)) {
1557 3d1b16d1 2023-07-08 jrick case GOT_FILEIDX_MODE_REGULAR_FILE:
1558 3d1b16d1 2023-07-08 jrick case GOT_FILEIDX_MODE_BAD_SYMLINK:
1559 3d1b16d1 2023-07-08 jrick ct->mode = S_IFREG;
1561 3d1b16d1 2023-07-08 jrick case GOT_FILEIDX_MODE_SYMLINK:
1562 3d1b16d1 2023-07-08 jrick ct->mode = S_IFLNK;
1565 3d1b16d1 2023-07-08 jrick err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
1566 3d1b16d1 2023-07-08 jrick goto done;
1568 3d1b16d1 2023-07-08 jrick ct->mode |= got_fileindex_entry_perms_get(ie);
1569 3d1b16d1 2023-07-08 jrick } else if (status != GOT_STATUS_DELETE &&
1570 3d1b16d1 2023-07-08 jrick staged_status != GOT_STATUS_DELETE) {
1571 3d1b16d1 2023-07-08 jrick if (dirfd != -1) {
1572 3d1b16d1 2023-07-08 jrick if (fstatat(dirfd, de_name, &sb,
1573 3d1b16d1 2023-07-08 jrick AT_SYMLINK_NOFOLLOW) == -1) {
1574 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("fstatat",
1575 3d1b16d1 2023-07-08 jrick ct->ondisk_path);
1576 3d1b16d1 2023-07-08 jrick goto done;
1578 3d1b16d1 2023-07-08 jrick } else if (lstat(ct->ondisk_path, &sb) == -1) {
1579 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("lstat", ct->ondisk_path);
1580 3d1b16d1 2023-07-08 jrick goto done;
1582 3d1b16d1 2023-07-08 jrick ct->mode = sb.st_mode;
1585 3d1b16d1 2023-07-08 jrick if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
1586 3d1b16d1 2023-07-08 jrick got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
1587 3d1b16d1 2023-07-08 jrick relpath) == -1) {
1588 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("asprintf");
1589 3d1b16d1 2023-07-08 jrick goto done;
1592 3d1b16d1 2023-07-08 jrick if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
1593 3d1b16d1 2023-07-08 jrick status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
1594 3d1b16d1 2023-07-08 jrick int is_bad_symlink;
1595 3d1b16d1 2023-07-08 jrick char target_path[PATH_MAX];
1596 3d1b16d1 2023-07-08 jrick ssize_t target_len;
1597 3d1b16d1 2023-07-08 jrick target_len = readlink(ct->ondisk_path, target_path,
1598 3d1b16d1 2023-07-08 jrick sizeof(target_path));
1599 3d1b16d1 2023-07-08 jrick if (target_len == -1) {
1600 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("readlink",
1601 3d1b16d1 2023-07-08 jrick ct->ondisk_path);
1602 3d1b16d1 2023-07-08 jrick goto done;
1604 3d1b16d1 2023-07-08 jrick err = is_bad_symlink_target(&is_bad_symlink, target_path,
1605 3d1b16d1 2023-07-08 jrick target_len, ct->ondisk_path, a->worktree->root_path);
1607 3d1b16d1 2023-07-08 jrick goto done;
1608 3d1b16d1 2023-07-08 jrick if (is_bad_symlink) {
1609 3d1b16d1 2023-07-08 jrick err = got_error_path(ct->ondisk_path,
1610 3d1b16d1 2023-07-08 jrick GOT_ERR_BAD_SYMLINK);
1611 3d1b16d1 2023-07-08 jrick goto done;
1615 3d1b16d1 2023-07-08 jrick ct->status = status;
1616 3d1b16d1 2023-07-08 jrick ct->staged_status = staged_status;
1617 3d1b16d1 2023-07-08 jrick ct->blob_id = NULL; /* will be filled in when blob gets created */
1618 3d1b16d1 2023-07-08 jrick if (ct->status != GOT_STATUS_ADD &&
1619 3d1b16d1 2023-07-08 jrick ct->staged_status != GOT_STATUS_ADD) {
1620 3d1b16d1 2023-07-08 jrick ct->base_blob_id = got_object_id_dup(blob_id);
1621 3d1b16d1 2023-07-08 jrick if (ct->base_blob_id == NULL) {
1622 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("got_object_id_dup");
1623 3d1b16d1 2023-07-08 jrick goto done;
1625 3d1b16d1 2023-07-08 jrick ct->base_commit_id = got_object_id_dup(commit_id);
1626 3d1b16d1 2023-07-08 jrick if (ct->base_commit_id == NULL) {
1627 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("got_object_id_dup");
1628 3d1b16d1 2023-07-08 jrick goto done;
1631 3d1b16d1 2023-07-08 jrick if (ct->staged_status == GOT_STATUS_ADD ||
1632 3d1b16d1 2023-07-08 jrick ct->staged_status == GOT_STATUS_MODIFY) {
1633 3d1b16d1 2023-07-08 jrick ct->staged_blob_id = got_object_id_dup(staged_blob_id);
1634 3d1b16d1 2023-07-08 jrick if (ct->staged_blob_id == NULL) {
1635 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("got_object_id_dup");
1636 3d1b16d1 2023-07-08 jrick goto done;
1639 3d1b16d1 2023-07-08 jrick ct->path = strdup(path);
1640 3d1b16d1 2023-07-08 jrick if (ct->path == NULL) {
1641 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("strdup");
1642 3d1b16d1 2023-07-08 jrick goto done;
1644 3d1b16d1 2023-07-08 jrick err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
1646 3d1b16d1 2023-07-08 jrick goto done;
1648 3d1b16d1 2023-07-08 jrick if (a->diff_outfile && ct && new != NULL) {
1649 3d1b16d1 2023-07-08 jrick err = append_ct_diff(ct, &a->diff_header_shown,
1650 3d1b16d1 2023-07-08 jrick a->diff_outfile, a->f1, a->f2, dirfd, de_name,
1651 3d1b16d1 2023-07-08 jrick a->have_staged_files, a->repo, a->worktree);
1653 3d1b16d1 2023-07-08 jrick goto done;
1656 3d1b16d1 2023-07-08 jrick if (ct && (err || new == NULL))
1657 3d1b16d1 2023-07-08 jrick free_commitable(ct);
1658 3d1b16d1 2023-07-08 jrick free(parent_path);
1659 3d1b16d1 2023-07-08 jrick free(path);
1660 3d1b16d1 2023-07-08 jrick return err;
1663 3d1b16d1 2023-07-08 jrick static const struct got_error *write_tree(struct got_object_id **, int *,
1664 3d1b16d1 2023-07-08 jrick struct got_tree_object *, const char *, struct got_pathlist_head *,
1665 3d1b16d1 2023-07-08 jrick got_worktree_status_cb status_cb, void *status_arg,
1666 3d1b16d1 2023-07-08 jrick struct got_repository *);
1668 3d1b16d1 2023-07-08 jrick static const struct got_error *
1669 3d1b16d1 2023-07-08 jrick write_subtree(struct got_object_id **new_subtree_id, int *nentries,
1670 3d1b16d1 2023-07-08 jrick struct got_tree_entry *te, const char *parent_path,
1671 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *commitable_paths,
1672 3d1b16d1 2023-07-08 jrick got_worktree_status_cb status_cb, void *status_arg,
1673 3d1b16d1 2023-07-08 jrick struct got_repository *repo)
1675 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
1676 3d1b16d1 2023-07-08 jrick struct got_tree_object *subtree;
1677 3d1b16d1 2023-07-08 jrick char *subpath;
1679 3d1b16d1 2023-07-08 jrick if (asprintf(&subpath, "%s%s%s", parent_path,
1680 3d1b16d1 2023-07-08 jrick got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
1681 3d1b16d1 2023-07-08 jrick return got_error_from_errno("asprintf");
1683 3d1b16d1 2023-07-08 jrick err = got_object_open_as_tree(&subtree, repo, &te->id);
1685 3d1b16d1 2023-07-08 jrick return err;
1687 3d1b16d1 2023-07-08 jrick err = write_tree(new_subtree_id, nentries, subtree, subpath,
1688 3d1b16d1 2023-07-08 jrick commitable_paths, status_cb, status_arg, repo);
1689 3d1b16d1 2023-07-08 jrick got_object_tree_close(subtree);
1690 3d1b16d1 2023-07-08 jrick free(subpath);
1691 3d1b16d1 2023-07-08 jrick return err;
1694 3d1b16d1 2023-07-08 jrick static const struct got_error *
1695 3d1b16d1 2023-07-08 jrick match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
1697 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
1698 3d1b16d1 2023-07-08 jrick char *ct_parent_path = NULL;
1700 3d1b16d1 2023-07-08 jrick *match = 0;
1702 3d1b16d1 2023-07-08 jrick if (strchr(ct->in_repo_path, '/') == NULL) {
1703 3d1b16d1 2023-07-08 jrick *match = got_path_is_root_dir(path);
1704 3d1b16d1 2023-07-08 jrick return NULL;
1707 3d1b16d1 2023-07-08 jrick err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
1709 3d1b16d1 2023-07-08 jrick return err;
1710 3d1b16d1 2023-07-08 jrick *match = (strcmp(path, ct_parent_path) == 0);
1711 3d1b16d1 2023-07-08 jrick free(ct_parent_path);
1712 3d1b16d1 2023-07-08 jrick return err;
1715 3d1b16d1 2023-07-08 jrick static mode_t
1716 3d1b16d1 2023-07-08 jrick get_ct_file_mode(struct got_commitable *ct)
1718 3d1b16d1 2023-07-08 jrick if (S_ISLNK(ct->mode))
1719 3d1b16d1 2023-07-08 jrick return S_IFLNK;
1721 3d1b16d1 2023-07-08 jrick return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
1724 3d1b16d1 2023-07-08 jrick static const struct got_error *
1725 3d1b16d1 2023-07-08 jrick alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
1726 3d1b16d1 2023-07-08 jrick struct got_tree_entry *te, struct got_commitable *ct)
1728 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
1730 3d1b16d1 2023-07-08 jrick *new_te = NULL;
1732 3d1b16d1 2023-07-08 jrick err = got_object_tree_entry_dup(new_te, te);
1734 3d1b16d1 2023-07-08 jrick goto done;
1736 3d1b16d1 2023-07-08 jrick (*new_te)->mode = get_ct_file_mode(ct);
1738 3d1b16d1 2023-07-08 jrick if (ct->staged_status == GOT_STATUS_MODIFY)
1739 3d1b16d1 2023-07-08 jrick memcpy(&(*new_te)->id, ct->staged_blob_id,
1740 3d1b16d1 2023-07-08 jrick sizeof((*new_te)->id));
1742 3d1b16d1 2023-07-08 jrick memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
1744 3d1b16d1 2023-07-08 jrick if (err && *new_te) {
1745 3d1b16d1 2023-07-08 jrick free(*new_te);
1746 3d1b16d1 2023-07-08 jrick *new_te = NULL;
1748 3d1b16d1 2023-07-08 jrick return err;
1751 3d1b16d1 2023-07-08 jrick static const struct got_error *
1752 3d1b16d1 2023-07-08 jrick alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
1753 3d1b16d1 2023-07-08 jrick struct got_commitable *ct)
1755 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
1756 3d1b16d1 2023-07-08 jrick char *ct_name = NULL;
1758 3d1b16d1 2023-07-08 jrick *new_te = NULL;
1760 3d1b16d1 2023-07-08 jrick *new_te = calloc(1, sizeof(**new_te));
1761 3d1b16d1 2023-07-08 jrick if (*new_te == NULL)
1762 3d1b16d1 2023-07-08 jrick return got_error_from_errno("calloc");
1764 3d1b16d1 2023-07-08 jrick err = got_path_basename(&ct_name, ct->path);
1766 3d1b16d1 2023-07-08 jrick goto done;
1767 3d1b16d1 2023-07-08 jrick if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
1768 3d1b16d1 2023-07-08 jrick sizeof((*new_te)->name)) {
1769 3d1b16d1 2023-07-08 jrick err = got_error(GOT_ERR_NO_SPACE);
1770 3d1b16d1 2023-07-08 jrick goto done;
1773 3d1b16d1 2023-07-08 jrick (*new_te)->mode = get_ct_file_mode(ct);
1775 3d1b16d1 2023-07-08 jrick if (ct->staged_status == GOT_STATUS_ADD)
1776 3d1b16d1 2023-07-08 jrick memcpy(&(*new_te)->id, ct->staged_blob_id,
1777 3d1b16d1 2023-07-08 jrick sizeof((*new_te)->id));
1779 3d1b16d1 2023-07-08 jrick memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
1781 3d1b16d1 2023-07-08 jrick free(ct_name);
1782 3d1b16d1 2023-07-08 jrick if (err && *new_te) {
1783 3d1b16d1 2023-07-08 jrick free(*new_te);
1784 3d1b16d1 2023-07-08 jrick *new_te = NULL;
1786 3d1b16d1 2023-07-08 jrick return err;
1789 3d1b16d1 2023-07-08 jrick static const struct got_error *
1790 3d1b16d1 2023-07-08 jrick insert_tree_entry(struct got_tree_entry *new_te,
1791 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *paths)
1793 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
1794 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *new_pe;
1796 3d1b16d1 2023-07-08 jrick err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
1798 3d1b16d1 2023-07-08 jrick return err;
1799 3d1b16d1 2023-07-08 jrick if (new_pe == NULL)
1800 3d1b16d1 2023-07-08 jrick return got_error(GOT_ERR_TREE_DUP_ENTRY);
1801 3d1b16d1 2023-07-08 jrick return NULL;
1804 3d1b16d1 2023-07-08 jrick static const struct got_error *
1805 3d1b16d1 2023-07-08 jrick report_ct_status(struct got_commitable *ct,
1806 3d1b16d1 2023-07-08 jrick got_worktree_status_cb status_cb, void *status_arg)
1808 3d1b16d1 2023-07-08 jrick const char *ct_path = ct->path;
1809 3d1b16d1 2023-07-08 jrick unsigned char status;
1811 3d1b16d1 2023-07-08 jrick if (status_cb == NULL) /* no commit progress output desired */
1812 3d1b16d1 2023-07-08 jrick return NULL;
1814 3d1b16d1 2023-07-08 jrick while (ct_path[0] == '/')
1815 3d1b16d1 2023-07-08 jrick ct_path++;
1817 3d1b16d1 2023-07-08 jrick if (ct->staged_status != GOT_STATUS_NO_CHANGE)
1818 3d1b16d1 2023-07-08 jrick status = ct->staged_status;
1820 3d1b16d1 2023-07-08 jrick status = ct->status;
1822 3d1b16d1 2023-07-08 jrick return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
1823 3d1b16d1 2023-07-08 jrick ct_path, ct->blob_id, NULL, NULL, -1, NULL);
1826 3d1b16d1 2023-07-08 jrick static const struct got_error *
1827 3d1b16d1 2023-07-08 jrick match_modified_subtree(int *modified, struct got_tree_entry *te,
1828 3d1b16d1 2023-07-08 jrick const char *base_tree_path, struct got_pathlist_head *commitable_paths)
1830 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
1831 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *pe;
1832 3d1b16d1 2023-07-08 jrick char *te_path;
1834 3d1b16d1 2023-07-08 jrick *modified = 0;
1836 3d1b16d1 2023-07-08 jrick if (asprintf(&te_path, "%s%s%s", base_tree_path,
1837 3d1b16d1 2023-07-08 jrick got_path_is_root_dir(base_tree_path) ? "" : "/",
1838 3d1b16d1 2023-07-08 jrick te->name) == -1)
1839 3d1b16d1 2023-07-08 jrick return got_error_from_errno("asprintf");
1841 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pe, commitable_paths, entry) {
1842 3d1b16d1 2023-07-08 jrick struct got_commitable *ct = pe->data;
1843 3d1b16d1 2023-07-08 jrick *modified = got_path_is_child(ct->in_repo_path, te_path,
1844 3d1b16d1 2023-07-08 jrick strlen(te_path));
1845 3d1b16d1 2023-07-08 jrick if (*modified)
1849 3d1b16d1 2023-07-08 jrick free(te_path);
1850 3d1b16d1 2023-07-08 jrick return err;
1853 3d1b16d1 2023-07-08 jrick static const struct got_error *
1854 3d1b16d1 2023-07-08 jrick match_deleted_or_modified_ct(struct got_commitable **ctp,
1855 3d1b16d1 2023-07-08 jrick struct got_tree_entry *te, const char *base_tree_path,
1856 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *commitable_paths)
1858 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
1859 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *pe;
1861 3d1b16d1 2023-07-08 jrick *ctp = NULL;
1863 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pe, commitable_paths, entry) {
1864 3d1b16d1 2023-07-08 jrick struct got_commitable *ct = pe->data;
1865 3d1b16d1 2023-07-08 jrick char *ct_name = NULL;
1866 3d1b16d1 2023-07-08 jrick int path_matches;
1868 3d1b16d1 2023-07-08 jrick if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
1869 3d1b16d1 2023-07-08 jrick if (ct->status != GOT_STATUS_MODIFY &&
1870 3d1b16d1 2023-07-08 jrick ct->status != GOT_STATUS_MODE_CHANGE &&
1871 3d1b16d1 2023-07-08 jrick ct->status != GOT_STATUS_DELETE &&
1872 3d1b16d1 2023-07-08 jrick ct->status != GOT_STATUS_CONFLICT)
1873 3d1b16d1 2023-07-08 jrick continue;
1875 3d1b16d1 2023-07-08 jrick if (ct->staged_status != GOT_STATUS_MODIFY &&
1876 3d1b16d1 2023-07-08 jrick ct->staged_status != GOT_STATUS_DELETE)
1877 3d1b16d1 2023-07-08 jrick continue;
1880 3d1b16d1 2023-07-08 jrick if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
1881 3d1b16d1 2023-07-08 jrick continue;
1883 3d1b16d1 2023-07-08 jrick err = match_ct_parent_path(&path_matches, ct, base_tree_path);
1885 3d1b16d1 2023-07-08 jrick return err;
1886 3d1b16d1 2023-07-08 jrick if (!path_matches)
1887 3d1b16d1 2023-07-08 jrick continue;
1889 3d1b16d1 2023-07-08 jrick err = got_path_basename(&ct_name, pe->path);
1891 3d1b16d1 2023-07-08 jrick return err;
1893 3d1b16d1 2023-07-08 jrick if (strcmp(te->name, ct_name) != 0) {
1894 3d1b16d1 2023-07-08 jrick free(ct_name);
1895 3d1b16d1 2023-07-08 jrick continue;
1897 3d1b16d1 2023-07-08 jrick free(ct_name);
1899 3d1b16d1 2023-07-08 jrick *ctp = ct;
1903 3d1b16d1 2023-07-08 jrick return err;
1906 3d1b16d1 2023-07-08 jrick static const struct got_error *
1907 3d1b16d1 2023-07-08 jrick make_subtree_for_added_blob(struct got_tree_entry **new_tep,
1908 3d1b16d1 2023-07-08 jrick const char *child_path, const char *path_base_tree,
1909 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *commitable_paths,
1910 3d1b16d1 2023-07-08 jrick got_worktree_status_cb status_cb, void *status_arg,
1911 3d1b16d1 2023-07-08 jrick struct got_repository *repo)
1913 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
1914 3d1b16d1 2023-07-08 jrick struct got_tree_entry *new_te;
1915 3d1b16d1 2023-07-08 jrick char *subtree_path;
1916 3d1b16d1 2023-07-08 jrick struct got_object_id *id = NULL;
1917 3d1b16d1 2023-07-08 jrick int nentries;
1919 3d1b16d1 2023-07-08 jrick *new_tep = NULL;
1921 3d1b16d1 2023-07-08 jrick if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
1922 3d1b16d1 2023-07-08 jrick got_path_is_root_dir(path_base_tree) ? "" : "/",
1923 3d1b16d1 2023-07-08 jrick child_path) == -1)
1924 3d1b16d1 2023-07-08 jrick return got_error_from_errno("asprintf");
1926 3d1b16d1 2023-07-08 jrick new_te = calloc(1, sizeof(*new_te));
1927 3d1b16d1 2023-07-08 jrick if (new_te == NULL)
1928 3d1b16d1 2023-07-08 jrick return got_error_from_errno("calloc");
1929 3d1b16d1 2023-07-08 jrick new_te->mode = S_IFDIR;
1931 3d1b16d1 2023-07-08 jrick if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
1932 3d1b16d1 2023-07-08 jrick sizeof(new_te->name)) {
1933 3d1b16d1 2023-07-08 jrick err = got_error(GOT_ERR_NO_SPACE);
1934 3d1b16d1 2023-07-08 jrick goto done;
1936 3d1b16d1 2023-07-08 jrick err = write_tree(&id, &nentries, NULL, subtree_path,
1937 3d1b16d1 2023-07-08 jrick commitable_paths, status_cb, status_arg, repo);
1938 3d1b16d1 2023-07-08 jrick if (err) {
1939 3d1b16d1 2023-07-08 jrick free(new_te);
1940 3d1b16d1 2023-07-08 jrick goto done;
1942 3d1b16d1 2023-07-08 jrick memcpy(&new_te->id, id, sizeof(new_te->id));
1944 3d1b16d1 2023-07-08 jrick free(id);
1945 3d1b16d1 2023-07-08 jrick free(subtree_path);
1946 3d1b16d1 2023-07-08 jrick if (err == NULL)
1947 3d1b16d1 2023-07-08 jrick *new_tep = new_te;
1948 3d1b16d1 2023-07-08 jrick return err;
1951 3d1b16d1 2023-07-08 jrick static const struct got_error *
1952 3d1b16d1 2023-07-08 jrick write_tree(struct got_object_id **new_tree_id, int *nentries,
1953 3d1b16d1 2023-07-08 jrick struct got_tree_object *base_tree, const char *path_base_tree,
1954 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *commitable_paths,
1955 3d1b16d1 2023-07-08 jrick got_worktree_status_cb status_cb, void *status_arg,
1956 3d1b16d1 2023-07-08 jrick struct got_repository *repo)
1958 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
1959 3d1b16d1 2023-07-08 jrick struct got_pathlist_head paths;
1960 3d1b16d1 2023-07-08 jrick struct got_tree_entry *te, *new_te = NULL;
1961 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *pe;
1963 3d1b16d1 2023-07-08 jrick TAILQ_INIT(&paths);
1964 3d1b16d1 2023-07-08 jrick *nentries = 0;
1966 3d1b16d1 2023-07-08 jrick /* Insert, and recurse into, newly added entries first. */
1967 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pe, commitable_paths, entry) {
1968 3d1b16d1 2023-07-08 jrick struct got_commitable *ct = pe->data;
1969 3d1b16d1 2023-07-08 jrick char *child_path = NULL, *slash;
1971 3d1b16d1 2023-07-08 jrick if ((ct->status != GOT_STATUS_ADD &&
1972 3d1b16d1 2023-07-08 jrick ct->staged_status != GOT_STATUS_ADD) ||
1973 3d1b16d1 2023-07-08 jrick (ct->flags & GOT_COMMITABLE_ADDED))
1974 3d1b16d1 2023-07-08 jrick continue;
1976 3d1b16d1 2023-07-08 jrick if (!got_path_is_child(ct->in_repo_path, path_base_tree,
1977 3d1b16d1 2023-07-08 jrick strlen(path_base_tree)))
1978 3d1b16d1 2023-07-08 jrick continue;
1980 3d1b16d1 2023-07-08 jrick err = got_path_skip_common_ancestor(&child_path, path_base_tree,
1981 3d1b16d1 2023-07-08 jrick ct->in_repo_path);
1983 3d1b16d1 2023-07-08 jrick goto done;
1985 3d1b16d1 2023-07-08 jrick slash = strchr(child_path, '/');
1986 3d1b16d1 2023-07-08 jrick if (slash == NULL) {
1987 3d1b16d1 2023-07-08 jrick err = alloc_added_blob_tree_entry(&new_te, ct);
1989 3d1b16d1 2023-07-08 jrick goto done;
1990 3d1b16d1 2023-07-08 jrick err = report_ct_status(ct, status_cb, status_arg);
1992 3d1b16d1 2023-07-08 jrick goto done;
1993 3d1b16d1 2023-07-08 jrick ct->flags |= GOT_COMMITABLE_ADDED;
1994 3d1b16d1 2023-07-08 jrick err = insert_tree_entry(new_te, &paths);
1996 3d1b16d1 2023-07-08 jrick goto done;
1997 3d1b16d1 2023-07-08 jrick (*nentries)++;
1999 3d1b16d1 2023-07-08 jrick *slash = '\0'; /* trim trailing path components */
2000 3d1b16d1 2023-07-08 jrick if (base_tree == NULL ||
2001 3d1b16d1 2023-07-08 jrick got_object_tree_find_entry(base_tree, child_path)
2002 3d1b16d1 2023-07-08 jrick == NULL) {
2003 3d1b16d1 2023-07-08 jrick err = make_subtree_for_added_blob(&new_te,
2004 3d1b16d1 2023-07-08 jrick child_path, path_base_tree,
2005 3d1b16d1 2023-07-08 jrick commitable_paths, status_cb, status_arg,
2008 3d1b16d1 2023-07-08 jrick goto done;
2009 3d1b16d1 2023-07-08 jrick err = insert_tree_entry(new_te, &paths);
2011 3d1b16d1 2023-07-08 jrick goto done;
2012 3d1b16d1 2023-07-08 jrick (*nentries)++;
2017 3d1b16d1 2023-07-08 jrick if (base_tree) {
2018 3d1b16d1 2023-07-08 jrick int i, nbase_entries;
2019 3d1b16d1 2023-07-08 jrick /* Handle modified and deleted entries. */
2020 3d1b16d1 2023-07-08 jrick nbase_entries = got_object_tree_get_nentries(base_tree);
2021 3d1b16d1 2023-07-08 jrick for (i = 0; i < nbase_entries; i++) {
2022 3d1b16d1 2023-07-08 jrick struct got_commitable *ct = NULL;
2024 3d1b16d1 2023-07-08 jrick te = got_object_tree_get_entry(base_tree, i);
2025 3d1b16d1 2023-07-08 jrick if (got_object_tree_entry_is_submodule(te)) {
2026 3d1b16d1 2023-07-08 jrick /* Entry is a submodule; just copy it. */
2027 3d1b16d1 2023-07-08 jrick err = got_object_tree_entry_dup(&new_te, te);
2029 3d1b16d1 2023-07-08 jrick goto done;
2030 3d1b16d1 2023-07-08 jrick err = insert_tree_entry(new_te, &paths);
2032 3d1b16d1 2023-07-08 jrick goto done;
2033 3d1b16d1 2023-07-08 jrick (*nentries)++;
2034 3d1b16d1 2023-07-08 jrick continue;
2037 3d1b16d1 2023-07-08 jrick if (S_ISDIR(te->mode)) {
2038 3d1b16d1 2023-07-08 jrick int modified;
2039 3d1b16d1 2023-07-08 jrick err = got_object_tree_entry_dup(&new_te, te);
2041 3d1b16d1 2023-07-08 jrick goto done;
2042 3d1b16d1 2023-07-08 jrick err = match_modified_subtree(&modified, te,
2043 3d1b16d1 2023-07-08 jrick path_base_tree, commitable_paths);
2045 3d1b16d1 2023-07-08 jrick goto done;
2046 3d1b16d1 2023-07-08 jrick /* Avoid recursion into unmodified subtrees. */
2047 3d1b16d1 2023-07-08 jrick if (modified) {
2048 3d1b16d1 2023-07-08 jrick struct got_object_id *new_id;
2049 3d1b16d1 2023-07-08 jrick int nsubentries;
2050 3d1b16d1 2023-07-08 jrick err = write_subtree(&new_id,
2051 3d1b16d1 2023-07-08 jrick &nsubentries, te,
2052 3d1b16d1 2023-07-08 jrick path_base_tree, commitable_paths,
2053 3d1b16d1 2023-07-08 jrick status_cb, status_arg, repo);
2055 3d1b16d1 2023-07-08 jrick goto done;
2056 3d1b16d1 2023-07-08 jrick if (nsubentries == 0) {
2057 3d1b16d1 2023-07-08 jrick /* All entries were deleted. */
2058 3d1b16d1 2023-07-08 jrick free(new_id);
2059 3d1b16d1 2023-07-08 jrick continue;
2061 3d1b16d1 2023-07-08 jrick memcpy(&new_te->id, new_id,
2062 3d1b16d1 2023-07-08 jrick sizeof(new_te->id));
2063 3d1b16d1 2023-07-08 jrick free(new_id);
2065 3d1b16d1 2023-07-08 jrick err = insert_tree_entry(new_te, &paths);
2067 3d1b16d1 2023-07-08 jrick goto done;
2068 3d1b16d1 2023-07-08 jrick (*nentries)++;
2069 3d1b16d1 2023-07-08 jrick continue;
2072 3d1b16d1 2023-07-08 jrick err = match_deleted_or_modified_ct(&ct, te,
2073 3d1b16d1 2023-07-08 jrick path_base_tree, commitable_paths);
2075 3d1b16d1 2023-07-08 jrick goto done;
2076 3d1b16d1 2023-07-08 jrick if (ct) {
2077 3d1b16d1 2023-07-08 jrick /* NB: Deleted entries get dropped here. */
2078 3d1b16d1 2023-07-08 jrick if (ct->status == GOT_STATUS_MODIFY ||
2079 3d1b16d1 2023-07-08 jrick ct->status == GOT_STATUS_MODE_CHANGE ||
2080 3d1b16d1 2023-07-08 jrick ct->status == GOT_STATUS_CONFLICT ||
2081 3d1b16d1 2023-07-08 jrick ct->staged_status == GOT_STATUS_MODIFY) {
2082 3d1b16d1 2023-07-08 jrick err = alloc_modified_blob_tree_entry(
2083 3d1b16d1 2023-07-08 jrick &new_te, te, ct);
2085 3d1b16d1 2023-07-08 jrick goto done;
2086 3d1b16d1 2023-07-08 jrick err = insert_tree_entry(new_te, &paths);
2088 3d1b16d1 2023-07-08 jrick goto done;
2089 3d1b16d1 2023-07-08 jrick (*nentries)++;
2091 3d1b16d1 2023-07-08 jrick err = report_ct_status(ct, status_cb,
2092 3d1b16d1 2023-07-08 jrick status_arg);
2094 3d1b16d1 2023-07-08 jrick goto done;
2096 3d1b16d1 2023-07-08 jrick /* Entry is unchanged; just copy it. */
2097 3d1b16d1 2023-07-08 jrick err = got_object_tree_entry_dup(&new_te, te);
2099 3d1b16d1 2023-07-08 jrick goto done;
2100 3d1b16d1 2023-07-08 jrick err = insert_tree_entry(new_te, &paths);
2102 3d1b16d1 2023-07-08 jrick goto done;
2103 3d1b16d1 2023-07-08 jrick (*nentries)++;
2108 3d1b16d1 2023-07-08 jrick /* Write new list of entries; deleted entries have been dropped. */
2109 3d1b16d1 2023-07-08 jrick err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
2111 3d1b16d1 2023-07-08 jrick got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
2112 3d1b16d1 2023-07-08 jrick return err;
2115 3d1b16d1 2023-07-08 jrick static const struct got_error *
2116 3d1b16d1 2023-07-08 jrick update_fileindex_after_commit(struct got_worktree *worktree,
2117 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *commitable_paths,
2118 3d1b16d1 2023-07-08 jrick struct got_object_id *new_base_commit_id,
2119 3d1b16d1 2023-07-08 jrick struct got_fileindex *fileindex, int have_staged_files)
2121 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
2122 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *pe;
2123 3d1b16d1 2023-07-08 jrick char *relpath = NULL;
2125 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pe, commitable_paths, entry) {
2126 3d1b16d1 2023-07-08 jrick struct got_fileindex_entry *ie;
2127 3d1b16d1 2023-07-08 jrick struct got_commitable *ct = pe->data;
2129 3d1b16d1 2023-07-08 jrick ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
2131 3d1b16d1 2023-07-08 jrick err = got_path_skip_common_ancestor(&relpath,
2132 3d1b16d1 2023-07-08 jrick worktree->root_path, ct->ondisk_path);
2134 3d1b16d1 2023-07-08 jrick goto done;
2136 3d1b16d1 2023-07-08 jrick if (ie) {
2137 3d1b16d1 2023-07-08 jrick if (ct->status == GOT_STATUS_DELETE ||
2138 3d1b16d1 2023-07-08 jrick ct->staged_status == GOT_STATUS_DELETE) {
2139 3d1b16d1 2023-07-08 jrick got_fileindex_entry_remove(fileindex, ie);
2140 3d1b16d1 2023-07-08 jrick } else if (ct->staged_status == GOT_STATUS_ADD ||
2141 3d1b16d1 2023-07-08 jrick ct->staged_status == GOT_STATUS_MODIFY) {
2142 3d1b16d1 2023-07-08 jrick got_fileindex_entry_stage_set(ie,
2143 3d1b16d1 2023-07-08 jrick GOT_FILEIDX_STAGE_NONE);
2144 3d1b16d1 2023-07-08 jrick got_fileindex_entry_staged_filetype_set(ie, 0);
2146 3d1b16d1 2023-07-08 jrick err = got_fileindex_entry_update(ie,
2147 3d1b16d1 2023-07-08 jrick worktree->root_fd, relpath,
2148 3d1b16d1 2023-07-08 jrick ct->staged_blob_id->sha1,
2149 3d1b16d1 2023-07-08 jrick new_base_commit_id->sha1,
2150 3d1b16d1 2023-07-08 jrick !have_staged_files);
2152 3d1b16d1 2023-07-08 jrick err = got_fileindex_entry_update(ie,
2153 3d1b16d1 2023-07-08 jrick worktree->root_fd, relpath,
2154 3d1b16d1 2023-07-08 jrick ct->blob_id->sha1,
2155 3d1b16d1 2023-07-08 jrick new_base_commit_id->sha1,
2156 3d1b16d1 2023-07-08 jrick !have_staged_files);
2158 3d1b16d1 2023-07-08 jrick err = got_fileindex_entry_alloc(&ie, pe->path);
2160 3d1b16d1 2023-07-08 jrick goto done;
2161 3d1b16d1 2023-07-08 jrick err = got_fileindex_entry_update(ie,
2162 3d1b16d1 2023-07-08 jrick worktree->root_fd, relpath, ct->blob_id->sha1,
2163 3d1b16d1 2023-07-08 jrick new_base_commit_id->sha1, 1);
2164 3d1b16d1 2023-07-08 jrick if (err) {
2165 3d1b16d1 2023-07-08 jrick got_fileindex_entry_free(ie);
2166 3d1b16d1 2023-07-08 jrick goto done;
2168 3d1b16d1 2023-07-08 jrick err = got_fileindex_entry_add(fileindex, ie);
2169 3d1b16d1 2023-07-08 jrick if (err) {
2170 3d1b16d1 2023-07-08 jrick got_fileindex_entry_free(ie);
2171 3d1b16d1 2023-07-08 jrick goto done;
2174 3d1b16d1 2023-07-08 jrick free(relpath);
2175 3d1b16d1 2023-07-08 jrick relpath = NULL;
2178 3d1b16d1 2023-07-08 jrick free(relpath);
2179 3d1b16d1 2023-07-08 jrick return err;
2182 3d1b16d1 2023-07-08 jrick static const struct got_error *
2183 3d1b16d1 2023-07-08 jrick check_out_of_date(const char *in_repo_path, unsigned char status,
2184 3d1b16d1 2023-07-08 jrick unsigned char staged_status, struct got_object_id *base_blob_id,
2185 3d1b16d1 2023-07-08 jrick struct got_object_id *base_commit_id,
2186 3d1b16d1 2023-07-08 jrick struct got_object_id *head_commit_id, struct got_repository *repo,
2187 3d1b16d1 2023-07-08 jrick int ood_errcode)
2189 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
2190 3d1b16d1 2023-07-08 jrick struct got_commit_object *commit = NULL;
2191 3d1b16d1 2023-07-08 jrick struct got_object_id *id = NULL;
2193 3d1b16d1 2023-07-08 jrick if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
2194 3d1b16d1 2023-07-08 jrick /* Trivial case: base commit == head commit */
2195 3d1b16d1 2023-07-08 jrick if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
2196 3d1b16d1 2023-07-08 jrick return NULL;
2198 3d1b16d1 2023-07-08 jrick * Ensure file content which local changes were based
2199 3d1b16d1 2023-07-08 jrick * on matches file content in the branch head.
2201 3d1b16d1 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo, head_commit_id);
2203 3d1b16d1 2023-07-08 jrick goto done;
2204 3d1b16d1 2023-07-08 jrick err = got_object_id_by_path(&id, repo, commit, in_repo_path);
2205 3d1b16d1 2023-07-08 jrick if (err) {
2206 3d1b16d1 2023-07-08 jrick if (err->code == GOT_ERR_NO_TREE_ENTRY)
2207 3d1b16d1 2023-07-08 jrick err = got_error(ood_errcode);
2208 3d1b16d1 2023-07-08 jrick goto done;
2209 3d1b16d1 2023-07-08 jrick } else if (got_object_id_cmp(id, base_blob_id) != 0)
2210 3d1b16d1 2023-07-08 jrick err = got_error(ood_errcode);
2212 3d1b16d1 2023-07-08 jrick /* Require that added files don't exist in the branch head. */
2213 3d1b16d1 2023-07-08 jrick err = got_object_open_as_commit(&commit, repo, head_commit_id);
2215 3d1b16d1 2023-07-08 jrick goto done;
2216 3d1b16d1 2023-07-08 jrick err = got_object_id_by_path(&id, repo, commit, in_repo_path);
2217 3d1b16d1 2023-07-08 jrick if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
2218 3d1b16d1 2023-07-08 jrick goto done;
2219 3d1b16d1 2023-07-08 jrick err = id ? got_error(ood_errcode) : NULL;
2222 3d1b16d1 2023-07-08 jrick free(id);
2223 3d1b16d1 2023-07-08 jrick if (commit)
2224 3d1b16d1 2023-07-08 jrick got_object_commit_close(commit);
2225 3d1b16d1 2023-07-08 jrick return err;
2228 3d1b16d1 2023-07-08 jrick static const struct got_error *
2229 3d1b16d1 2023-07-08 jrick commit_worktree(struct got_object_id **new_commit_id,
2230 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *commitable_paths,
2231 3d1b16d1 2023-07-08 jrick struct got_object_id *head_commit_id,
2232 3d1b16d1 2023-07-08 jrick struct got_object_id *parent_id2,
2233 3d1b16d1 2023-07-08 jrick struct got_worktree *worktree,
2234 3d1b16d1 2023-07-08 jrick const char *author, const char *committer, char *diff_path,
2235 3d1b16d1 2023-07-08 jrick got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
2236 3d1b16d1 2023-07-08 jrick got_worktree_status_cb status_cb, void *status_arg,
2237 3d1b16d1 2023-07-08 jrick struct got_repository *repo)
2239 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
2240 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *pe;
2241 3d1b16d1 2023-07-08 jrick struct got_commit_object *head_commit = NULL;
2242 3d1b16d1 2023-07-08 jrick struct got_tree_object *head_tree = NULL;
2243 3d1b16d1 2023-07-08 jrick struct got_object_id *new_tree_id = NULL;
2244 3d1b16d1 2023-07-08 jrick int nentries, nparents = 0;
2245 3d1b16d1 2023-07-08 jrick struct got_object_id_queue parent_ids;
2246 3d1b16d1 2023-07-08 jrick struct got_object_qid *pid = NULL;
2247 3d1b16d1 2023-07-08 jrick char *logmsg = NULL;
2248 3d1b16d1 2023-07-08 jrick time_t timestamp;
2250 3d1b16d1 2023-07-08 jrick *new_commit_id = NULL;
2252 3d1b16d1 2023-07-08 jrick STAILQ_INIT(&parent_ids);
2254 3d1b16d1 2023-07-08 jrick err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
2256 3d1b16d1 2023-07-08 jrick goto done;
2258 3d1b16d1 2023-07-08 jrick err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
2260 3d1b16d1 2023-07-08 jrick goto done;
2262 3d1b16d1 2023-07-08 jrick if (commit_msg_cb != NULL) {
2263 3d1b16d1 2023-07-08 jrick err = commit_msg_cb(commitable_paths, diff_path,
2264 3d1b16d1 2023-07-08 jrick &logmsg, commit_arg);
2266 3d1b16d1 2023-07-08 jrick goto done;
2269 3d1b16d1 2023-07-08 jrick if (logmsg == NULL || strlen(logmsg) == 0) {
2270 3d1b16d1 2023-07-08 jrick err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
2271 3d1b16d1 2023-07-08 jrick goto done;
2274 3d1b16d1 2023-07-08 jrick /* Create blobs from added and modified files and record their IDs. */
2275 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pe, commitable_paths, entry) {
2276 3d1b16d1 2023-07-08 jrick struct got_commitable *ct = pe->data;
2277 3d1b16d1 2023-07-08 jrick char *ondisk_path;
2279 3d1b16d1 2023-07-08 jrick /* Blobs for staged files already exist. */
2280 3d1b16d1 2023-07-08 jrick if (ct->staged_status == GOT_STATUS_ADD ||
2281 3d1b16d1 2023-07-08 jrick ct->staged_status == GOT_STATUS_MODIFY)
2282 3d1b16d1 2023-07-08 jrick continue;
2284 3d1b16d1 2023-07-08 jrick if (ct->status != GOT_STATUS_ADD &&
2285 3d1b16d1 2023-07-08 jrick ct->status != GOT_STATUS_MODIFY &&
2286 3d1b16d1 2023-07-08 jrick ct->status != GOT_STATUS_MODE_CHANGE &&
2287 3d1b16d1 2023-07-08 jrick ct->status != GOT_STATUS_CONFLICT)
2288 3d1b16d1 2023-07-08 jrick continue;
2290 3d1b16d1 2023-07-08 jrick if (asprintf(&ondisk_path, "%s/%s",
2291 3d1b16d1 2023-07-08 jrick worktree->root_path, pe->path) == -1) {
2292 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("asprintf");
2293 3d1b16d1 2023-07-08 jrick goto done;
2295 3d1b16d1 2023-07-08 jrick err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
2296 3d1b16d1 2023-07-08 jrick free(ondisk_path);
2298 3d1b16d1 2023-07-08 jrick goto done;
2301 3d1b16d1 2023-07-08 jrick /* Recursively write new tree objects. */
2302 3d1b16d1 2023-07-08 jrick err = write_tree(&new_tree_id, &nentries, head_tree, "/",
2303 3d1b16d1 2023-07-08 jrick commitable_paths, status_cb, status_arg, repo);
2305 3d1b16d1 2023-07-08 jrick goto done;
2307 3d1b16d1 2023-07-08 jrick err = got_object_qid_alloc(&pid, head_commit_id);
2309 3d1b16d1 2023-07-08 jrick goto done;
2310 3d1b16d1 2023-07-08 jrick STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
2311 3d1b16d1 2023-07-08 jrick nparents++;
2312 3d1b16d1 2023-07-08 jrick if (parent_id2) {
2313 3d1b16d1 2023-07-08 jrick err = got_object_qid_alloc(&pid, parent_id2);
2315 3d1b16d1 2023-07-08 jrick goto done;
2316 3d1b16d1 2023-07-08 jrick STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
2317 3d1b16d1 2023-07-08 jrick nparents++;
2319 3d1b16d1 2023-07-08 jrick timestamp = time(NULL);
2320 3d1b16d1 2023-07-08 jrick err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
2321 3d1b16d1 2023-07-08 jrick nparents, author, timestamp, committer, timestamp, logmsg, repo);
2322 3d1b16d1 2023-07-08 jrick if (logmsg != NULL)
2323 3d1b16d1 2023-07-08 jrick free(logmsg);
2325 3d1b16d1 2023-07-08 jrick goto done;
2327 3d1b16d1 2023-07-08 jrick got_object_id_queue_free(&parent_ids);
2328 3d1b16d1 2023-07-08 jrick if (head_tree)
2329 3d1b16d1 2023-07-08 jrick got_object_tree_close(head_tree);
2330 3d1b16d1 2023-07-08 jrick if (head_commit)
2331 3d1b16d1 2023-07-08 jrick got_object_commit_close(head_commit);
2332 3d1b16d1 2023-07-08 jrick return err;
2335 3d1b16d1 2023-07-08 jrick static const struct got_error *
2336 3d1b16d1 2023-07-08 jrick check_path_is_commitable(const char *path,
2337 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *commitable_paths)
2339 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *cpe = NULL;
2340 3d1b16d1 2023-07-08 jrick size_t path_len = strlen(path);
2342 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(cpe, commitable_paths, entry) {
2343 3d1b16d1 2023-07-08 jrick struct got_commitable *ct = cpe->data;
2344 3d1b16d1 2023-07-08 jrick const char *ct_path = ct->path;
2346 3d1b16d1 2023-07-08 jrick while (ct_path[0] == '/')
2347 3d1b16d1 2023-07-08 jrick ct_path++;
2349 3d1b16d1 2023-07-08 jrick if (strcmp(path, ct_path) == 0 ||
2350 3d1b16d1 2023-07-08 jrick got_path_is_child(ct_path, path, path_len))
2354 3d1b16d1 2023-07-08 jrick if (cpe == NULL)
2355 3d1b16d1 2023-07-08 jrick return got_error_path(path, GOT_ERR_BAD_PATH);
2357 3d1b16d1 2023-07-08 jrick return NULL;
2360 3d1b16d1 2023-07-08 jrick static const struct got_error *
2361 3d1b16d1 2023-07-08 jrick check_staged_file(void *arg, struct got_fileindex_entry *ie)
2363 3d1b16d1 2023-07-08 jrick int *have_staged_files = arg;
2365 3d1b16d1 2023-07-08 jrick if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
2366 3d1b16d1 2023-07-08 jrick *have_staged_files = 1;
2367 3d1b16d1 2023-07-08 jrick return got_error(GOT_ERR_CANCELLED);
2370 3d1b16d1 2023-07-08 jrick return NULL;
2373 3d1b16d1 2023-07-08 jrick static const struct got_error *
2374 3d1b16d1 2023-07-08 jrick check_non_staged_files(struct got_fileindex *fileindex,
2375 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *paths)
2377 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *pe;
2378 3d1b16d1 2023-07-08 jrick struct got_fileindex_entry *ie;
2380 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pe, paths, entry) {
2381 3d1b16d1 2023-07-08 jrick if (pe->path[0] == '\0')
2382 3d1b16d1 2023-07-08 jrick continue;
2383 3d1b16d1 2023-07-08 jrick ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
2384 3d1b16d1 2023-07-08 jrick if (ie == NULL)
2385 3d1b16d1 2023-07-08 jrick return got_error_path(pe->path, GOT_ERR_BAD_PATH);
2386 3d1b16d1 2023-07-08 jrick if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
2387 3d1b16d1 2023-07-08 jrick return got_error_path(pe->path,
2388 3d1b16d1 2023-07-08 jrick GOT_ERR_FILE_NOT_STAGED);
2391 3d1b16d1 2023-07-08 jrick return NULL;
2394 3d1b16d1 2023-07-08 jrick static void
2395 3d1b16d1 2023-07-08 jrick print_load_info(int print_colored, int print_found, int print_trees,
2396 3d1b16d1 2023-07-08 jrick int ncolored, int nfound, int ntrees)
2398 3d1b16d1 2023-07-08 jrick if (print_colored) {
2399 3d1b16d1 2023-07-08 jrick printf("%d commit%s colored", ncolored,
2400 3d1b16d1 2023-07-08 jrick ncolored == 1 ? "" : "s");
2402 3d1b16d1 2023-07-08 jrick if (print_found) {
2403 3d1b16d1 2023-07-08 jrick printf("%s%d object%s found",
2404 3d1b16d1 2023-07-08 jrick ncolored > 0 ? "; " : "",
2405 3d1b16d1 2023-07-08 jrick nfound, nfound == 1 ? "" : "s");
2407 3d1b16d1 2023-07-08 jrick if (print_trees) {
2408 3d1b16d1 2023-07-08 jrick printf("; %d tree%s scanned", ntrees,
2409 3d1b16d1 2023-07-08 jrick ntrees == 1 ? "" : "s");
2413 3d1b16d1 2023-07-08 jrick struct got_send_progress_arg {
2414 3d1b16d1 2023-07-08 jrick char last_scaled_packsize[FMT_SCALED_STRSIZE];
2415 3d1b16d1 2023-07-08 jrick int verbosity;
2416 3d1b16d1 2023-07-08 jrick int last_ncolored;
2417 3d1b16d1 2023-07-08 jrick int last_nfound;
2418 3d1b16d1 2023-07-08 jrick int last_ntrees;
2419 3d1b16d1 2023-07-08 jrick int loading_done;
2420 3d1b16d1 2023-07-08 jrick int last_ncommits;
2421 3d1b16d1 2023-07-08 jrick int last_nobj_total;
2422 3d1b16d1 2023-07-08 jrick int last_p_deltify;
2423 3d1b16d1 2023-07-08 jrick int last_p_written;
2424 3d1b16d1 2023-07-08 jrick int last_p_sent;
2425 3d1b16d1 2023-07-08 jrick int printed_something;
2426 3d1b16d1 2023-07-08 jrick int sent_something;
2427 3d1b16d1 2023-07-08 jrick struct got_pathlist_head *delete_branches;
2430 3d1b16d1 2023-07-08 jrick static const struct got_error *
2431 3d1b16d1 2023-07-08 jrick send_progress(void *arg, int ncolored, int nfound, int ntrees,
2432 3d1b16d1 2023-07-08 jrick off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
2433 3d1b16d1 2023-07-08 jrick int nobj_written, off_t bytes_sent, const char *refname,
2434 3d1b16d1 2023-07-08 jrick const char *errmsg, int success)
2436 3d1b16d1 2023-07-08 jrick struct got_send_progress_arg *a = arg;
2437 3d1b16d1 2023-07-08 jrick char scaled_packsize[FMT_SCALED_STRSIZE];
2438 3d1b16d1 2023-07-08 jrick char scaled_sent[FMT_SCALED_STRSIZE];
2439 3d1b16d1 2023-07-08 jrick int p_deltify = 0, p_written = 0, p_sent = 0;
2440 3d1b16d1 2023-07-08 jrick int print_colored = 0, print_found = 0, print_trees = 0;
2441 3d1b16d1 2023-07-08 jrick int print_searching = 0, print_total = 0;
2442 3d1b16d1 2023-07-08 jrick int print_deltify = 0, print_written = 0, print_sent = 0;
2444 3d1b16d1 2023-07-08 jrick if (a->verbosity < 0)
2445 3d1b16d1 2023-07-08 jrick return NULL;
2447 3d1b16d1 2023-07-08 jrick if (refname) {
2448 3d1b16d1 2023-07-08 jrick const char *status = success ? "accepted" : "rejected";
2450 3d1b16d1 2023-07-08 jrick if (success) {
2451 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *pe;
2452 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pe, a->delete_branches, entry) {
2453 3d1b16d1 2023-07-08 jrick const char *branchname = pe->path;
2454 3d1b16d1 2023-07-08 jrick if (got_path_cmp(branchname, refname,
2455 3d1b16d1 2023-07-08 jrick strlen(branchname), strlen(refname)) == 0) {
2456 3d1b16d1 2023-07-08 jrick status = "deleted";
2457 3d1b16d1 2023-07-08 jrick a->sent_something = 1;
2463 3d1b16d1 2023-07-08 jrick if (a->printed_something)
2464 3d1b16d1 2023-07-08 jrick putchar('\n');
2465 3d1b16d1 2023-07-08 jrick printf("Server has %s %s", status, refname);
2466 3d1b16d1 2023-07-08 jrick if (errmsg)
2467 3d1b16d1 2023-07-08 jrick printf(": %s", errmsg);
2468 3d1b16d1 2023-07-08 jrick a->printed_something = 1;
2469 3d1b16d1 2023-07-08 jrick return NULL;
2472 3d1b16d1 2023-07-08 jrick if (a->last_ncolored != ncolored) {
2473 3d1b16d1 2023-07-08 jrick print_colored = 1;
2474 3d1b16d1 2023-07-08 jrick a->last_ncolored = ncolored;
2477 3d1b16d1 2023-07-08 jrick if (a->last_nfound != nfound) {
2478 3d1b16d1 2023-07-08 jrick print_colored = 1;
2479 3d1b16d1 2023-07-08 jrick print_found = 1;
2480 3d1b16d1 2023-07-08 jrick a->last_nfound = nfound;
2483 3d1b16d1 2023-07-08 jrick if (a->last_ntrees != ntrees) {
2484 3d1b16d1 2023-07-08 jrick print_colored = 1;
2485 3d1b16d1 2023-07-08 jrick print_found = 1;
2486 3d1b16d1 2023-07-08 jrick print_trees = 1;
2487 3d1b16d1 2023-07-08 jrick a->last_ntrees = ntrees;
2490 3d1b16d1 2023-07-08 jrick if ((print_colored || print_found || print_trees) &&
2491 3d1b16d1 2023-07-08 jrick !a->loading_done) {
2492 3d1b16d1 2023-07-08 jrick printf("\r");
2493 3d1b16d1 2023-07-08 jrick print_load_info(print_colored, print_found, print_trees,
2494 3d1b16d1 2023-07-08 jrick ncolored, nfound, ntrees);
2495 3d1b16d1 2023-07-08 jrick a->printed_something = 1;
2496 3d1b16d1 2023-07-08 jrick fflush(stdout);
2497 3d1b16d1 2023-07-08 jrick return NULL;
2498 3d1b16d1 2023-07-08 jrick } else if (!a->loading_done) {
2499 3d1b16d1 2023-07-08 jrick printf("\r");
2500 3d1b16d1 2023-07-08 jrick print_load_info(1, 1, 1, ncolored, nfound, ntrees);
2501 3d1b16d1 2023-07-08 jrick printf("\n");
2502 3d1b16d1 2023-07-08 jrick a->loading_done = 1;
2505 3d1b16d1 2023-07-08 jrick if (fmt_scaled(packfile_size, scaled_packsize) == -1)
2506 3d1b16d1 2023-07-08 jrick return got_error_from_errno("fmt_scaled");
2507 3d1b16d1 2023-07-08 jrick if (fmt_scaled(bytes_sent, scaled_sent) == -1)
2508 3d1b16d1 2023-07-08 jrick return got_error_from_errno("fmt_scaled");
2510 3d1b16d1 2023-07-08 jrick if (a->last_ncommits != ncommits) {
2511 3d1b16d1 2023-07-08 jrick print_searching = 1;
2512 3d1b16d1 2023-07-08 jrick a->last_ncommits = ncommits;
2515 3d1b16d1 2023-07-08 jrick if (a->last_nobj_total != nobj_total) {
2516 3d1b16d1 2023-07-08 jrick print_searching = 1;
2517 3d1b16d1 2023-07-08 jrick print_total = 1;
2518 3d1b16d1 2023-07-08 jrick a->last_nobj_total = nobj_total;
2521 3d1b16d1 2023-07-08 jrick if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
2522 3d1b16d1 2023-07-08 jrick strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
2523 3d1b16d1 2023-07-08 jrick if (strlcpy(a->last_scaled_packsize, scaled_packsize,
2524 3d1b16d1 2023-07-08 jrick FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
2525 3d1b16d1 2023-07-08 jrick return got_error(GOT_ERR_NO_SPACE);
2528 3d1b16d1 2023-07-08 jrick if (nobj_deltify > 0 || nobj_written > 0) {
2529 3d1b16d1 2023-07-08 jrick if (nobj_deltify > 0) {
2530 3d1b16d1 2023-07-08 jrick p_deltify = (nobj_deltify * 100) / nobj_total;
2531 3d1b16d1 2023-07-08 jrick if (p_deltify != a->last_p_deltify) {
2532 3d1b16d1 2023-07-08 jrick a->last_p_deltify = p_deltify;
2533 3d1b16d1 2023-07-08 jrick print_searching = 1;
2534 3d1b16d1 2023-07-08 jrick print_total = 1;
2535 3d1b16d1 2023-07-08 jrick print_deltify = 1;
2538 3d1b16d1 2023-07-08 jrick if (nobj_written > 0) {
2539 3d1b16d1 2023-07-08 jrick p_written = (nobj_written * 100) / nobj_total;
2540 3d1b16d1 2023-07-08 jrick if (p_written != a->last_p_written) {
2541 3d1b16d1 2023-07-08 jrick a->last_p_written = p_written;
2542 3d1b16d1 2023-07-08 jrick print_searching = 1;
2543 3d1b16d1 2023-07-08 jrick print_total = 1;
2544 3d1b16d1 2023-07-08 jrick print_deltify = 1;
2545 3d1b16d1 2023-07-08 jrick print_written = 1;
2550 3d1b16d1 2023-07-08 jrick if (bytes_sent > 0) {
2551 3d1b16d1 2023-07-08 jrick p_sent = (bytes_sent * 100) / packfile_size;
2552 3d1b16d1 2023-07-08 jrick if (p_sent != a->last_p_sent) {
2553 3d1b16d1 2023-07-08 jrick a->last_p_sent = p_sent;
2554 3d1b16d1 2023-07-08 jrick print_searching = 1;
2555 3d1b16d1 2023-07-08 jrick print_total = 1;
2556 3d1b16d1 2023-07-08 jrick print_deltify = 1;
2557 3d1b16d1 2023-07-08 jrick print_written = 1;
2558 3d1b16d1 2023-07-08 jrick print_sent = 1;
2560 3d1b16d1 2023-07-08 jrick a->sent_something = 1;
2563 3d1b16d1 2023-07-08 jrick if (print_searching || print_total || print_deltify || print_written ||
2564 3d1b16d1 2023-07-08 jrick print_sent)
2565 3d1b16d1 2023-07-08 jrick printf("\r");
2566 3d1b16d1 2023-07-08 jrick if (print_searching)
2567 3d1b16d1 2023-07-08 jrick printf("packing %d reference%s", ncommits,
2568 3d1b16d1 2023-07-08 jrick ncommits == 1 ? "" : "s");
2569 3d1b16d1 2023-07-08 jrick if (print_total)
2570 3d1b16d1 2023-07-08 jrick printf("; %d object%s", nobj_total,
2571 3d1b16d1 2023-07-08 jrick nobj_total == 1 ? "" : "s");
2572 3d1b16d1 2023-07-08 jrick if (print_deltify)
2573 3d1b16d1 2023-07-08 jrick printf("; deltify: %d%%", p_deltify);
2574 3d1b16d1 2023-07-08 jrick if (print_sent)
2575 3d1b16d1 2023-07-08 jrick printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
2576 3d1b16d1 2023-07-08 jrick scaled_packsize, p_sent);
2577 3d1b16d1 2023-07-08 jrick else if (print_written)
2578 3d1b16d1 2023-07-08 jrick printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
2579 3d1b16d1 2023-07-08 jrick scaled_packsize, p_written);
2580 3d1b16d1 2023-07-08 jrick if (print_searching || print_total || print_deltify ||
2581 3d1b16d1 2023-07-08 jrick print_written || print_sent) {
2582 3d1b16d1 2023-07-08 jrick a->printed_something = 1;
2583 3d1b16d1 2023-07-08 jrick fflush(stdout);
2585 3d1b16d1 2023-07-08 jrick return NULL;
2588 3d1b16d1 2023-07-08 jrick struct got_fetch_progress_arg {
2589 3d1b16d1 2023-07-08 jrick char last_scaled_size[FMT_SCALED_STRSIZE];
2590 3d1b16d1 2023-07-08 jrick int last_p_indexed;
2591 3d1b16d1 2023-07-08 jrick int last_p_resolved;
2592 3d1b16d1 2023-07-08 jrick int verbosity;
2594 3d1b16d1 2023-07-08 jrick struct got_repository *repo;
2597 3d1b16d1 2023-07-08 jrick static const struct got_error *
2598 3d1b16d1 2023-07-08 jrick fetch_progress(void *arg, const char *message, off_t packfile_size,
2599 3d1b16d1 2023-07-08 jrick int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
2601 3d1b16d1 2023-07-08 jrick struct got_fetch_progress_arg *a = arg;
2602 3d1b16d1 2023-07-08 jrick char scaled_size[FMT_SCALED_STRSIZE];
2603 3d1b16d1 2023-07-08 jrick int p_indexed, p_resolved;
2604 3d1b16d1 2023-07-08 jrick int print_size = 0, print_indexed = 0, print_resolved = 0;
2606 3d1b16d1 2023-07-08 jrick if (a->verbosity < 0)
2607 3d1b16d1 2023-07-08 jrick return NULL;
2609 3d1b16d1 2023-07-08 jrick if (message && message[0] != '\0') {
2610 3d1b16d1 2023-07-08 jrick printf("\rserver: %s", message);
2611 3d1b16d1 2023-07-08 jrick fflush(stdout);
2612 3d1b16d1 2023-07-08 jrick return NULL;
2615 3d1b16d1 2023-07-08 jrick if (packfile_size > 0 || nobj_indexed > 0) {
2616 3d1b16d1 2023-07-08 jrick if (fmt_scaled(packfile_size, scaled_size) == 0 &&
2617 3d1b16d1 2023-07-08 jrick (a->last_scaled_size[0] == '\0' ||
2618 3d1b16d1 2023-07-08 jrick strcmp(scaled_size, a->last_scaled_size)) != 0) {
2619 3d1b16d1 2023-07-08 jrick print_size = 1;
2620 3d1b16d1 2023-07-08 jrick if (strlcpy(a->last_scaled_size, scaled_size,
2621 3d1b16d1 2023-07-08 jrick FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
2622 3d1b16d1 2023-07-08 jrick return got_error(GOT_ERR_NO_SPACE);
2624 3d1b16d1 2023-07-08 jrick if (nobj_indexed > 0) {
2625 3d1b16d1 2023-07-08 jrick p_indexed = (nobj_indexed * 100) / nobj_total;
2626 3d1b16d1 2023-07-08 jrick if (p_indexed != a->last_p_indexed) {
2627 3d1b16d1 2023-07-08 jrick a->last_p_indexed = p_indexed;
2628 3d1b16d1 2023-07-08 jrick print_indexed = 1;
2629 3d1b16d1 2023-07-08 jrick print_size = 1;
2632 3d1b16d1 2023-07-08 jrick if (nobj_resolved > 0) {
2633 3d1b16d1 2023-07-08 jrick p_resolved = (nobj_resolved * 100) /
2634 3d1b16d1 2023-07-08 jrick (nobj_total - nobj_loose);
2635 3d1b16d1 2023-07-08 jrick if (p_resolved != a->last_p_resolved) {
2636 3d1b16d1 2023-07-08 jrick a->last_p_resolved = p_resolved;
2637 3d1b16d1 2023-07-08 jrick print_resolved = 1;
2638 3d1b16d1 2023-07-08 jrick print_indexed = 1;
2639 3d1b16d1 2023-07-08 jrick print_size = 1;
2644 3d1b16d1 2023-07-08 jrick if (print_size || print_indexed || print_resolved)
2645 3d1b16d1 2023-07-08 jrick printf("\r");
2646 3d1b16d1 2023-07-08 jrick if (print_size)
2647 3d1b16d1 2023-07-08 jrick printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
2648 3d1b16d1 2023-07-08 jrick if (print_indexed)
2649 3d1b16d1 2023-07-08 jrick printf("; indexing %d%%", p_indexed);
2650 3d1b16d1 2023-07-08 jrick if (print_resolved)
2651 3d1b16d1 2023-07-08 jrick printf("; resolving deltas %d%%", p_resolved);
2652 3d1b16d1 2023-07-08 jrick if (print_size || print_indexed || print_resolved) {
2653 3d1b16d1 2023-07-08 jrick putchar('\n');
2654 3d1b16d1 2023-07-08 jrick fflush(stdout);
2657 3d1b16d1 2023-07-08 jrick return NULL;
2660 3d1b16d1 2023-07-08 jrick static const struct got_error *
2661 3d1b16d1 2023-07-08 jrick create_symref(const char *refname, struct got_reference *target_ref,
2662 3d1b16d1 2023-07-08 jrick int verbosity, struct got_repository *repo)
2664 3d1b16d1 2023-07-08 jrick const struct got_error *err;
2665 3d1b16d1 2023-07-08 jrick struct got_reference *head_symref;
2667 3d1b16d1 2023-07-08 jrick err = got_ref_alloc_symref(&head_symref, refname, target_ref);
2669 3d1b16d1 2023-07-08 jrick return err;
2671 3d1b16d1 2023-07-08 jrick err = got_ref_write(head_symref, repo);
2672 3d1b16d1 2023-07-08 jrick if (err == NULL && verbosity > 0) {
2673 3d1b16d1 2023-07-08 jrick printf("Created reference %s: %s\n", GOT_REF_HEAD,
2674 3d1b16d1 2023-07-08 jrick got_ref_get_name(target_ref));
2676 3d1b16d1 2023-07-08 jrick got_ref_close(head_symref);
2677 3d1b16d1 2023-07-08 jrick return err;
2680 3d1b16d1 2023-07-08 jrick static const struct got_error *
2681 3d1b16d1 2023-07-08 jrick create_ref(const char *refname, struct got_object_id *id,
2682 3d1b16d1 2023-07-08 jrick int verbosity, struct got_repository *repo)
2684 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
2685 3d1b16d1 2023-07-08 jrick struct got_reference *ref;
2686 3d1b16d1 2023-07-08 jrick char *id_str;
2688 3d1b16d1 2023-07-08 jrick err = got_object_id_str(&id_str, id);
2690 3d1b16d1 2023-07-08 jrick return err;
2692 3d1b16d1 2023-07-08 jrick err = got_ref_alloc(&ref, refname, id);
2694 3d1b16d1 2023-07-08 jrick goto done;
2696 3d1b16d1 2023-07-08 jrick err = got_ref_write(ref, repo);
2697 3d1b16d1 2023-07-08 jrick got_ref_close(ref);
2699 3d1b16d1 2023-07-08 jrick if (err == NULL && verbosity >= 0)
2700 3d1b16d1 2023-07-08 jrick printf("Created reference %s: %s\n", refname, id_str);
2702 3d1b16d1 2023-07-08 jrick free(id_str);
2703 3d1b16d1 2023-07-08 jrick return err;
2706 3d1b16d1 2023-07-08 jrick static const struct got_error *
2707 3d1b16d1 2023-07-08 jrick update_ref(struct got_reference *ref, struct got_object_id *new_id,
2708 3d1b16d1 2023-07-08 jrick int verbosity, struct got_repository *repo)
2710 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL;
2711 3d1b16d1 2023-07-08 jrick char *new_id_str = NULL;
2712 3d1b16d1 2023-07-08 jrick struct got_object_id *old_id = NULL;
2714 3d1b16d1 2023-07-08 jrick err = got_object_id_str(&new_id_str, new_id);
2716 3d1b16d1 2023-07-08 jrick goto done;
2718 3d1b16d1 2023-07-08 jrick if (strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
2719 3d1b16d1 2023-07-08 jrick err = got_ref_resolve(&old_id, repo, ref);
2721 3d1b16d1 2023-07-08 jrick goto done;
2722 3d1b16d1 2023-07-08 jrick if (got_object_id_cmp(old_id, new_id) == 0)
2723 3d1b16d1 2023-07-08 jrick goto done;
2724 3d1b16d1 2023-07-08 jrick if (verbosity >= 0) {
2725 3d1b16d1 2023-07-08 jrick printf("Rejecting update of existing tag %s: %s\n",
2726 3d1b16d1 2023-07-08 jrick got_ref_get_name(ref), new_id_str);
2728 3d1b16d1 2023-07-08 jrick goto done;
2731 3d1b16d1 2023-07-08 jrick if (got_ref_is_symbolic(ref)) {
2732 3d1b16d1 2023-07-08 jrick if (verbosity >= 0) {
2733 3d1b16d1 2023-07-08 jrick printf("Replacing reference %s: %s\n",
2734 3d1b16d1 2023-07-08 jrick got_ref_get_name(ref),
2735 3d1b16d1 2023-07-08 jrick got_ref_get_symref_target(ref));
2737 3d1b16d1 2023-07-08 jrick err = got_ref_change_symref_to_ref(ref, new_id);
2739 3d1b16d1 2023-07-08 jrick goto done;
2740 3d1b16d1 2023-07-08 jrick err = got_ref_write(ref, repo);
2742 3d1b16d1 2023-07-08 jrick goto done;
2744 3d1b16d1 2023-07-08 jrick err = got_ref_resolve(&old_id, repo, ref);
2746 3d1b16d1 2023-07-08 jrick goto done;
2747 3d1b16d1 2023-07-08 jrick if (got_object_id_cmp(old_id, new_id) == 0)
2748 3d1b16d1 2023-07-08 jrick goto done;
2750 3d1b16d1 2023-07-08 jrick err = got_ref_change_ref(ref, new_id);
2752 3d1b16d1 2023-07-08 jrick goto done;
2753 3d1b16d1 2023-07-08 jrick err = got_ref_write(ref, repo);
2755 3d1b16d1 2023-07-08 jrick goto done;
2758 3d1b16d1 2023-07-08 jrick if (verbosity >= 0)
2759 3d1b16d1 2023-07-08 jrick printf("Updated %s: %s\n", got_ref_get_name(ref),
2760 3d1b16d1 2023-07-08 jrick new_id_str);
2762 3d1b16d1 2023-07-08 jrick free(old_id);
2763 3d1b16d1 2023-07-08 jrick free(new_id_str);
2764 3d1b16d1 2023-07-08 jrick return err;
2767 3d1b16d1 2023-07-08 jrick static const struct got_error *
2768 3d1b16d1 2023-07-08 jrick fetch_updated_remote(const char *proto, const char *host, const char *port,
2769 3d1b16d1 2023-07-08 jrick const char *server_path, int verbosity,
2770 3d1b16d1 2023-07-08 jrick const struct got_remote_repo *remote, struct got_repository *repo,
2771 3d1b16d1 2023-07-08 jrick struct got_reference *head_ref, const char *head_refname)
2773 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL, *unlock_err = NULL;
2774 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *pe;
2775 3d1b16d1 2023-07-08 jrick struct got_pathlist_head learned_refs;
2776 3d1b16d1 2023-07-08 jrick struct got_pathlist_head symrefs;
2777 3d1b16d1 2023-07-08 jrick struct got_pathlist_head wanted_branches;
2778 3d1b16d1 2023-07-08 jrick struct got_pathlist_head wanted_refs;
2779 3d1b16d1 2023-07-08 jrick struct got_object_id *pack_hash;
2780 3d1b16d1 2023-07-08 jrick struct got_fetch_progress_arg fpa;
2781 3d1b16d1 2023-07-08 jrick int fetchfd = -1;
2782 3d1b16d1 2023-07-08 jrick pid_t fetchpid = -1;
2784 3d1b16d1 2023-07-08 jrick TAILQ_INIT(&learned_refs);
2785 3d1b16d1 2023-07-08 jrick TAILQ_INIT(&symrefs);
2786 3d1b16d1 2023-07-08 jrick TAILQ_INIT(&wanted_branches);
2787 3d1b16d1 2023-07-08 jrick TAILQ_INIT(&wanted_refs);
2789 3d1b16d1 2023-07-08 jrick err = got_pathlist_insert(NULL, &wanted_branches, head_refname,
2792 3d1b16d1 2023-07-08 jrick goto done;
2794 3d1b16d1 2023-07-08 jrick err = got_fetch_connect(&fetchpid, &fetchfd, proto, host,
2795 3d1b16d1 2023-07-08 jrick port, server_path, verbosity);
2797 3d1b16d1 2023-07-08 jrick goto done;
2799 3d1b16d1 2023-07-08 jrick fpa.last_scaled_size[0] = '\0';
2800 3d1b16d1 2023-07-08 jrick fpa.last_p_indexed = -1;
2801 3d1b16d1 2023-07-08 jrick fpa.last_p_resolved = -1;
2802 3d1b16d1 2023-07-08 jrick fpa.verbosity = verbosity;
2803 3d1b16d1 2023-07-08 jrick fpa.repo = repo;
2805 3d1b16d1 2023-07-08 jrick err = got_fetch_pack(&pack_hash, &learned_refs, &symrefs,
2806 3d1b16d1 2023-07-08 jrick remote->name, 1, 0, &wanted_branches, &wanted_refs, 0, verbosity,
2807 3d1b16d1 2023-07-08 jrick fetchfd, repo, head_refname, NULL, 0, fetch_progress, &fpa);
2809 3d1b16d1 2023-07-08 jrick goto done;
2811 3d1b16d1 2023-07-08 jrick /* Update references provided with the pack file. */
2812 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pe, &learned_refs, entry) {
2813 3d1b16d1 2023-07-08 jrick const char *refname = pe->path;
2814 3d1b16d1 2023-07-08 jrick struct got_object_id *id = pe->data;
2815 3d1b16d1 2023-07-08 jrick struct got_reference *ref;
2817 3d1b16d1 2023-07-08 jrick err = got_ref_open(&ref, repo, refname, 0);
2818 3d1b16d1 2023-07-08 jrick if (err) {
2819 3d1b16d1 2023-07-08 jrick if (err->code != GOT_ERR_NOT_REF)
2820 3d1b16d1 2023-07-08 jrick goto done;
2821 3d1b16d1 2023-07-08 jrick err = create_ref(refname, id, verbosity, repo);
2823 3d1b16d1 2023-07-08 jrick goto done;
2825 3d1b16d1 2023-07-08 jrick err = update_ref(ref, id, verbosity, repo);
2826 3d1b16d1 2023-07-08 jrick unlock_err = got_ref_unlock(ref);
2827 3d1b16d1 2023-07-08 jrick if (unlock_err && err == NULL)
2828 3d1b16d1 2023-07-08 jrick err = unlock_err;
2829 3d1b16d1 2023-07-08 jrick got_ref_close(ref);
2831 3d1b16d1 2023-07-08 jrick goto done;
2835 3d1b16d1 2023-07-08 jrick /* Set the HEAD reference if the server provided one. */
2836 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pe, &symrefs, entry) {
2837 3d1b16d1 2023-07-08 jrick struct got_reference *target_ref;
2838 3d1b16d1 2023-07-08 jrick const char *refname = pe->path;
2839 3d1b16d1 2023-07-08 jrick const char *target = pe->data;
2840 3d1b16d1 2023-07-08 jrick char *remote_refname = NULL, *remote_target = NULL;
2842 3d1b16d1 2023-07-08 jrick if (strcmp(refname, GOT_REF_HEAD) != 0)
2843 3d1b16d1 2023-07-08 jrick continue;
2845 3d1b16d1 2023-07-08 jrick err = got_ref_open(&target_ref, repo, target, 0);
2846 3d1b16d1 2023-07-08 jrick if (err) {
2847 3d1b16d1 2023-07-08 jrick if (err->code == GOT_ERR_NOT_REF) {
2848 3d1b16d1 2023-07-08 jrick err = NULL;
2849 3d1b16d1 2023-07-08 jrick continue;
2851 3d1b16d1 2023-07-08 jrick goto done;
2854 3d1b16d1 2023-07-08 jrick err = create_symref(refname, target_ref, verbosity, repo);
2855 3d1b16d1 2023-07-08 jrick got_ref_close(target_ref);
2857 3d1b16d1 2023-07-08 jrick goto done;
2859 3d1b16d1 2023-07-08 jrick if (remote->mirror_references)
2860 3d1b16d1 2023-07-08 jrick continue;
2862 3d1b16d1 2023-07-08 jrick if (strncmp("refs/heads/", target, 11) != 0)
2863 3d1b16d1 2023-07-08 jrick continue;
2865 3d1b16d1 2023-07-08 jrick if (asprintf(&remote_refname,
2866 3d1b16d1 2023-07-08 jrick "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
2867 3d1b16d1 2023-07-08 jrick refname) == -1) {
2868 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("asprintf");
2869 3d1b16d1 2023-07-08 jrick goto done;
2871 3d1b16d1 2023-07-08 jrick if (asprintf(&remote_target,
2872 3d1b16d1 2023-07-08 jrick "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
2873 3d1b16d1 2023-07-08 jrick target + 11) == -1) {
2874 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("asprintf");
2875 3d1b16d1 2023-07-08 jrick free(remote_refname);
2876 3d1b16d1 2023-07-08 jrick goto done;
2878 3d1b16d1 2023-07-08 jrick err = got_ref_open(&target_ref, repo, remote_target, 0);
2879 3d1b16d1 2023-07-08 jrick if (err) {
2880 3d1b16d1 2023-07-08 jrick free(remote_refname);
2881 3d1b16d1 2023-07-08 jrick free(remote_target);
2882 3d1b16d1 2023-07-08 jrick if (err->code == GOT_ERR_NOT_REF) {
2883 3d1b16d1 2023-07-08 jrick err = NULL;
2884 3d1b16d1 2023-07-08 jrick continue;
2886 3d1b16d1 2023-07-08 jrick goto done;
2888 3d1b16d1 2023-07-08 jrick err = create_symref(remote_refname, target_ref,
2889 3d1b16d1 2023-07-08 jrick verbosity - 1, repo);
2890 3d1b16d1 2023-07-08 jrick free(remote_refname);
2891 3d1b16d1 2023-07-08 jrick free(remote_target);
2892 3d1b16d1 2023-07-08 jrick got_ref_close(target_ref);
2894 3d1b16d1 2023-07-08 jrick goto done;
2898 3d1b16d1 2023-07-08 jrick got_pathlist_free(&learned_refs, GOT_PATHLIST_FREE_NONE);
2899 3d1b16d1 2023-07-08 jrick got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_NONE);
2900 3d1b16d1 2023-07-08 jrick got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
2901 3d1b16d1 2023-07-08 jrick got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
2902 3d1b16d1 2023-07-08 jrick return err;
2906 3d1b16d1 2023-07-08 jrick const struct got_error *
2907 3d1b16d1 2023-07-08 jrick got_worktree_cvg_commit(struct got_object_id **new_commit_id,
2908 3d1b16d1 2023-07-08 jrick struct got_worktree *worktree, struct got_pathlist_head *paths,
2909 3d1b16d1 2023-07-08 jrick const char *author, const char *committer, int allow_bad_symlinks,
2910 3d1b16d1 2023-07-08 jrick int show_diff, int commit_conflicts,
2911 3d1b16d1 2023-07-08 jrick got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
2912 3d1b16d1 2023-07-08 jrick got_worktree_status_cb status_cb, void *status_arg,
2913 3d1b16d1 2023-07-08 jrick const char *proto, const char *host, const char *port,
2914 3d1b16d1 2023-07-08 jrick const char *server_path, int verbosity,
2915 3d1b16d1 2023-07-08 jrick const struct got_remote_repo *remote,
2916 3d1b16d1 2023-07-08 jrick got_cancel_cb check_cancelled,
2917 3d1b16d1 2023-07-08 jrick struct got_repository *repo)
2919 3d1b16d1 2023-07-08 jrick const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
2920 3d1b16d1 2023-07-08 jrick struct got_fileindex *fileindex = NULL;
2921 3d1b16d1 2023-07-08 jrick char *fileindex_path = NULL;
2922 3d1b16d1 2023-07-08 jrick struct got_pathlist_head commitable_paths;
2923 3d1b16d1 2023-07-08 jrick struct collect_commitables_arg cc_arg;
2924 3d1b16d1 2023-07-08 jrick struct got_pathlist_entry *pe;
2925 3d1b16d1 2023-07-08 jrick struct got_reference *head_ref = NULL, *head_ref2 = NULL;
2926 3d1b16d1 2023-07-08 jrick struct got_reference *commit_ref = NULL;
2927 3d1b16d1 2023-07-08 jrick struct got_object_id *head_commit_id = NULL;
2928 3d1b16d1 2023-07-08 jrick struct got_object_id *head_commit_id2 = NULL;
2929 3d1b16d1 2023-07-08 jrick char *head_refname = NULL;
2930 3d1b16d1 2023-07-08 jrick char *commit_refname = NULL;
2931 3d1b16d1 2023-07-08 jrick char *diff_path = NULL;
2932 3d1b16d1 2023-07-08 jrick int have_staged_files = 0;
2933 3d1b16d1 2023-07-08 jrick int sendfd = -1;
2934 3d1b16d1 2023-07-08 jrick pid_t sendpid = -1;
2935 3d1b16d1 2023-07-08 jrick struct got_send_progress_arg spa;
2936 3d1b16d1 2023-07-08 jrick struct got_pathlist_head commit_reflist;
2937 3d1b16d1 2023-07-08 jrick struct got_pathlist_head tag_names;
2938 3d1b16d1 2023-07-08 jrick struct got_pathlist_head delete_branches;
2940 3d1b16d1 2023-07-08 jrick *new_commit_id = NULL;
2942 3d1b16d1 2023-07-08 jrick memset(&cc_arg, 0, sizeof(cc_arg));
2943 3d1b16d1 2023-07-08 jrick TAILQ_INIT(&commitable_paths);
2944 3d1b16d1 2023-07-08 jrick TAILQ_INIT(&commit_reflist);
2945 3d1b16d1 2023-07-08 jrick TAILQ_INIT(&tag_names);
2946 3d1b16d1 2023-07-08 jrick TAILQ_INIT(&delete_branches);
2948 3d1b16d1 2023-07-08 jrick err = lock_worktree(worktree, LOCK_EX);
2950 3d1b16d1 2023-07-08 jrick goto done;
2952 3d1b16d1 2023-07-08 jrick err = got_worktree_cvg_get_commit_ref_name(&commit_refname,
2953 3d1b16d1 2023-07-08 jrick worktree);
2955 3d1b16d1 2023-07-08 jrick goto done;
2957 3d1b16d1 2023-07-08 jrick head_refname = worktree->head_ref_name;
2958 3d1b16d1 2023-07-08 jrick err = got_ref_open(&head_ref, repo, head_refname, 0);
2960 3d1b16d1 2023-07-08 jrick goto done;
2961 3d1b16d1 2023-07-08 jrick err = got_ref_resolve(&head_commit_id, repo, head_ref);
2963 3d1b16d1 2023-07-08 jrick goto done;
2965 3d1b16d1 2023-07-08 jrick err = got_ref_alloc(&commit_ref, commit_refname, head_commit_id);
2967 3d1b16d1 2023-07-08 jrick goto done;
2968 3d1b16d1 2023-07-08 jrick err = got_ref_write(commit_ref, repo);
2970 3d1b16d1 2023-07-08 jrick goto done;
2972 3d1b16d1 2023-07-08 jrick err = open_fileindex(&fileindex, &fileindex_path, worktree);
2974 3d1b16d1 2023-07-08 jrick goto done;
2976 3d1b16d1 2023-07-08 jrick err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
2977 3d1b16d1 2023-07-08 jrick &have_staged_files);
2978 3d1b16d1 2023-07-08 jrick if (err && err->code != GOT_ERR_CANCELLED)
2979 3d1b16d1 2023-07-08 jrick goto done;
2980 3d1b16d1 2023-07-08 jrick if (have_staged_files) {
2981 3d1b16d1 2023-07-08 jrick err = check_non_staged_files(fileindex, paths);
2983 3d1b16d1 2023-07-08 jrick goto done;
2986 3d1b16d1 2023-07-08 jrick cc_arg.commitable_paths = &commitable_paths;
2987 3d1b16d1 2023-07-08 jrick cc_arg.worktree = worktree;
2988 3d1b16d1 2023-07-08 jrick cc_arg.fileindex = fileindex;
2989 3d1b16d1 2023-07-08 jrick cc_arg.repo = repo;
2990 3d1b16d1 2023-07-08 jrick cc_arg.have_staged_files = have_staged_files;
2991 3d1b16d1 2023-07-08 jrick cc_arg.allow_bad_symlinks = allow_bad_symlinks;
2992 3d1b16d1 2023-07-08 jrick cc_arg.diff_header_shown = 0;
2993 3d1b16d1 2023-07-08 jrick cc_arg.commit_conflicts = commit_conflicts;
2994 3d1b16d1 2023-07-08 jrick if (show_diff) {
2995 3d1b16d1 2023-07-08 jrick err = got_opentemp_named(&diff_path, &cc_arg.diff_outfile,
2996 3d1b16d1 2023-07-08 jrick GOT_TMPDIR_STR "/got", ".diff");
2998 3d1b16d1 2023-07-08 jrick goto done;
2999 3d1b16d1 2023-07-08 jrick cc_arg.f1 = got_opentemp();
3000 3d1b16d1 2023-07-08 jrick if (cc_arg.f1 == NULL) {
3001 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("got_opentemp");
3002 3d1b16d1 2023-07-08 jrick goto done;
3004 3d1b16d1 2023-07-08 jrick cc_arg.f2 = got_opentemp();
3005 3d1b16d1 2023-07-08 jrick if (cc_arg.f2 == NULL) {
3006 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("got_opentemp");
3007 3d1b16d1 2023-07-08 jrick goto done;
3011 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pe, paths, entry) {
3012 3d1b16d1 2023-07-08 jrick err = worktree_status(worktree, pe->path, fileindex, repo,
3013 3d1b16d1 2023-07-08 jrick collect_commitables, &cc_arg, NULL, NULL, 0, 0);
3015 3d1b16d1 2023-07-08 jrick goto done;
3018 3d1b16d1 2023-07-08 jrick if (show_diff) {
3019 3d1b16d1 2023-07-08 jrick if (fflush(cc_arg.diff_outfile) == EOF) {
3020 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("fflush");
3021 3d1b16d1 2023-07-08 jrick goto done;
3025 3d1b16d1 2023-07-08 jrick if (TAILQ_EMPTY(&commitable_paths)) {
3026 3d1b16d1 2023-07-08 jrick err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
3027 3d1b16d1 2023-07-08 jrick goto done;
3030 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pe, paths, entry) {
3031 3d1b16d1 2023-07-08 jrick err = check_path_is_commitable(pe->path, &commitable_paths);
3033 3d1b16d1 2023-07-08 jrick goto done;
3036 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pe, &commitable_paths, entry) {
3037 3d1b16d1 2023-07-08 jrick struct got_commitable *ct = pe->data;
3038 3d1b16d1 2023-07-08 jrick const char *ct_path = ct->in_repo_path;
3040 3d1b16d1 2023-07-08 jrick while (ct_path[0] == '/')
3041 3d1b16d1 2023-07-08 jrick ct_path++;
3042 3d1b16d1 2023-07-08 jrick err = check_out_of_date(ct_path, ct->status,
3043 3d1b16d1 2023-07-08 jrick ct->staged_status, ct->base_blob_id, ct->base_commit_id,
3044 3d1b16d1 2023-07-08 jrick head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
3046 3d1b16d1 2023-07-08 jrick goto done;
3049 3d1b16d1 2023-07-08 jrick err = commit_worktree(new_commit_id, &commitable_paths,
3050 3d1b16d1 2023-07-08 jrick head_commit_id, NULL, worktree, author, committer,
3051 3d1b16d1 2023-07-08 jrick (diff_path && cc_arg.diff_header_shown) ? diff_path : NULL,
3052 3d1b16d1 2023-07-08 jrick commit_msg_cb, commit_arg, status_cb, status_arg, repo);
3054 3d1b16d1 2023-07-08 jrick goto done;
3057 3d1b16d1 2023-07-08 jrick * Check if a concurrent commit to our branch has occurred.
3058 3d1b16d1 2023-07-08 jrick * Lock the reference here to prevent concurrent modification.
3060 3d1b16d1 2023-07-08 jrick err = got_ref_open(&head_ref2, repo, head_refname, 1);
3062 3d1b16d1 2023-07-08 jrick goto done;
3063 3d1b16d1 2023-07-08 jrick err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
3065 3d1b16d1 2023-07-08 jrick goto done;
3066 3d1b16d1 2023-07-08 jrick if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
3067 3d1b16d1 2023-07-08 jrick err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
3068 3d1b16d1 2023-07-08 jrick goto done;
3071 3d1b16d1 2023-07-08 jrick err = got_pathlist_append(&commit_reflist, commit_refname,
3072 3d1b16d1 2023-07-08 jrick head_refname);
3074 3d1b16d1 2023-07-08 jrick goto done;
3076 3d1b16d1 2023-07-08 jrick /* Update commit ref in repository. */
3077 3d1b16d1 2023-07-08 jrick err = got_ref_change_ref(commit_ref, *new_commit_id);
3079 3d1b16d1 2023-07-08 jrick goto done;
3080 3d1b16d1 2023-07-08 jrick err = got_ref_write(commit_ref, repo);
3082 3d1b16d1 2023-07-08 jrick goto done;
3084 3d1b16d1 2023-07-08 jrick if (verbosity >= 0) {
3085 3d1b16d1 2023-07-08 jrick printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
3086 3d1b16d1 2023-07-08 jrick remote->name, proto, host,
3087 3d1b16d1 2023-07-08 jrick port ? ":" : "", port ? port : "",
3088 3d1b16d1 2023-07-08 jrick *server_path == '/' ? "" : "/", server_path);
3091 3d1b16d1 2023-07-08 jrick /* Attempt send to remote branch. */
3092 3d1b16d1 2023-07-08 jrick err = got_send_connect(&sendpid, &sendfd, proto, host, port,
3093 3d1b16d1 2023-07-08 jrick server_path, verbosity);
3095 3d1b16d1 2023-07-08 jrick goto done;
3097 3d1b16d1 2023-07-08 jrick memset(&spa, 0, sizeof(spa));
3098 3d1b16d1 2023-07-08 jrick spa.last_scaled_packsize[0] = '\0';
3099 3d1b16d1 2023-07-08 jrick spa.last_p_deltify = -1;
3100 3d1b16d1 2023-07-08 jrick spa.last_p_written = -1;
3101 3d1b16d1 2023-07-08 jrick spa.verbosity = verbosity;
3102 3d1b16d1 2023-07-08 jrick spa.delete_branches = &delete_branches;
3103 3d1b16d1 2023-07-08 jrick err = got_send_pack(remote->name, &commit_reflist, &tag_names,
3104 3d1b16d1 2023-07-08 jrick &delete_branches, verbosity, 0, sendfd, repo, send_progress, &spa,
3105 3d1b16d1 2023-07-08 jrick check_cancelled, NULL);
3106 3d1b16d1 2023-07-08 jrick if (spa.printed_something)
3107 3d1b16d1 2023-07-08 jrick putchar('\n');
3108 3d1b16d1 2023-07-08 jrick if (err != NULL && err->code == GOT_ERR_SEND_ANCESTRY) {
3110 3d1b16d1 2023-07-08 jrick * Fetch new changes since remote has diverged.
3111 3d1b16d1 2023-07-08 jrick * No trivial-rebase yet; require update to be run manually.
3113 3d1b16d1 2023-07-08 jrick err = fetch_updated_remote(proto, host, port, server_path,
3114 3d1b16d1 2023-07-08 jrick verbosity, remote, repo, head_ref, head_refname);
3115 3d1b16d1 2023-07-08 jrick if (err == NULL)
3116 3d1b16d1 2023-07-08 jrick goto done;
3117 3d1b16d1 2023-07-08 jrick err = got_error(GOT_ERR_COMMIT_OUT_OF_DATE);
3118 3d1b16d1 2023-07-08 jrick goto done;
3119 3d1b16d1 2023-07-08 jrick /* XXX: Rebase commit over fetched remote branch. */
3121 3d1b16d1 2023-07-08 jrick if (err) {
3122 3d1b16d1 2023-07-08 jrick goto done;
3125 3d1b16d1 2023-07-08 jrick /* Update branch head in repository. */
3126 3d1b16d1 2023-07-08 jrick err = got_ref_change_ref(head_ref2, *new_commit_id);
3128 3d1b16d1 2023-07-08 jrick goto done;
3129 3d1b16d1 2023-07-08 jrick err = got_ref_write(head_ref2, repo);
3131 3d1b16d1 2023-07-08 jrick goto done;
3133 3d1b16d1 2023-07-08 jrick err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
3135 3d1b16d1 2023-07-08 jrick goto done;
3137 3d1b16d1 2023-07-08 jrick err = ref_base_commit(worktree, repo);
3139 3d1b16d1 2023-07-08 jrick goto done;
3141 3d1b16d1 2023-07-08 jrick /* XXX: fileindex must be updated for other fetched changes? */
3142 3d1b16d1 2023-07-08 jrick err = update_fileindex_after_commit(worktree, &commitable_paths,
3143 3d1b16d1 2023-07-08 jrick *new_commit_id, fileindex, have_staged_files);
3144 3d1b16d1 2023-07-08 jrick sync_err = sync_fileindex(fileindex, fileindex_path);
3145 3d1b16d1 2023-07-08 jrick if (sync_err && err == NULL)
3146 3d1b16d1 2023-07-08 jrick err = sync_err;
3148 3d1b16d1 2023-07-08 jrick if (head_ref2) {
3149 3d1b16d1 2023-07-08 jrick unlockerr = got_ref_unlock(head_ref2);
3150 3d1b16d1 2023-07-08 jrick if (unlockerr && err == NULL)
3151 3d1b16d1 2023-07-08 jrick err = unlockerr;
3152 3d1b16d1 2023-07-08 jrick got_ref_close(head_ref2);
3154 3d1b16d1 2023-07-08 jrick if (commit_ref)
3155 3d1b16d1 2023-07-08 jrick got_ref_close(commit_ref);
3156 3d1b16d1 2023-07-08 jrick if (fileindex)
3157 3d1b16d1 2023-07-08 jrick got_fileindex_free(fileindex);
3158 3d1b16d1 2023-07-08 jrick unlockerr = lock_worktree(worktree, LOCK_SH);
3159 3d1b16d1 2023-07-08 jrick if (unlockerr && err == NULL)
3160 3d1b16d1 2023-07-08 jrick err = unlockerr;
3161 3d1b16d1 2023-07-08 jrick TAILQ_FOREACH(pe, &commitable_paths, entry) {
3162 3d1b16d1 2023-07-08 jrick struct got_commitable *ct = pe->data;
3164 3d1b16d1 2023-07-08 jrick free_commitable(ct);
3166 3d1b16d1 2023-07-08 jrick got_pathlist_free(&commitable_paths, GOT_PATHLIST_FREE_NONE);
3167 3d1b16d1 2023-07-08 jrick if (diff_path && unlink(diff_path) == -1 && err == NULL)
3168 3d1b16d1 2023-07-08 jrick err = got_error_from_errno2("unlink", diff_path);
3169 3d1b16d1 2023-07-08 jrick if (cc_arg.diff_outfile && fclose(cc_arg.diff_outfile) == EOF &&
3170 3d1b16d1 2023-07-08 jrick err == NULL)
3171 3d1b16d1 2023-07-08 jrick err = got_error_from_errno("fclose");
3172 3d1b16d1 2023-07-08 jrick free(head_commit_id);
3173 3d1b16d1 2023-07-08 jrick free(head_commit_id2);
3174 3d1b16d1 2023-07-08 jrick free(commit_refname);
3175 3d1b16d1 2023-07-08 jrick free(fileindex_path);
3176 3d1b16d1 2023-07-08 jrick free(diff_path);
3177 3d1b16d1 2023-07-08 jrick return err;
3180 3d1b16d1 2023-07-08 jrick const struct got_error *
3181 3d1b16d1 2023-07-08 jrick got_worktree_cvg_get_commit_ref_name(char **refname,
3182 3d1b16d1 2023-07-08 jrick struct got_worktree *worktree)
3184 3d1b16d1 2023-07-08 jrick return get_ref_name(refname, worktree, GOT_WORKTREE_COMMIT_REF_PREFIX);
