move got_patch file status checking in worktree.c check_file_status used got_worktree_status to check if the file was in an allowed state, but it's wrong since the callback is not invoked on unchanged files. While here also fix a relate bug: unlink(newpath) is in the wrong spot and ends up removing files even when it shouldn't, so move it early in the got_worktree_schedule_* error handling. Finally, update the appropriate test case. It was passing before because got_worktree_schedule_add returned GOT_ERR_FILE_STATUS, not because check_file_status failed. ok stsp@
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473
diff --git a/include/got_worktree.h b/include/got_worktree.h
index 2a33834..83c0f25 100644
--- a/include/got_worktree.h
+++ b/include/got_worktree.h
@@ -544,3 +544,21 @@ got_worktree_path_info(struct got_worktree *, struct got_pathlist_head *,
/* References pointing at pre-histedit commit backups. */
#define GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX "refs/got/backup/histedit"
+
+/*
+ * Prepare for applying a patch.
+ */
+const struct got_error *
+got_worktree_patch_prepare(struct got_fileindex **, struct got_worktree *);
+
+/*
+ * Lookup paths for the "old" and "new" file before patching and check their
+ * status.
+ */
+const struct got_error *
+got_worktree_patch_check_path(const char *, const char *, char **, char **,
+ struct got_worktree *, struct got_repository *, struct got_fileindex *);
+
+/* Complete the patch operation. */
+const struct got_error *
+got_worktree_patch_complete(struct got_fileindex *);
diff --git a/lib/patch.c b/lib/patch.c
index 4aabb46..20b4e1e 100644
--- a/lib/patch.c
+++ b/lib/patch.c
@@ -497,91 +497,6 @@ done:
}
static const struct got_error *
-build_pathlist(const char *p, char **path, struct got_pathlist_head *head,
- struct got_worktree *worktree)
-{
- const struct got_error *err;
- struct got_pathlist_entry *pe;
-
- err = got_worktree_resolve_path(path, worktree, p);
- if (err == NULL)
- err = got_pathlist_insert(&pe, head, *path, NULL);
- return err;
-}
-
-static const struct got_error *
-can_rm(void *arg, unsigned char status, unsigned char staged_status,
- const char *path, struct got_object_id *blob_id,
- struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
- int dirfd, const char *de_name)
-{
- if (status == GOT_STATUS_NONEXISTENT)
- return got_error_set_errno(ENOENT, path);
- if (status != GOT_STATUS_NO_CHANGE &&
- status != GOT_STATUS_ADD &&
- status != GOT_STATUS_MODIFY &&
- status != GOT_STATUS_MODE_CHANGE)
- return got_error_path(path, GOT_ERR_FILE_STATUS);
- if (staged_status == GOT_STATUS_DELETE)
- return got_error_path(path, GOT_ERR_FILE_STATUS);
- return NULL;
-}
-
-static const struct got_error *
-can_add(void *arg, unsigned char status, unsigned char staged_status,
- const char *path, struct got_object_id *blob_id,
- struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
- int dirfd, const char *de_name)
-{
- if (status != GOT_STATUS_NONEXISTENT)
- return got_error_path(path, GOT_ERR_FILE_STATUS);
- return NULL;
-}
-
-static const struct got_error *
-can_edit(void *arg, unsigned char status, unsigned char staged_status,
- const char *path, struct got_object_id *blob_id,
- struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
- int dirfd, const char *de_name)
-{
- if (status == GOT_STATUS_NONEXISTENT)
- return got_error_set_errno(ENOENT, path);
- if (status != GOT_STATUS_NO_CHANGE &&
- status != GOT_STATUS_ADD &&
- status != GOT_STATUS_MODIFY)
- return got_error_path(path, GOT_ERR_FILE_STATUS);
- if (staged_status == GOT_STATUS_DELETE)
- return got_error_path(path, GOT_ERR_FILE_STATUS);
- return NULL;
-}
-
-static const struct got_error *
-check_file_status(struct got_patch *p, int file_renamed,
- struct got_worktree *worktree, struct got_repository *repo,
- struct got_pathlist_head *old, struct got_pathlist_head *new,
- got_cancel_cb cancel_cb, void *cancel_arg)
-{
- static const struct got_error *err;
-
- if (p->old != NULL && p->new == NULL)
- return got_worktree_status(worktree, old, repo, 0,
- can_rm, NULL, cancel_cb, cancel_arg);
- else if (file_renamed) {
- err = got_worktree_status(worktree, old, repo, 0,
- can_rm, NULL, cancel_cb, cancel_arg);
- if (err)
- return err;
- return got_worktree_status(worktree, new, repo, 0,
- can_add, NULL, cancel_cb, cancel_arg);
- } else if (p->old == NULL)
- return got_worktree_status(worktree, new, repo, 0,
- can_add, NULL, cancel_cb, cancel_arg);
- else
- return got_worktree_status(worktree, new, repo, 0,
- can_edit, NULL, cancel_cb, cancel_arg);
-}
-
-static const struct got_error *
report_progress(struct patch_args *pa, const char *old, const char *new,
unsigned char status, const struct got_error *orig_error)
{
@@ -622,23 +537,29 @@ patch_add(void *arg, unsigned char status, const char *path)
static const struct got_error *
apply_patch(struct got_worktree *worktree, struct got_repository *repo,
- struct got_pathlist_head *oldpaths, struct got_pathlist_head *newpaths,
const char *oldpath, const char *newpath, struct got_patch *p,
int nop, struct patch_args *pa, got_cancel_cb cancel_cb, void *cancel_arg)
{
const struct got_error *err = NULL;
+ struct got_pathlist_head oldpaths, newpaths;
+ struct got_pathlist_entry *pe;
int file_renamed = 0;
char *tmppath = NULL, *template = NULL, *parent = NULL;;
FILE *tmp = NULL;
mode_t mode = GOT_DEFAULT_FILE_MODE;
- file_renamed = strcmp(oldpath, newpath);
+ TAILQ_INIT(&oldpaths);
+ TAILQ_INIT(&newpaths);
- err = check_file_status(p, file_renamed, worktree, repo, oldpaths,
- newpaths, cancel_cb, cancel_arg);
+ err = got_pathlist_insert(&pe, &oldpaths, oldpath, NULL);
+ if (err)
+ goto done;
+ err = got_pathlist_insert(&pe, &newpaths, newpath, NULL);
if (err)
goto done;
+ file_renamed = strcmp(oldpath, newpath);
+
if (asprintf(&template, "%s/got-patch",
got_worktree_get_root_path(worktree)) == -1) {
err = got_error_from_errno(template);
@@ -657,7 +578,7 @@ apply_patch(struct got_worktree *worktree, struct got_repository *repo,
goto done;
if (p->old != NULL && p->new == NULL) {
- err = got_worktree_schedule_delete(worktree, oldpaths,
+ err = got_worktree_schedule_delete(worktree, &oldpaths,
0, NULL, patch_delete, pa, repo, 0, 0);
goto done;
}
@@ -688,21 +609,25 @@ apply_patch(struct got_worktree *worktree, struct got_repository *repo,
}
if (file_renamed) {
- err = got_worktree_schedule_delete(worktree, oldpaths,
+ err = got_worktree_schedule_delete(worktree, &oldpaths,
0, NULL, patch_delete, pa, repo, 0, 0);
if (err == NULL)
- err = got_worktree_schedule_add(worktree, newpaths,
+ err = got_worktree_schedule_add(worktree, &newpaths,
patch_add, pa, repo, 1);
- } else if (p->old == NULL)
- err = got_worktree_schedule_add(worktree, newpaths,
+ if (err)
+ unlink(newpath);
+ } else if (p->old == NULL) {
+ err = got_worktree_schedule_add(worktree, &newpaths,
patch_add, pa, repo, 1);
- else
+ if (err)
+ unlink(newpath);
+ } else
err = report_progress(pa, oldpath, newpath, GOT_STATUS_MODIFY,
NULL);
done:
- if (err != NULL && newpath != NULL && (file_renamed || p->old == NULL))
- unlink(newpath);
+ got_pathlist_free(&oldpaths);
+ got_pathlist_free(&newpaths);
free(parent);
free(template);
if (tmppath != NULL)
@@ -711,44 +636,13 @@ done:
return err;
}
-static const struct got_error *
-resolve_paths(struct got_patch *p, struct got_worktree *worktree,
- struct got_repository *repo, struct got_pathlist_head *oldpaths,
- struct got_pathlist_head *newpaths, char **old, char **new)
-{
- const struct got_error *err;
-
- TAILQ_INIT(oldpaths);
- TAILQ_INIT(newpaths);
- *old = NULL;
- *new = NULL;
-
- err = build_pathlist(p->old != NULL ? p->old : p->new, old,
- oldpaths, worktree);
- if (err)
- goto err;
-
- err = build_pathlist(p->new != NULL ? p->new : p->old, new,
- newpaths, worktree);
- if (err)
- goto err;
- return NULL;
-
-err:
- free(*old);
- free(*new);
- got_pathlist_free(oldpaths);
- got_pathlist_free(newpaths);
- return err;
-}
-
const struct got_error *
got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
int nop, got_patch_progress_cb progress_cb, void *progress_arg,
got_cancel_cb cancel_cb, void *cancel_arg)
{
const struct got_error *err = NULL;
- struct got_pathlist_head oldpaths, newpaths;
+ struct got_fileindex *fileindex = NULL;
char *oldpath, *newpath;
struct imsgbuf *ibuf;
int imsg_fds[2] = {-1, -1};
@@ -788,6 +682,10 @@ got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
if (err)
goto done;
+ err = got_worktree_patch_prepare(&fileindex, worktree);
+ if (err)
+ goto done;
+
while (!done && err == NULL) {
struct got_patch p;
struct patch_args pa;
@@ -800,13 +698,11 @@ got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
if (err || done)
break;
- err = resolve_paths(&p, worktree, repo, &oldpaths,
- &newpaths, &oldpath, &newpath);
- if (err)
- break;
-
- err = apply_patch(worktree, repo, &oldpaths, &newpaths,
- oldpath, newpath, &p, nop, &pa, cancel_cb, cancel_arg);
+ err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
+ &newpath, worktree, repo, fileindex);
+ if (err == NULL)
+ err = apply_patch(worktree, repo, oldpath, newpath,
+ &p, nop, &pa, cancel_cb, cancel_arg);
if (err != NULL) {
failed = 1;
/* recoverable errors */
@@ -821,8 +717,6 @@ got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
free(oldpath);
free(newpath);
- got_pathlist_free(&oldpaths);
- got_pathlist_free(&newpaths);
patch_free(&p);
if (err)
@@ -830,6 +724,8 @@ got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
}
done:
+ if (fileindex)
+ got_worktree_patch_complete(fileindex);
if (fd != -1 && close(fd) == -1 && err == NULL)
err = got_error_from_errno("close");
if (ibuf != NULL)
diff --git a/lib/worktree.c b/lib/worktree.c
index 26ce9d0..16eebc5 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -8712,3 +8712,150 @@ done:
err = unlockerr;
return err;
}
+
+static const struct got_error *
+patch_check_path(const char *p, char **path, unsigned char *status,
+ unsigned char *staged_status, struct got_fileindex *fileindex,
+ struct got_worktree *worktree, struct got_repository *repo)
+{
+ const struct got_error *err;
+ struct got_fileindex_entry *ie;
+ struct stat sb;
+ char *ondisk_path = NULL;
+
+ err = got_worktree_resolve_path(path, worktree, p);
+ if (err)
+ return err;
+
+ if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
+ *path[0] ? "/" : "", *path) == -1)
+ return got_error_from_errno("asprintf");
+
+ ie = got_fileindex_entry_get(fileindex, *path, strlen(*path));
+ if (ie) {
+ *staged_status = get_staged_status(ie);
+ err = get_file_status(status, &sb, ie, *path, -1, NULL, repo);
+ if (err)
+ goto done;
+ } else {
+ *staged_status = GOT_STATUS_NO_CHANGE;
+ *status = GOT_STATUS_UNVERSIONED;
+ if (lstat(ondisk_path, &sb) == -1) {
+ if (errno != ENOENT) {
+ err = got_error_from_errno2("lstat",
+ ondisk_path);
+ goto done;
+ }
+ *status = GOT_STATUS_NONEXISTENT;
+ }
+ }
+
+done:
+ free(ondisk_path);
+ return err;
+}
+
+static const struct got_error *
+patch_can_rm(const char *path, unsigned char status,
+ unsigned char staged_status)
+{
+ if (status == GOT_STATUS_NONEXISTENT)
+ return got_error_set_errno(ENOENT, path);
+ if (status != GOT_STATUS_NO_CHANGE &&
+ status != GOT_STATUS_ADD &&
+ status != GOT_STATUS_MODIFY &&
+ status != GOT_STATUS_MODE_CHANGE)
+ return got_error_path(path, GOT_ERR_FILE_STATUS);
+ if (staged_status == GOT_STATUS_DELETE)
+ return got_error_path(path, GOT_ERR_FILE_STATUS);
+ return NULL;
+}
+
+static const struct got_error *
+patch_can_add(const char *path, unsigned char status)
+{
+ if (status != GOT_STATUS_NONEXISTENT)
+ return got_error_path(path, GOT_ERR_FILE_STATUS);
+ return NULL;
+}
+
+static const struct got_error *
+patch_can_edit(const char *path, unsigned char status,
+ unsigned char staged_status)
+{
+ if (status == GOT_STATUS_NONEXISTENT)
+ return got_error_set_errno(ENOENT, path);
+ if (status != GOT_STATUS_NO_CHANGE &&
+ status != GOT_STATUS_ADD &&
+ status != GOT_STATUS_MODIFY)
+ return got_error_path(path, GOT_ERR_FILE_STATUS);
+ if (staged_status == GOT_STATUS_DELETE)
+ return got_error_path(path, GOT_ERR_FILE_STATUS);
+ return NULL;
+}
+
+const struct got_error *
+got_worktree_patch_prepare(struct got_fileindex **fileindex,
+ struct got_worktree *worktree)
+{
+ const struct got_error *err;
+ char *fileindex_path = NULL;
+
+ err = open_fileindex(fileindex, &fileindex_path, worktree);
+ free(fileindex_path);
+ return err;
+}
+
+const struct got_error *
+got_worktree_patch_check_path(const char *old, const char *new,
+ char **oldpath, char **newpath, struct got_worktree *worktree,
+ struct got_repository *repo, struct got_fileindex *fileindex)
+{
+ const struct got_error *err = NULL;
+ int file_renamed = 0;
+ unsigned char status_old, staged_status_old;
+ unsigned char status_new, staged_status_new;
+
+ *oldpath = NULL;
+ *newpath = NULL;
+
+ err = patch_check_path(old != NULL ? old : new, oldpath,
+ &status_old, &staged_status_old, fileindex, worktree, repo);
+ if (err)
+ goto done;
+
+ err = patch_check_path(new != NULL ? new : old, newpath,
+ &status_new, &staged_status_new, fileindex, worktree, repo);
+ if (err)
+ goto done;
+
+ if (old != NULL && new != NULL && strcmp(old, new) != 0)
+ file_renamed = 1;
+
+ if (old != NULL && new == NULL)
+ err = patch_can_rm(*oldpath, status_old, staged_status_old);
+ else if (file_renamed) {
+ err = patch_can_rm(*oldpath, status_old, staged_status_old);
+ if (err == NULL)
+ err = patch_can_add(*newpath, status_new);
+ } else if (old == NULL)
+ err = patch_can_add(*newpath, status_new);
+ else
+ err = patch_can_edit(*newpath, status_new, staged_status_new);
+
+done:
+ if (err) {
+ free(*oldpath);
+ *oldpath = NULL;
+ free(*newpath);
+ *newpath = NULL;
+ }
+ return err;
+}
+
+const struct got_error *
+got_worktree_patch_complete(struct got_fileindex *fileindex)
+{
+ got_fileindex_free(fileindex);
+ return NULL;
+}
diff --git a/regress/cmdline/patch.sh b/regress/cmdline/patch.sh
index 65fb8de..32c8529 100755
--- a/regress/cmdline/patch.sh
+++ b/regress/cmdline/patch.sh
@@ -824,6 +824,21 @@ EOF
ret=$?
if [ $ret -ne 0 ]; then
diff -u $testroot/stderr.expected $testroot/stderr
+ test_done $testroot $ret
+ return 1
+ fi
+
+ (cd $testroot/wt && got status) > $testroot/stdout
+ cat <<EOF > $testroot/stdout.expected
+~ alpha
+? kappa
+? patch
+EOF
+
+ cmp -s $testroot/stdout.expected $testroot/stdout
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ diff -u $testroot/stdout.expected $testroot/stdout
fi
test_done $testroot $ret
}