5 #include "parse-options.h"
6 #include "argv-array.h"
9 #include "run-command.h"
15 static const char * const worktree_usage
[] = {
16 N_("git worktree add [<options>] <path> [<branch>]"),
17 N_("git worktree list [<options>]"),
18 N_("git worktree lock [<options>] <path>"),
19 N_("git worktree prune [<options>]"),
20 N_("git worktree unlock <path>"),
29 const char *new_branch
;
35 static timestamp_t expire
;
37 static int prune_worktree(const char *id
, struct strbuf
*reason
)
45 if (!is_directory(git_path("worktrees/%s", id
))) {
46 strbuf_addf(reason
, _("Removing worktrees/%s: not a valid directory"), id
);
49 if (file_exists(git_path("worktrees/%s/locked", id
)))
51 if (stat(git_path("worktrees/%s/gitdir", id
), &st
)) {
52 strbuf_addf(reason
, _("Removing worktrees/%s: gitdir file does not exist"), id
);
55 fd
= open(git_path("worktrees/%s/gitdir", id
), O_RDONLY
);
57 strbuf_addf(reason
, _("Removing worktrees/%s: unable to read gitdir file (%s)"),
61 len
= xsize_t(st
.st_size
);
64 read_result
= read_in_full(fd
, path
, len
);
65 if (read_result
< 0) {
66 strbuf_addf(reason
, _("Removing worktrees/%s: unable to read gitdir file (%s)"),
74 if (read_result
!= len
) {
76 _("Removing worktrees/%s: short read (expected %"PRIuMAX
" bytes, read %"PRIuMAX
")"),
77 id
, (uintmax_t)len
, (uintmax_t)read_result
);
81 while (len
&& (path
[len
- 1] == '\n' || path
[len
- 1] == '\r'))
84 strbuf_addf(reason
, _("Removing worktrees/%s: invalid gitdir file"), id
);
89 if (!file_exists(path
)) {
93 * the repo is moved manually and has not been
96 if (!stat(git_path("worktrees/%s/link", id
), &st_link
) &&
99 if (st
.st_mtime
<= expire
) {
100 strbuf_addf(reason
, _("Removing worktrees/%s: gitdir file points to non-existent location"), id
);
110 static void prune_worktrees(void)
112 struct strbuf reason
= STRBUF_INIT
;
113 struct strbuf path
= STRBUF_INIT
;
114 DIR *dir
= opendir(git_path("worktrees"));
119 while ((d
= readdir(dir
)) != NULL
) {
120 if (is_dot_or_dotdot(d
->d_name
))
122 strbuf_reset(&reason
);
123 if (!prune_worktree(d
->d_name
, &reason
))
125 if (show_only
|| verbose
)
126 printf("%s\n", reason
.buf
);
129 git_path_buf(&path
, "worktrees/%s", d
->d_name
);
130 ret
= remove_dir_recursively(&path
, 0);
131 if (ret
< 0 && errno
== ENOTDIR
)
132 ret
= unlink(path
.buf
);
134 error_errno(_("failed to remove '%s'"), path
.buf
);
138 rmdir(git_path("worktrees"));
139 strbuf_release(&reason
);
140 strbuf_release(&path
);
143 static int prune(int ac
, const char **av
, const char *prefix
)
145 struct option options
[] = {
146 OPT__DRY_RUN(&show_only
, N_("do not remove, show only")),
147 OPT__VERBOSE(&verbose
, N_("report pruned working trees")),
148 OPT_EXPIRY_DATE(0, "expire", &expire
,
149 N_("expire working trees older than <time>")),
154 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
156 usage_with_options(worktree_usage
, options
);
161 static char *junk_work_tree
;
162 static char *junk_git_dir
;
164 static pid_t junk_pid
;
166 static void remove_junk(void)
168 struct strbuf sb
= STRBUF_INIT
;
169 if (!is_junk
|| getpid() != junk_pid
)
172 strbuf_addstr(&sb
, junk_git_dir
);
173 remove_dir_recursively(&sb
, 0);
176 if (junk_work_tree
) {
177 strbuf_addstr(&sb
, junk_work_tree
);
178 remove_dir_recursively(&sb
, 0);
183 static void remove_junk_on_signal(int signo
)
190 static const char *worktree_basename(const char *path
, int *olen
)
196 while (len
&& is_dir_sep(path
[len
- 1]))
199 for (name
= path
+ len
- 1; name
> path
; name
--)
200 if (is_dir_sep(*name
)) {
209 static int add_worktree(const char *path
, const char *refname
,
210 const struct add_opts
*opts
)
212 struct strbuf sb_git
= STRBUF_INIT
, sb_repo
= STRBUF_INIT
;
213 struct strbuf sb
= STRBUF_INIT
;
216 struct child_process cp
= CHILD_PROCESS_INIT
;
217 struct argv_array child_env
= ARGV_ARRAY_INIT
;
218 int counter
= 0, len
, ret
;
219 struct strbuf symref
= STRBUF_INIT
;
220 struct commit
*commit
= NULL
;
222 if (file_exists(path
) && !is_empty_dir(path
))
223 die(_("'%s' already exists"), path
);
225 /* is 'refname' a branch or commit? */
226 if (!opts
->detach
&& !strbuf_check_branch_ref(&symref
, refname
) &&
227 ref_exists(symref
.buf
)) { /* it's a branch */
229 die_if_checked_out(symref
.buf
, 0);
230 } else { /* must be a commit */
231 commit
= lookup_commit_reference_by_name(refname
);
233 die(_("invalid reference: %s"), refname
);
236 name
= worktree_basename(path
, &len
);
237 git_path_buf(&sb_repo
, "worktrees/%.*s", (int)(path
+ len
- name
), name
);
239 if (safe_create_leading_directories_const(sb_repo
.buf
))
240 die_errno(_("could not create leading directories of '%s'"),
242 while (!stat(sb_repo
.buf
, &st
)) {
244 strbuf_setlen(&sb_repo
, len
);
245 strbuf_addf(&sb_repo
, "%d", counter
);
247 name
= strrchr(sb_repo
.buf
, '/') + 1;
251 sigchain_push_common(remove_junk_on_signal
);
253 if (mkdir(sb_repo
.buf
, 0777))
254 die_errno(_("could not create directory of '%s'"), sb_repo
.buf
);
255 junk_git_dir
= xstrdup(sb_repo
.buf
);
259 * lock the incomplete repo so prune won't delete it, unlock
260 * after the preparation is over.
262 strbuf_addf(&sb
, "%s/locked", sb_repo
.buf
);
263 if (!opts
->keep_locked
)
264 write_file(sb
.buf
, "initializing");
266 write_file(sb
.buf
, "added with --lock");
268 strbuf_addf(&sb_git
, "%s/.git", path
);
269 if (safe_create_leading_directories_const(sb_git
.buf
))
270 die_errno(_("could not create leading directories of '%s'"),
272 junk_work_tree
= xstrdup(path
);
275 strbuf_addf(&sb
, "%s/gitdir", sb_repo
.buf
);
276 write_file(sb
.buf
, "%s", real_path(sb_git
.buf
));
277 write_file(sb_git
.buf
, "gitdir: %s/worktrees/%s",
278 real_path(get_git_common_dir()), name
);
280 * This is to keep resolve_ref() happy. We need a valid HEAD
281 * or is_git_directory() will reject the directory. Any value which
282 * looks like an object ID will do since it will be immediately
283 * replaced by the symbolic-ref or update-ref invocation in the new
287 strbuf_addf(&sb
, "%s/HEAD", sb_repo
.buf
);
288 write_file(sb
.buf
, "%s", sha1_to_hex(null_sha1
));
290 strbuf_addf(&sb
, "%s/commondir", sb_repo
.buf
);
291 write_file(sb
.buf
, "../..");
293 fprintf_ln(stderr
, _("Preparing %s (identifier %s)"), path
, name
);
295 argv_array_pushf(&child_env
, "%s=%s", GIT_DIR_ENVIRONMENT
, sb_git
.buf
);
296 argv_array_pushf(&child_env
, "%s=%s", GIT_WORK_TREE_ENVIRONMENT
, path
);
300 argv_array_pushl(&cp
.args
, "update-ref", "HEAD",
301 oid_to_hex(&commit
->object
.oid
), NULL
);
303 argv_array_pushl(&cp
.args
, "symbolic-ref", "HEAD",
305 cp
.env
= child_env
.argv
;
306 ret
= run_command(&cp
);
310 if (opts
->checkout
) {
312 argv_array_clear(&cp
.args
);
313 argv_array_pushl(&cp
.args
, "reset", "--hard", NULL
);
314 cp
.env
= child_env
.argv
;
315 ret
= run_command(&cp
);
321 FREE_AND_NULL(junk_work_tree
);
322 FREE_AND_NULL(junk_git_dir
);
325 if (ret
|| !opts
->keep_locked
) {
327 strbuf_addf(&sb
, "%s/locked", sb_repo
.buf
);
328 unlink_or_warn(sb
.buf
);
330 argv_array_clear(&child_env
);
332 strbuf_release(&symref
);
333 strbuf_release(&sb_repo
);
334 strbuf_release(&sb_git
);
338 static int add(int ac
, const char **av
, const char *prefix
)
340 struct add_opts opts
;
341 const char *new_branch_force
= NULL
;
344 struct option options
[] = {
345 OPT__FORCE(&opts
.force
, N_("checkout <branch> even if already checked out in other worktree")),
346 OPT_STRING('b', NULL
, &opts
.new_branch
, N_("branch"),
347 N_("create a new branch")),
348 OPT_STRING('B', NULL
, &new_branch_force
, N_("branch"),
349 N_("create or reset a branch")),
350 OPT_BOOL(0, "detach", &opts
.detach
, N_("detach HEAD at named commit")),
351 OPT_BOOL(0, "checkout", &opts
.checkout
, N_("populate the new working tree")),
352 OPT_BOOL(0, "lock", &opts
.keep_locked
, N_("keep the new working tree locked")),
356 memset(&opts
, 0, sizeof(opts
));
358 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
359 if (!!opts
.detach
+ !!opts
.new_branch
+ !!new_branch_force
> 1)
360 die(_("-b, -B, and --detach are mutually exclusive"));
361 if (ac
< 1 || ac
> 2)
362 usage_with_options(worktree_usage
, options
);
364 path
= prefix_filename(prefix
, av
[0]);
365 branch
= ac
< 2 ? "HEAD" : av
[1];
367 if (!strcmp(branch
, "-"))
370 opts
.force_new_branch
= !!new_branch_force
;
371 if (opts
.force_new_branch
) {
372 struct strbuf symref
= STRBUF_INIT
;
374 opts
.new_branch
= new_branch_force
;
377 !strbuf_check_branch_ref(&symref
, opts
.new_branch
) &&
378 ref_exists(symref
.buf
))
379 die_if_checked_out(symref
.buf
, 0);
380 strbuf_release(&symref
);
383 if (ac
< 2 && !opts
.new_branch
&& !opts
.detach
) {
385 const char *s
= worktree_basename(path
, &n
);
386 opts
.new_branch
= xstrndup(s
, n
);
389 if (opts
.new_branch
) {
390 struct child_process cp
= CHILD_PROCESS_INIT
;
392 argv_array_push(&cp
.args
, "branch");
393 if (opts
.force_new_branch
)
394 argv_array_push(&cp
.args
, "--force");
395 argv_array_push(&cp
.args
, opts
.new_branch
);
396 argv_array_push(&cp
.args
, branch
);
397 if (run_command(&cp
))
399 branch
= opts
.new_branch
;
404 return add_worktree(path
, branch
, &opts
);
407 static void show_worktree_porcelain(struct worktree
*wt
)
409 printf("worktree %s\n", wt
->path
);
413 printf("HEAD %s\n", sha1_to_hex(wt
->head_sha1
));
415 printf("detached\n");
416 else if (wt
->head_ref
)
417 printf("branch %s\n", wt
->head_ref
);
422 static void show_worktree(struct worktree
*wt
, int path_maxlen
, int abbrev_len
)
424 struct strbuf sb
= STRBUF_INIT
;
425 int cur_path_len
= strlen(wt
->path
);
426 int path_adj
= cur_path_len
- utf8_strwidth(wt
->path
);
428 strbuf_addf(&sb
, "%-*s ", 1 + path_maxlen
+ path_adj
, wt
->path
);
430 strbuf_addstr(&sb
, "(bare)");
432 strbuf_addf(&sb
, "%-*s ", abbrev_len
,
433 find_unique_abbrev(wt
->head_sha1
, DEFAULT_ABBREV
));
435 strbuf_addstr(&sb
, "(detached HEAD)");
436 else if (wt
->head_ref
) {
437 char *ref
= shorten_unambiguous_ref(wt
->head_ref
, 0);
438 strbuf_addf(&sb
, "[%s]", ref
);
441 strbuf_addstr(&sb
, "(error)");
443 printf("%s\n", sb
.buf
);
448 static void measure_widths(struct worktree
**wt
, int *abbrev
, int *maxlen
)
452 for (i
= 0; wt
[i
]; i
++) {
454 int path_len
= strlen(wt
[i
]->path
);
456 if (path_len
> *maxlen
)
458 sha1_len
= strlen(find_unique_abbrev(wt
[i
]->head_sha1
, *abbrev
));
459 if (sha1_len
> *abbrev
)
464 static int list(int ac
, const char **av
, const char *prefix
)
468 struct option options
[] = {
469 OPT_BOOL(0, "porcelain", &porcelain
, N_("machine-readable output")),
473 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
475 usage_with_options(worktree_usage
, options
);
477 struct worktree
**worktrees
= get_worktrees(GWT_SORT_LINKED
);
478 int path_maxlen
= 0, abbrev
= DEFAULT_ABBREV
, i
;
481 measure_widths(worktrees
, &abbrev
, &path_maxlen
);
483 for (i
= 0; worktrees
[i
]; i
++) {
485 show_worktree_porcelain(worktrees
[i
]);
487 show_worktree(worktrees
[i
], path_maxlen
, abbrev
);
489 free_worktrees(worktrees
);
494 static int lock_worktree(int ac
, const char **av
, const char *prefix
)
496 const char *reason
= "", *old_reason
;
497 struct option options
[] = {
498 OPT_STRING(0, "reason", &reason
, N_("string"),
499 N_("reason for locking")),
502 struct worktree
**worktrees
, *wt
;
504 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
506 usage_with_options(worktree_usage
, options
);
508 worktrees
= get_worktrees(0);
509 wt
= find_worktree(worktrees
, prefix
, av
[0]);
511 die(_("'%s' is not a working tree"), av
[0]);
512 if (is_main_worktree(wt
))
513 die(_("The main working tree cannot be locked or unlocked"));
515 old_reason
= is_worktree_locked(wt
);
518 die(_("'%s' is already locked, reason: %s"),
520 die(_("'%s' is already locked"), av
[0]);
523 write_file(git_common_path("worktrees/%s/locked", wt
->id
),
525 free_worktrees(worktrees
);
529 static int unlock_worktree(int ac
, const char **av
, const char *prefix
)
531 struct option options
[] = {
534 struct worktree
**worktrees
, *wt
;
537 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
539 usage_with_options(worktree_usage
, options
);
541 worktrees
= get_worktrees(0);
542 wt
= find_worktree(worktrees
, prefix
, av
[0]);
544 die(_("'%s' is not a working tree"), av
[0]);
545 if (is_main_worktree(wt
))
546 die(_("The main working tree cannot be locked or unlocked"));
547 if (!is_worktree_locked(wt
))
548 die(_("'%s' is not locked"), av
[0]);
549 ret
= unlink_or_warn(git_common_path("worktrees/%s/locked", wt
->id
));
550 free_worktrees(worktrees
);
554 int cmd_worktree(int ac
, const char **av
, const char *prefix
)
556 struct option options
[] = {
560 git_config(git_default_config
, NULL
);
563 usage_with_options(worktree_usage
, options
);
566 if (!strcmp(av
[1], "add"))
567 return add(ac
- 1, av
+ 1, prefix
);
568 if (!strcmp(av
[1], "prune"))
569 return prune(ac
- 1, av
+ 1, prefix
);
570 if (!strcmp(av
[1], "list"))
571 return list(ac
- 1, av
+ 1, prefix
);
572 if (!strcmp(av
[1], "lock"))
573 return lock_worktree(ac
- 1, av
+ 1, prefix
);
574 if (!strcmp(av
[1], "unlock"))
575 return unlock_worktree(ac
- 1, av
+ 1, prefix
);
576 usage_with_options(worktree_usage
, options
);