2 5d56da81 2019-01-13 stsp * Copyright (c) 2018, 2019 Stefan Sperling <stsp@openbsd.org>
4 86c3caaf 2018-03-09 stsp * Permission to use, copy, modify, and distribute this software for any
5 86c3caaf 2018-03-09 stsp * purpose with or without fee is hereby granted, provided that the above
6 86c3caaf 2018-03-09 stsp * copyright notice and this permission notice appear in all copies.
8 86c3caaf 2018-03-09 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 86c3caaf 2018-03-09 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 86c3caaf 2018-03-09 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 86c3caaf 2018-03-09 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 86c3caaf 2018-03-09 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 86c3caaf 2018-03-09 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 86c3caaf 2018-03-09 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 86c3caaf 2018-03-09 stsp struct got_worktree;
18 8656d6c4 2019-05-20 stsp struct got_commitable;
19 818c7501 2019-07-11 stsp struct got_commit_object;
20 3e3a69f1 2019-07-25 stsp struct got_fileindex;
22 eecfbcd1 2018-12-29 stsp /* status codes */
23 f8d1f275 2019-02-04 stsp #define GOT_STATUS_NO_CHANGE ' '
24 eecfbcd1 2018-12-29 stsp #define GOT_STATUS_ADD 'A'
25 eecfbcd1 2018-12-29 stsp #define GOT_STATUS_EXISTS 'E'
26 507dc3bb 2018-12-29 stsp #define GOT_STATUS_UPDATE 'U'
27 512f0d0e 2019-01-02 stsp #define GOT_STATUS_DELETE 'D'
28 276262e8 2019-02-08 stsp #define GOT_STATUS_MODIFY 'M'
29 1ebedb77 2019-10-19 stsp #define GOT_STATUS_MODE_CHANGE 'm'
30 6353ad76 2019-02-08 stsp #define GOT_STATUS_CONFLICT 'C'
31 6353ad76 2019-02-08 stsp #define GOT_STATUS_MERGE 'G'
32 f8d1f275 2019-02-04 stsp #define GOT_STATUS_MISSING '!'
33 f8d1f275 2019-02-04 stsp #define GOT_STATUS_UNVERSIONED '?'
34 0dbc2271 2019-02-05 stsp #define GOT_STATUS_OBSTRUCTED '~'
35 2a06fe5f 2019-08-24 stsp #define GOT_STATUS_NONEXISTENT 'N'
36 a129376b 2019-03-28 stsp #define GOT_STATUS_REVERT 'R'
37 2b92fad7 2019-06-02 stsp #define GOT_STATUS_CANNOT_DELETE 'd'
38 a484d721 2019-06-10 stsp #define GOT_STATUS_BUMP_BASE 'b'
41 0c60ce5a 2018-04-02 stsp * Attempt to initialize a new work tree on disk.
42 0c60ce5a 2018-04-02 stsp * The first argument is the path to a directory where the work tree
43 0c60ce5a 2018-04-02 stsp * will be created. The path itself must not yet exist, but the dirname(3)
44 0c60ce5a 2018-04-02 stsp * of the path must already exist.
45 93a30277 2018-12-24 stsp * The reference provided will be used to determine the new worktree's
46 93a30277 2018-12-24 stsp * base commit. The third argument speficies the work tree's path prefix.
48 86c3caaf 2018-03-09 stsp const struct got_error *got_worktree_init(const char *, struct got_reference *,
49 577ec78f 2018-03-11 stsp const char *, struct got_repository *);
52 247140b2 2019-02-05 stsp * Attempt to open a worktree at or above the specified path.
53 0c60ce5a 2018-04-02 stsp * The caller must dispose of it with got_worktree_close().
55 86c3caaf 2018-03-09 stsp const struct got_error *got_worktree_open(struct got_worktree **, const char *);
57 0c60ce5a 2018-04-02 stsp /* Dispose of an open work tree. */
58 3a6ce05a 2019-02-11 stsp const struct got_error *got_worktree_close(struct got_worktree *);
61 c7f4312f 2019-02-05 stsp * Get the path to the root directory of a worktree.
63 c7f4312f 2019-02-05 stsp const char *got_worktree_get_root_path(struct got_worktree *);
66 0c60ce5a 2018-04-02 stsp * Get the path to the repository associated with a worktree.
68 2fbdb5ae 2018-12-29 stsp const char *got_worktree_get_repo_path(struct got_worktree *);
71 49520a32 2018-12-29 stsp * Get the path prefix associated with a worktree.
73 49520a32 2018-12-29 stsp const char *got_worktree_get_path_prefix(struct got_worktree *);
76 e5dc7198 2018-12-29 stsp * Check if a user-provided path prefix matches that of the worktree.
78 e5dc7198 2018-12-29 stsp const struct got_error *got_worktree_match_path_prefix(int *,
79 e5dc7198 2018-12-29 stsp struct got_worktree *, const char *);
82 0c60ce5a 2018-04-02 stsp * Get the name of a work tree's HEAD reference.
84 bc70eb79 2019-05-09 stsp const char *got_worktree_get_head_ref_name(struct got_worktree *);
87 024e9686 2019-05-14 stsp * Set the branch head reference of the work tree.
89 024e9686 2019-05-14 stsp const struct got_error *got_worktree_set_head_ref(struct got_worktree *,
90 024e9686 2019-05-14 stsp struct got_reference *);
93 507dc3bb 2018-12-29 stsp * Get the current base commit ID of a worktree.
95 b72f483a 2019-02-05 stsp struct got_object_id *got_worktree_get_base_commit_id(struct got_worktree *);
98 507dc3bb 2018-12-29 stsp * Set the base commit Id of a worktree.
100 507dc3bb 2018-12-29 stsp const struct got_error *got_worktree_set_base_commit_id(struct got_worktree *,
101 507dc3bb 2018-12-29 stsp struct got_repository *, struct got_object_id *);
103 0c60ce5a 2018-04-02 stsp /* A callback function which is invoked when a path is checked out. */
104 1ee397ad 2019-07-12 stsp typedef const struct got_error *(*got_worktree_checkout_cb)(void *,
105 1ee397ad 2019-07-12 stsp unsigned char, const char *);
108 0c60ce5a 2018-04-02 stsp * Attempt to check out files into a work tree from its associated repository
109 0c60ce5a 2018-04-02 stsp * and path prefix, and update the work tree's file index accordingly.
110 0c60ce5a 2018-04-02 stsp * File content is obtained from blobs within the work tree's path prefix
111 93a30277 2018-12-24 stsp * inside the tree corresponding to the work tree's base commit.
112 0c60ce5a 2018-04-02 stsp * The checkout progress callback will be invoked with the provided
113 0c60ce5a 2018-04-02 stsp * void * argument, and the path of each checked out file.
115 f2ea84fa 2019-07-27 stsp * It is possible to restrict the checkout operation to specific paths in
116 f2ea84fa 2019-07-27 stsp * the work tree, in which case all files outside those paths will remain at
117 c4cdcb68 2019-04-03 stsp * their currently recorded base commit. Inconsistent base commits can be
118 c4cdcb68 2019-04-03 stsp * repaired later by running another update operation across the entire work
119 c4cdcb68 2019-04-03 stsp * tree. Inconsistent base-commits may also occur if this function runs into
120 c4cdcb68 2019-04-03 stsp * an error or if the checkout operation is cancelled by the cancel callback.
121 f2ea84fa 2019-07-27 stsp * Allspecified paths are relative to the work tree's root. Pass a pathlist
122 f2ea84fa 2019-07-27 stsp * with a single empty path "" to check out files across the entire work tree.
124 c4cdcb68 2019-04-03 stsp * Some operations may refuse to run while the work tree contains files from
125 c4cdcb68 2019-04-03 stsp * multiple base commits.
127 86c3caaf 2018-03-09 stsp const struct got_error *got_worktree_checkout_files(struct got_worktree *,
128 f2ea84fa 2019-07-27 stsp struct got_pathlist_head *, struct got_repository *,
129 e6209546 2019-08-22 stsp got_worktree_checkout_cb, void *, got_cancel_cb, void *);
131 234035bc 2019-06-01 stsp /* Merge the differences between two commits into a work tree. */
132 234035bc 2019-06-01 stsp const struct got_error *
133 234035bc 2019-06-01 stsp got_worktree_merge_files(struct got_worktree *,
134 234035bc 2019-06-01 stsp struct got_object_id *, struct got_object_id *,
135 234035bc 2019-06-01 stsp struct got_repository *, got_worktree_checkout_cb, void *,
136 e6209546 2019-08-22 stsp got_cancel_cb, void *);
138 f8d1f275 2019-02-04 stsp /* A callback function which is invoked to report a path's status. */
139 b72f483a 2019-02-05 stsp typedef const struct got_error *(*got_worktree_status_cb)(void *,
140 88d0e355 2019-08-03 stsp unsigned char, unsigned char, const char *, struct got_object_id *,
141 537ac44b 2019-08-03 stsp struct got_object_id *, struct got_object_id *);
144 f8d1f275 2019-02-04 stsp * Report the status of paths in the work tree.
145 f8d1f275 2019-02-04 stsp * The status callback will be invoked with the provided void * argument,
146 f8d1f275 2019-02-04 stsp * a path, and a corresponding status code.
148 6c34b1aa 2019-03-18 stsp const struct got_error *got_worktree_status(struct got_worktree *,
149 72ea6654 2019-07-27 stsp struct got_pathlist_head *, struct got_repository *,
150 e6209546 2019-08-22 stsp got_worktree_status_cb, void *, got_cancel_cb cancel_cb, void *);
153 6c7ab921 2019-03-18 stsp * Try to resolve a user-provided path to an on-disk path in the work tree.
154 6c7ab921 2019-03-18 stsp * The caller must dispose of the resolved path with free(3).
156 6c7ab921 2019-03-18 stsp const struct got_error *got_worktree_resolve_path(char **,
157 6c7ab921 2019-03-18 stsp struct got_worktree *, const char *);
159 1dd54920 2019-05-11 stsp /* Schedule files at on-disk paths for addition in the next commit. */
160 031a5338 2019-03-26 stsp const struct got_error *got_worktree_schedule_add(struct got_worktree *,
161 4e68cba3 2019-11-23 stsp struct got_pathlist_head *, got_worktree_checkout_cb, void *,
162 1dd54920 2019-05-11 stsp struct got_repository *);
165 17ed4618 2019-06-02 stsp * Remove files from disk and schedule them to be deleted in the next commit.
166 2ec1f75b 2019-03-26 stsp * Don't allow deleting files with uncommitted modifications, unless the
167 2ec1f75b 2019-03-26 stsp * parameter 'delete_local_mods' is set.
169 2ec1f75b 2019-03-26 stsp const struct got_error *
170 17ed4618 2019-06-02 stsp got_worktree_schedule_delete(struct got_worktree *,
171 17ed4618 2019-06-02 stsp struct got_pathlist_head *, int, got_worktree_status_cb, void *,
172 17ed4618 2019-06-02 stsp struct got_repository *);
174 33aa809d 2019-08-08 stsp /* A callback function which is used to select or reject a patch. */
175 33aa809d 2019-08-08 stsp typedef const struct got_error *(*got_worktree_patch_cb)(int *, void *,
176 33aa809d 2019-08-08 stsp unsigned char, const char *, FILE *, int, int);
178 33aa809d 2019-08-08 stsp /* Values for result output parameter of got_wortree_patch_cb. */
179 33aa809d 2019-08-08 stsp #define GOT_PATCH_CHOICE_NONE 0
180 33aa809d 2019-08-08 stsp #define GOT_PATCH_CHOICE_YES 1
181 33aa809d 2019-08-08 stsp #define GOT_PATCH_CHOICE_NO 2
182 33aa809d 2019-08-08 stsp #define GOT_PATCH_CHOICE_QUIT 3
185 a129376b 2019-03-28 stsp * Revert a file at the specified path such that it matches its
186 a129376b 2019-03-28 stsp * original state in the worktree's base commit.
187 33aa809d 2019-08-08 stsp * If the patch callback is not NULL, call it to select patch hunks to
188 33aa809d 2019-08-08 stsp * revert. Otherwise, revert the whole file found at each path.
190 a129376b 2019-03-28 stsp const struct got_error *got_worktree_revert(struct got_worktree *,
191 e20a8b6f 2019-06-04 stsp struct got_pathlist_head *, got_worktree_checkout_cb, void *,
192 33aa809d 2019-08-08 stsp got_worktree_patch_cb patch_cb, void *patch_arg,
193 e20a8b6f 2019-06-04 stsp struct got_repository *);
196 33ad4cbe 2019-05-12 jcs * A callback function which is invoked when a commit message is requested.
197 8656d6c4 2019-05-20 stsp * Passes a pathlist with a struct got_commitable * in the data pointer of
198 8656d6c4 2019-05-20 stsp * each element, a pointer to the log message that must be set by the
199 8656d6c4 2019-05-20 stsp * callback and will be freed after committing, and an argument passed
200 8656d6c4 2019-05-20 stsp * through to the callback.
202 33ad4cbe 2019-05-12 jcs typedef const struct got_error *(*got_worktree_commit_msg_cb)(
203 33ad4cbe 2019-05-12 jcs struct got_pathlist_head *, char **, void *);
206 c4296144 2019-05-09 stsp * Create a new commit from changes in the work tree.
207 c4296144 2019-05-09 stsp * Return the ID of the newly created commit.
208 c4296144 2019-05-09 stsp * The worktree's base commit will be set to this new commit.
209 c4296144 2019-05-09 stsp * Files unaffected by this commit operation will retain their
210 c4296144 2019-05-09 stsp * current base commit.
211 de18fc63 2019-05-09 stsp * An author and a non-empty log message must be specified.
212 de18fc63 2019-05-09 stsp * The name of the committer is optional (may be NULL).
214 de18fc63 2019-05-09 stsp const struct got_error *got_worktree_commit(struct got_object_id **,
215 5c1e53bc 2019-07-28 stsp struct got_worktree *, struct got_pathlist_head *, const char *,
216 5c1e53bc 2019-07-28 stsp const char *, got_worktree_commit_msg_cb, void *,
217 33ad4cbe 2019-05-12 jcs got_worktree_status_cb, void *, struct got_repository *);
219 8656d6c4 2019-05-20 stsp /* Get the path of a commitable worktree item. */
220 8656d6c4 2019-05-20 stsp const char *got_commitable_get_path(struct got_commitable *);
222 8656d6c4 2019-05-20 stsp /* Get the status of a commitable worktree item. */
223 8656d6c4 2019-05-20 stsp unsigned int got_commitable_get_status(struct got_commitable *);
226 818c7501 2019-07-11 stsp * Prepare for rebasing a branch onto the work tree's current branch.
227 818c7501 2019-07-11 stsp * This function creates references to a temporary branch, the branch
228 818c7501 2019-07-11 stsp * being rebased, and the work tree's current branch, under the
229 818c7501 2019-07-11 stsp * "got/worktree/rebase/" namespace. These references are used to
230 818c7501 2019-07-11 stsp * keep track of rebase operation state and are used as input and/or
231 818c7501 2019-07-11 stsp * output arguments with other rebase-related functions.
232 3e3a69f1 2019-07-25 stsp * The function also returns a pointer to a fileindex which must be
233 3e3a69f1 2019-07-25 stsp * passed back to other rebase-related functions.
235 818c7501 2019-07-11 stsp const struct got_error *got_worktree_rebase_prepare(struct got_reference **,
236 3e3a69f1 2019-07-25 stsp struct got_reference **, struct got_fileindex **, struct got_worktree *,
237 3e3a69f1 2019-07-25 stsp struct got_reference *, struct got_repository *);
240 818c7501 2019-07-11 stsp * Continue an interrupted rebase operation.
241 818c7501 2019-07-11 stsp * This function returns existing references created when rebase was prepared,
242 818c7501 2019-07-11 stsp * and the ID of the commit currently being rebased. This should be called
243 818c7501 2019-07-11 stsp * before either resuming or aborting a rebase operation.
244 3e3a69f1 2019-07-25 stsp * The function also returns a pointer to a fileindex which must be
245 3e3a69f1 2019-07-25 stsp * passed back to other rebase-related functions.
247 818c7501 2019-07-11 stsp const struct got_error *got_worktree_rebase_continue(struct got_object_id **,
248 818c7501 2019-07-11 stsp struct got_reference **, struct got_reference **, struct got_reference **,
249 3e3a69f1 2019-07-25 stsp struct got_fileindex **, struct got_worktree *, struct got_repository *);
251 818c7501 2019-07-11 stsp /* Check whether a, potentially interrupted, rebase operation is in progress. */
252 818c7501 2019-07-11 stsp const struct got_error *got_worktree_rebase_in_progress(int *,
253 818c7501 2019-07-11 stsp struct got_worktree *);
256 818c7501 2019-07-11 stsp * Merge changes from the commit currently being rebased into the work tree.
257 818c7501 2019-07-11 stsp * Report affected files, including merge conflicts, via the specified
258 01757395 2019-07-12 stsp * progress callback. Also populate a list of affected paths which should
259 01757395 2019-07-12 stsp * be passed to got_worktree_rebase_commit() after a conflict-free merge.
260 01757395 2019-07-12 stsp * This list must be initialized with TAILQ_INIT() and disposed of with
261 01757395 2019-07-12 stsp * got_worktree_rebase_pathlist_free().
263 818c7501 2019-07-11 stsp const struct got_error *got_worktree_rebase_merge_files(
264 3e3a69f1 2019-07-25 stsp struct got_pathlist_head *, struct got_worktree *, struct got_fileindex *,
265 01757395 2019-07-12 stsp struct got_object_id *, struct got_object_id *, struct got_repository *,
266 e6209546 2019-08-22 stsp got_worktree_checkout_cb, void *, got_cancel_cb, void *);
269 01757395 2019-07-12 stsp * Commit changes merged by got_worktree_rebase_merge_files() to a temporary
270 01757395 2019-07-12 stsp * branch and return the ID of the newly created commit. An optional list of
271 01757395 2019-07-12 stsp * merged paths can be provided; otherwise this function will perform a status
272 01757395 2019-07-12 stsp * crawl across the entire work tree to find paths to commit.
274 818c7501 2019-07-11 stsp const struct got_error *got_worktree_rebase_commit(struct got_object_id **,
275 3e3a69f1 2019-07-25 stsp struct got_pathlist_head *, struct got_worktree *, struct got_fileindex *,
276 01757395 2019-07-12 stsp struct got_reference *, struct got_commit_object *,
277 818c7501 2019-07-11 stsp struct got_object_id *, struct got_repository *);
279 01757395 2019-07-12 stsp /* Free a list of merged paths from got_worktree_merge_files. */
280 01757395 2019-07-12 stsp void got_worktree_rebase_pathlist_free(struct got_pathlist_head *);
282 818c7501 2019-07-11 stsp /* Postpone the rebase operation. Should be called after a merge conflict. */
283 3e3a69f1 2019-07-25 stsp const struct got_error *got_worktree_rebase_postpone(struct got_worktree *,
284 3e3a69f1 2019-07-25 stsp struct got_fileindex *);
287 818c7501 2019-07-11 stsp * Complete the current rebase operation. This should be called once all
288 818c7501 2019-07-11 stsp * commits have been rebased successfully.
290 818c7501 2019-07-11 stsp const struct got_error *got_worktree_rebase_complete(struct got_worktree *,
291 3e3a69f1 2019-07-25 stsp struct got_fileindex *, struct got_reference *, struct got_reference *,
292 3e3a69f1 2019-07-25 stsp struct got_reference *, struct got_repository *);
295 818c7501 2019-07-11 stsp * Abort the current rebase operation.
296 818c7501 2019-07-11 stsp * Report reverted files via the specified progress callback.
298 818c7501 2019-07-11 stsp const struct got_error *got_worktree_rebase_abort(struct got_worktree *,
299 3e3a69f1 2019-07-25 stsp struct got_fileindex *, struct got_repository *, struct got_reference *,
300 0ebf8283 2019-07-24 stsp got_worktree_checkout_cb, void *);
303 0ebf8283 2019-07-24 stsp * Prepare for editing the history of the work tree's current branch.
304 0ebf8283 2019-07-24 stsp * This function creates references to a temporary branch, and the
305 0ebf8283 2019-07-24 stsp * work tree's current branch, under the "got/worktree/histedit/" namespace.
306 0ebf8283 2019-07-24 stsp * These references are used to keep track of histedit operation state and
307 0ebf8283 2019-07-24 stsp * are used as input and/or output arguments with other histedit-related
308 0ebf8283 2019-07-24 stsp * functions.
310 0ebf8283 2019-07-24 stsp const struct got_error *got_worktree_histedit_prepare(struct got_reference **,
311 3e3a69f1 2019-07-25 stsp struct got_reference **, struct got_object_id **, struct got_fileindex **,
312 3e3a69f1 2019-07-25 stsp struct got_worktree *, struct got_repository *);
315 0ebf8283 2019-07-24 stsp * Continue an interrupted histedit operation.
316 0ebf8283 2019-07-24 stsp * This function returns existing references created when histedit was
317 0ebf8283 2019-07-24 stsp * prepared and the ID of the commit currently being edited.
318 0ebf8283 2019-07-24 stsp * It should be called before resuming or aborting a histedit operation.
320 0ebf8283 2019-07-24 stsp const struct got_error *got_worktree_histedit_continue(struct got_object_id **,
321 0ebf8283 2019-07-24 stsp struct got_reference **, struct got_reference **, struct got_object_id **,
322 3e3a69f1 2019-07-25 stsp struct got_fileindex **, struct got_worktree *, struct got_repository *);
324 0ebf8283 2019-07-24 stsp /* Check whether a histedit operation is in progress. */
325 0ebf8283 2019-07-24 stsp const struct got_error *got_worktree_histedit_in_progress(int *,
326 0ebf8283 2019-07-24 stsp struct got_worktree *);
329 0ebf8283 2019-07-24 stsp * Merge changes from the commit currently being edited into the work tree.
330 0ebf8283 2019-07-24 stsp * Report affected files, including merge conflicts, via the specified
331 0ebf8283 2019-07-24 stsp * progress callback. Also populate a list of affected paths which should
332 0ebf8283 2019-07-24 stsp * be passed to got_worktree_histedit_commit() after a conflict-free merge.
333 0ebf8283 2019-07-24 stsp * This list must be initialized with TAILQ_INIT() and disposed of with
334 0ebf8283 2019-07-24 stsp * got_worktree_rebase_pathlist_free().
336 0ebf8283 2019-07-24 stsp const struct got_error *got_worktree_histedit_merge_files(
337 3e3a69f1 2019-07-25 stsp struct got_pathlist_head *, struct got_worktree *, struct got_fileindex *,
338 0ebf8283 2019-07-24 stsp struct got_object_id *, struct got_object_id *, struct got_repository *,
339 e6209546 2019-08-22 stsp got_worktree_checkout_cb, void *, got_cancel_cb, void *);
342 0ebf8283 2019-07-24 stsp * Commit changes merged by got_worktree_histedit_merge_files() to a temporary
343 0ebf8283 2019-07-24 stsp * branch and return the ID of the newly created commit. An optional list of
344 0ebf8283 2019-07-24 stsp * merged paths can be provided; otherwise this function will perform a status
345 0ebf8283 2019-07-24 stsp * crawl across the entire work tree to find paths to commit.
346 0ebf8283 2019-07-24 stsp * An optional log message can be provided which will be used instead of the
347 0ebf8283 2019-07-24 stsp * commit's original message.
349 0ebf8283 2019-07-24 stsp const struct got_error *got_worktree_histedit_commit(struct got_object_id **,
350 3e3a69f1 2019-07-25 stsp struct got_pathlist_head *, struct got_worktree *, struct got_fileindex *,
351 0ebf8283 2019-07-24 stsp struct got_reference *, struct got_commit_object *,
352 0ebf8283 2019-07-24 stsp struct got_object_id *, const char *, struct got_repository *);
355 0ebf8283 2019-07-24 stsp * Record the specified commit as skipped during histedit.
356 0ebf8283 2019-07-24 stsp * This should be called for commits which get dropped or get folded into
357 0ebf8283 2019-07-24 stsp * a subsequent commit.
359 0ebf8283 2019-07-24 stsp const struct got_error *got_worktree_histedit_skip_commit(struct got_worktree *,
360 0ebf8283 2019-07-24 stsp struct got_object_id *, struct got_repository *);
362 0ebf8283 2019-07-24 stsp /* Postpone the histedit operation. */
363 3e3a69f1 2019-07-25 stsp const struct got_error *got_worktree_histedit_postpone(struct got_worktree *,
364 3e3a69f1 2019-07-25 stsp struct got_fileindex *);
367 0ebf8283 2019-07-24 stsp * Complete the current histedit operation. This should be called once all
368 0ebf8283 2019-07-24 stsp * commits have been edited successfully.
370 0ebf8283 2019-07-24 stsp const struct got_error *got_worktree_histedit_complete(struct got_worktree *,
371 3e3a69f1 2019-07-25 stsp struct got_fileindex *, struct got_reference *, struct got_reference *,
372 3e3a69f1 2019-07-25 stsp struct got_repository *);
375 0ebf8283 2019-07-24 stsp * Abort the current histedit operation.
376 0ebf8283 2019-07-24 stsp * Report reverted files via the specified progress callback.
378 0ebf8283 2019-07-24 stsp const struct got_error *got_worktree_histedit_abort(struct got_worktree *,
379 3e3a69f1 2019-07-25 stsp struct got_fileindex *, struct got_repository *, struct got_reference *,
380 3e3a69f1 2019-07-25 stsp struct got_object_id *, got_worktree_checkout_cb, void *);
382 c3022ba5 2019-07-27 stsp /* Get the path to this work tree's histedit script file. */
383 c3022ba5 2019-07-27 stsp const struct got_error *got_worktree_get_histedit_script_path(char **,
384 0ebf8283 2019-07-24 stsp struct got_worktree *);
387 2822a352 2019-10-15 stsp * Prepare a work tree for integrating a branch.
388 2822a352 2019-10-15 stsp * Return pointers to a fileindex and locked references which must be
389 2822a352 2019-10-15 stsp * passed back to other integrate-related functions.
391 2822a352 2019-10-15 stsp const struct got_error *
392 2822a352 2019-10-15 stsp got_worktree_integrate_prepare(struct got_fileindex **,
393 2822a352 2019-10-15 stsp struct got_reference **, struct got_reference **,
394 2822a352 2019-10-15 stsp struct got_worktree *, const char *, struct got_repository *);
397 2822a352 2019-10-15 stsp * Carry out a prepared branch integration operation.
398 2822a352 2019-10-15 stsp * Report affected files via the specified progress callback.
400 2822a352 2019-10-15 stsp const struct got_error *got_worktree_integrate_continue(
401 2822a352 2019-10-15 stsp struct got_worktree *, struct got_fileindex *, struct got_repository *,
402 2822a352 2019-10-15 stsp struct got_reference *, struct got_reference *,
403 2822a352 2019-10-15 stsp got_worktree_checkout_cb, void *, got_cancel_cb, void *);
405 2822a352 2019-10-15 stsp /* Abort a prepared branch integration operation. */
406 2822a352 2019-10-15 stsp const struct got_error *got_worktree_integrate_abort(struct got_worktree *,
407 2822a352 2019-10-15 stsp struct got_fileindex *, struct got_repository *,
408 2822a352 2019-10-15 stsp struct got_reference *, struct got_reference *);
411 fdfa9bf2 2019-08-03 stsp * Stage the specified paths for commit.
412 dc424a06 2019-08-07 stsp * If the patch callback is not NULL, call it to select patch hunks for
413 dc424a06 2019-08-07 stsp * staging. Otherwise, stage the full file content found at each path.
415 1e71573e 2019-08-03 stsp const struct got_error *got_worktree_stage(struct got_worktree *,
416 1e71573e 2019-08-03 stsp struct got_pathlist_head *, got_worktree_status_cb, void *,
417 dc424a06 2019-08-07 stsp got_worktree_patch_cb, void *, struct got_repository *);
420 ad493afc 2019-08-03 stsp * Merge staged changes for the specified paths back into the work tree
421 ad493afc 2019-08-03 stsp * and mark the paths as non-staged again.
423 ad493afc 2019-08-03 stsp const struct got_error *got_worktree_unstage(struct got_worktree *,
424 ad493afc 2019-08-03 stsp struct got_pathlist_head *, got_worktree_checkout_cb, void *,
425 2e1f37b0 2019-08-08 stsp got_worktree_patch_cb, void *, struct got_repository *);
