2 * Copyright (c) 2018, 2019 Stefan Sperling <stsp@openbsd.org>
4 * Permission to use, copy, modify, and distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 struct got_commitable;
19 struct got_commit_object;
23 #define GOT_STATUS_NO_CHANGE ' '
24 #define GOT_STATUS_ADD 'A'
25 #define GOT_STATUS_EXISTS 'E'
26 #define GOT_STATUS_UPDATE 'U'
27 #define GOT_STATUS_DELETE 'D'
28 #define GOT_STATUS_MODIFY 'M'
29 #define GOT_STATUS_CONFLICT 'C'
30 #define GOT_STATUS_MERGE 'G'
31 #define GOT_STATUS_MISSING '!'
32 #define GOT_STATUS_UNVERSIONED '?'
33 #define GOT_STATUS_OBSTRUCTED '~'
34 #define GOT_STATUS_REVERT 'R'
35 #define GOT_STATUS_CANNOT_DELETE 'd'
36 #define GOT_STATUS_BUMP_BASE 'b'
39 * Attempt to initialize a new work tree on disk.
40 * The first argument is the path to a directory where the work tree
41 * will be created. The path itself must not yet exist, but the dirname(3)
42 * of the path must already exist.
43 * The reference provided will be used to determine the new worktree's
44 * base commit. The third argument speficies the work tree's path prefix.
46 const struct got_error *got_worktree_init(const char *, struct got_reference *,
47 const char *, struct got_repository *);
50 * Attempt to open a worktree at or above the specified path.
51 * The caller must dispose of it with got_worktree_close().
53 const struct got_error *got_worktree_open(struct got_worktree **, const char *);
55 /* Dispose of an open work tree. */
56 const struct got_error *got_worktree_close(struct got_worktree *);
59 * Get the path to the root directory of a worktree.
61 const char *got_worktree_get_root_path(struct got_worktree *);
64 * Get the path to the repository associated with a worktree.
66 const char *got_worktree_get_repo_path(struct got_worktree *);
69 * Get the path prefix associated with a worktree.
71 const char *got_worktree_get_path_prefix(struct got_worktree *);
74 * Check if a user-provided path prefix matches that of the worktree.
76 const struct got_error *got_worktree_match_path_prefix(int *,
77 struct got_worktree *, const char *);
80 * Get the name of a work tree's HEAD reference.
82 const char *got_worktree_get_head_ref_name(struct got_worktree *);
85 * Set the branch head reference of the work tree.
87 const struct got_error *got_worktree_set_head_ref(struct got_worktree *,
88 struct got_reference *);
91 * Get the current base commit ID of a worktree.
93 struct got_object_id *got_worktree_get_base_commit_id(struct got_worktree *);
96 * Set the base commit Id of a worktree.
98 const struct got_error *got_worktree_set_base_commit_id(struct got_worktree *,
99 struct got_repository *, struct got_object_id *);
101 /* A callback function which is invoked when a path is checked out. */
102 typedef const struct got_error *(*got_worktree_checkout_cb)(void *,
103 unsigned char, const char *);
105 /* A callback function which is invoked at cancellation points.
106 * May return GOT_ERR_CANCELLED to abort the runing operation. */
107 typedef const struct got_error *(*got_worktree_cancel_cb)(void *);
110 * Attempt to check out files into a work tree from its associated repository
111 * and path prefix, and update the work tree's file index accordingly.
112 * File content is obtained from blobs within the work tree's path prefix
113 * inside the tree corresponding to the work tree's base commit.
114 * The checkout progress callback will be invoked with the provided
115 * void * argument, and the path of each checked out file.
117 * It is possible to restrict the checkout operation to specific paths in
118 * the work tree, in which case all files outside those paths will remain at
119 * their currently recorded base commit. Inconsistent base commits can be
120 * repaired later by running another update operation across the entire work
121 * tree. Inconsistent base-commits may also occur if this function runs into
122 * an error or if the checkout operation is cancelled by the cancel callback.
123 * Allspecified paths are relative to the work tree's root. Pass a pathlist
124 * with a single empty path "" to check out files across the entire work tree.
126 * Some operations may refuse to run while the work tree contains files from
127 * multiple base commits.
129 const struct got_error *got_worktree_checkout_files(struct got_worktree *,
130 struct got_pathlist_head *, struct got_repository *,
131 got_worktree_checkout_cb, void *, got_worktree_cancel_cb, void *);
133 /* Merge the differences between two commits into a work tree. */
134 const struct got_error *
135 got_worktree_merge_files(struct got_worktree *,
136 struct got_object_id *, struct got_object_id *,
137 struct got_repository *, got_worktree_checkout_cb, void *,
138 got_worktree_cancel_cb, void *);
140 /* A callback function which is invoked to report a path's status. */
141 typedef const struct got_error *(*got_worktree_status_cb)(void *,
142 unsigned char, unsigned char, const char *, struct got_object_id *,
143 struct got_object_id *, struct got_object_id *);
146 * Report the status of paths in the work tree.
147 * The status callback will be invoked with the provided void * argument,
148 * a path, and a corresponding status code.
150 const struct got_error *got_worktree_status(struct got_worktree *,
151 struct got_pathlist_head *, struct got_repository *,
152 got_worktree_status_cb, void *, got_worktree_cancel_cb cancel_cb, void *);
155 * Try to resolve a user-provided path to an on-disk path in the work tree.
156 * The caller must dispose of the resolved path with free(3).
158 const struct got_error *got_worktree_resolve_path(char **,
159 struct got_worktree *, const char *);
161 /* Schedule files at on-disk paths for addition in the next commit. */
162 const struct got_error *got_worktree_schedule_add(struct got_worktree *,
163 struct got_pathlist_head *, got_worktree_status_cb, void *,
164 struct got_repository *);
167 * Remove files from disk and schedule them to be deleted in the next commit.
168 * Don't allow deleting files with uncommitted modifications, unless the
169 * parameter 'delete_local_mods' is set.
171 const struct got_error *
172 got_worktree_schedule_delete(struct got_worktree *,
173 struct got_pathlist_head *, int, got_worktree_status_cb, void *,
174 struct got_repository *);
176 /* A callback function which is used to select or reject a patch. */
177 typedef const struct got_error *(*got_worktree_patch_cb)(int *, void *,
178 unsigned char, const char *, FILE *, int, int);
180 /* Values for result output parameter of got_wortree_patch_cb. */
181 #define GOT_PATCH_CHOICE_NONE 0
182 #define GOT_PATCH_CHOICE_YES 1
183 #define GOT_PATCH_CHOICE_NO 2
184 #define GOT_PATCH_CHOICE_QUIT 3
187 * Revert a file at the specified path such that it matches its
188 * original state in the worktree's base commit.
189 * If the patch callback is not NULL, call it to select patch hunks to
190 * revert. Otherwise, revert the whole file found at each path.
192 const struct got_error *got_worktree_revert(struct got_worktree *,
193 struct got_pathlist_head *, got_worktree_checkout_cb, void *,
194 got_worktree_patch_cb patch_cb, void *patch_arg,
195 struct got_repository *);
198 * A callback function which is invoked when a commit message is requested.
199 * Passes a pathlist with a struct got_commitable * in the data pointer of
200 * each element, a pointer to the log message that must be set by the
201 * callback and will be freed after committing, and an argument passed
202 * through to the callback.
204 typedef const struct got_error *(*got_worktree_commit_msg_cb)(
205 struct got_pathlist_head *, char **, void *);
208 * Create a new commit from changes in the work tree.
209 * Return the ID of the newly created commit.
210 * The worktree's base commit will be set to this new commit.
211 * Files unaffected by this commit operation will retain their
212 * current base commit.
213 * An author and a non-empty log message must be specified.
214 * The name of the committer is optional (may be NULL).
216 const struct got_error *got_worktree_commit(struct got_object_id **,
217 struct got_worktree *, struct got_pathlist_head *, const char *,
218 const char *, got_worktree_commit_msg_cb, void *,
219 got_worktree_status_cb, void *, struct got_repository *);
221 /* Get the path of a commitable worktree item. */
222 const char *got_commitable_get_path(struct got_commitable *);
224 /* Get the status of a commitable worktree item. */
225 unsigned int got_commitable_get_status(struct got_commitable *);
228 * Prepare for rebasing a branch onto the work tree's current branch.
229 * This function creates references to a temporary branch, the branch
230 * being rebased, and the work tree's current branch, under the
231 * "got/worktree/rebase/" namespace. These references are used to
232 * keep track of rebase operation state and are used as input and/or
233 * output arguments with other rebase-related functions.
234 * The function also returns a pointer to a fileindex which must be
235 * passed back to other rebase-related functions.
237 const struct got_error *got_worktree_rebase_prepare(struct got_reference **,
238 struct got_reference **, struct got_fileindex **, struct got_worktree *,
239 struct got_reference *, struct got_repository *);
242 * Continue an interrupted rebase operation.
243 * This function returns existing references created when rebase was prepared,
244 * and the ID of the commit currently being rebased. This should be called
245 * before either resuming or aborting a rebase operation.
246 * The function also returns a pointer to a fileindex which must be
247 * passed back to other rebase-related functions.
249 const struct got_error *got_worktree_rebase_continue(struct got_object_id **,
250 struct got_reference **, struct got_reference **, struct got_reference **,
251 struct got_fileindex **, struct got_worktree *, struct got_repository *);
253 /* Check whether a, potentially interrupted, rebase operation is in progress. */
254 const struct got_error *got_worktree_rebase_in_progress(int *,
255 struct got_worktree *);
258 * Merge changes from the commit currently being rebased into the work tree.
259 * Report affected files, including merge conflicts, via the specified
260 * progress callback. Also populate a list of affected paths which should
261 * be passed to got_worktree_rebase_commit() after a conflict-free merge.
262 * This list must be initialized with TAILQ_INIT() and disposed of with
263 * got_worktree_rebase_pathlist_free().
265 const struct got_error *got_worktree_rebase_merge_files(
266 struct got_pathlist_head *, struct got_worktree *, struct got_fileindex *,
267 struct got_object_id *, struct got_object_id *, struct got_repository *,
268 got_worktree_checkout_cb, void *, got_worktree_cancel_cb, void *);
271 * Commit changes merged by got_worktree_rebase_merge_files() to a temporary
272 * branch and return the ID of the newly created commit. An optional list of
273 * merged paths can be provided; otherwise this function will perform a status
274 * crawl across the entire work tree to find paths to commit.
276 const struct got_error *got_worktree_rebase_commit(struct got_object_id **,
277 struct got_pathlist_head *, struct got_worktree *, struct got_fileindex *,
278 struct got_reference *, struct got_commit_object *,
279 struct got_object_id *, struct got_repository *);
281 /* Free a list of merged paths from got_worktree_merge_files. */
282 void got_worktree_rebase_pathlist_free(struct got_pathlist_head *);
284 /* Postpone the rebase operation. Should be called after a merge conflict. */
285 const struct got_error *got_worktree_rebase_postpone(struct got_worktree *,
286 struct got_fileindex *);
289 * Complete the current rebase operation. This should be called once all
290 * commits have been rebased successfully.
292 const struct got_error *got_worktree_rebase_complete(struct got_worktree *,
293 struct got_fileindex *, struct got_reference *, struct got_reference *,
294 struct got_reference *, struct got_repository *);
297 * Abort the current rebase operation.
298 * Report reverted files via the specified progress callback.
300 const struct got_error *got_worktree_rebase_abort(struct got_worktree *,
301 struct got_fileindex *, struct got_repository *, struct got_reference *,
302 got_worktree_checkout_cb, void *);
305 * Prepare for editing the history of the work tree's current branch.
306 * This function creates references to a temporary branch, and the
307 * work tree's current branch, under the "got/worktree/histedit/" namespace.
308 * These references are used to keep track of histedit operation state and
309 * are used as input and/or output arguments with other histedit-related
312 const struct got_error *got_worktree_histedit_prepare(struct got_reference **,
313 struct got_reference **, struct got_object_id **, struct got_fileindex **,
314 struct got_worktree *, struct got_repository *);
317 * Continue an interrupted histedit operation.
318 * This function returns existing references created when histedit was
319 * prepared and the ID of the commit currently being edited.
320 * It should be called before resuming or aborting a histedit operation.
322 const struct got_error *got_worktree_histedit_continue(struct got_object_id **,
323 struct got_reference **, struct got_reference **, struct got_object_id **,
324 struct got_fileindex **, struct got_worktree *, struct got_repository *);
326 /* Check whether a histedit operation is in progress. */
327 const struct got_error *got_worktree_histedit_in_progress(int *,
328 struct got_worktree *);
331 * Merge changes from the commit currently being edited into the work tree.
332 * Report affected files, including merge conflicts, via the specified
333 * progress callback. Also populate a list of affected paths which should
334 * be passed to got_worktree_histedit_commit() after a conflict-free merge.
335 * This list must be initialized with TAILQ_INIT() and disposed of with
336 * got_worktree_rebase_pathlist_free().
338 const struct got_error *got_worktree_histedit_merge_files(
339 struct got_pathlist_head *, struct got_worktree *, struct got_fileindex *,
340 struct got_object_id *, struct got_object_id *, struct got_repository *,
341 got_worktree_checkout_cb, void *, got_worktree_cancel_cb, void *);
344 * Commit changes merged by got_worktree_histedit_merge_files() to a temporary
345 * branch and return the ID of the newly created commit. An optional list of
346 * merged paths can be provided; otherwise this function will perform a status
347 * crawl across the entire work tree to find paths to commit.
348 * An optional log message can be provided which will be used instead of the
349 * commit's original message.
351 const struct got_error *got_worktree_histedit_commit(struct got_object_id **,
352 struct got_pathlist_head *, struct got_worktree *, struct got_fileindex *,
353 struct got_reference *, struct got_commit_object *,
354 struct got_object_id *, const char *, struct got_repository *);
357 * Record the specified commit as skipped during histedit.
358 * This should be called for commits which get dropped or get folded into
359 * a subsequent commit.
361 const struct got_error *got_worktree_histedit_skip_commit(struct got_worktree *,
362 struct got_object_id *, struct got_repository *);
364 /* Postpone the histedit operation. */
365 const struct got_error *got_worktree_histedit_postpone(struct got_worktree *,
366 struct got_fileindex *);
369 * Complete the current histedit operation. This should be called once all
370 * commits have been edited successfully.
372 const struct got_error *got_worktree_histedit_complete(struct got_worktree *,
373 struct got_fileindex *, struct got_reference *, struct got_reference *,
374 struct got_repository *);
377 * Abort the current histedit operation.
378 * Report reverted files via the specified progress callback.
380 const struct got_error *got_worktree_histedit_abort(struct got_worktree *,
381 struct got_fileindex *, struct got_repository *, struct got_reference *,
382 struct got_object_id *, got_worktree_checkout_cb, void *);
384 /* Get the path to this work tree's histedit script file. */
385 const struct got_error *got_worktree_get_histedit_script_path(char **,
386 struct got_worktree *);
390 * Stage the specified paths for commit.
391 * If the patch callback is not NULL, call it to select patch hunks for
392 * staging. Otherwise, stage the full file content found at each path.
394 const struct got_error *got_worktree_stage(struct got_worktree *,
395 struct got_pathlist_head *, got_worktree_status_cb, void *,
396 got_worktree_patch_cb, void *, struct got_repository *);
399 * Merge staged changes for the specified paths back into the work tree
400 * and mark the paths as non-staged again.
402 const struct got_error *got_worktree_unstage(struct got_worktree *,
403 struct got_pathlist_head *, got_worktree_checkout_cb, void *,
404 got_worktree_patch_cb, void *, struct got_repository *);
