4 #include "parse-options.h"
5 #include "argv-array.h"
8 #include "run-command.h"
14 static const char * const worktree_usage
[] = {
15 N_("git worktree add [<options>] <path> [<branch>]"),
16 N_("git worktree list [<options>]"),
17 N_("git worktree lock [<options>] <path>"),
18 N_("git worktree prune [<options>]"),
19 N_("git worktree unlock <path>"),
28 const char *new_branch
;
34 static timestamp_t expire
;
36 static int prune_worktree(const char *id
, struct strbuf
*reason
)
42 if (!is_directory(git_path("worktrees/%s", id
))) {
43 strbuf_addf(reason
, _("Removing worktrees/%s: not a valid directory"), id
);
46 if (file_exists(git_path("worktrees/%s/locked", id
)))
48 if (stat(git_path("worktrees/%s/gitdir", id
), &st
)) {
49 strbuf_addf(reason
, _("Removing worktrees/%s: gitdir file does not exist"), id
);
52 fd
= open(git_path("worktrees/%s/gitdir", id
), O_RDONLY
);
54 strbuf_addf(reason
, _("Removing worktrees/%s: unable to read gitdir file (%s)"),
60 read_in_full(fd
, path
, len
);
62 while (len
&& (path
[len
- 1] == '\n' || path
[len
- 1] == '\r'))
65 strbuf_addf(reason
, _("Removing worktrees/%s: invalid gitdir file"), id
);
70 if (!file_exists(path
)) {
74 * the repo is moved manually and has not been
77 if (!stat(git_path("worktrees/%s/link", id
), &st_link
) &&
80 if (st
.st_mtime
<= expire
) {
81 strbuf_addf(reason
, _("Removing worktrees/%s: gitdir file points to non-existent location"), id
);
91 static void prune_worktrees(void)
93 struct strbuf reason
= STRBUF_INIT
;
94 struct strbuf path
= STRBUF_INIT
;
95 DIR *dir
= opendir(git_path("worktrees"));
100 while ((d
= readdir(dir
)) != NULL
) {
101 if (is_dot_or_dotdot(d
->d_name
))
103 strbuf_reset(&reason
);
104 if (!prune_worktree(d
->d_name
, &reason
))
106 if (show_only
|| verbose
)
107 printf("%s\n", reason
.buf
);
110 git_path_buf(&path
, "worktrees/%s", d
->d_name
);
111 ret
= remove_dir_recursively(&path
, 0);
112 if (ret
< 0 && errno
== ENOTDIR
)
113 ret
= unlink(path
.buf
);
115 error_errno(_("failed to remove '%s'"), path
.buf
);
119 rmdir(git_path("worktrees"));
120 strbuf_release(&reason
);
121 strbuf_release(&path
);
124 static int prune(int ac
, const char **av
, const char *prefix
)
126 struct option options
[] = {
127 OPT__DRY_RUN(&show_only
, N_("do not remove, show only")),
128 OPT__VERBOSE(&verbose
, N_("report pruned working trees")),
129 OPT_EXPIRY_DATE(0, "expire", &expire
,
130 N_("expire working trees older than <time>")),
135 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
137 usage_with_options(worktree_usage
, options
);
142 static char *junk_work_tree
;
143 static char *junk_git_dir
;
145 static pid_t junk_pid
;
147 static void remove_junk(void)
149 struct strbuf sb
= STRBUF_INIT
;
150 if (!is_junk
|| getpid() != junk_pid
)
153 strbuf_addstr(&sb
, junk_git_dir
);
154 remove_dir_recursively(&sb
, 0);
157 if (junk_work_tree
) {
158 strbuf_addstr(&sb
, junk_work_tree
);
159 remove_dir_recursively(&sb
, 0);
164 static void remove_junk_on_signal(int signo
)
171 static const char *worktree_basename(const char *path
, int *olen
)
177 while (len
&& is_dir_sep(path
[len
- 1]))
180 for (name
= path
+ len
- 1; name
> path
; name
--)
181 if (is_dir_sep(*name
)) {
190 static int add_worktree(const char *path
, const char *refname
,
191 const struct add_opts
*opts
)
193 struct strbuf sb_git
= STRBUF_INIT
, sb_repo
= STRBUF_INIT
;
194 struct strbuf sb
= STRBUF_INIT
;
197 struct child_process cp
= CHILD_PROCESS_INIT
;
198 struct argv_array child_env
= ARGV_ARRAY_INIT
;
199 int counter
= 0, len
, ret
;
200 struct strbuf symref
= STRBUF_INIT
;
201 struct commit
*commit
= NULL
;
203 if (file_exists(path
) && !is_empty_dir(path
))
204 die(_("'%s' already exists"), path
);
206 /* is 'refname' a branch or commit? */
207 if (!opts
->detach
&& !strbuf_check_branch_ref(&symref
, refname
) &&
208 ref_exists(symref
.buf
)) { /* it's a branch */
210 die_if_checked_out(symref
.buf
, 0);
211 } else { /* must be a commit */
212 commit
= lookup_commit_reference_by_name(refname
);
214 die(_("invalid reference: %s"), refname
);
217 name
= worktree_basename(path
, &len
);
218 git_path_buf(&sb_repo
, "worktrees/%.*s", (int)(path
+ len
- name
), name
);
220 if (safe_create_leading_directories_const(sb_repo
.buf
))
221 die_errno(_("could not create leading directories of '%s'"),
223 while (!stat(sb_repo
.buf
, &st
)) {
225 strbuf_setlen(&sb_repo
, len
);
226 strbuf_addf(&sb_repo
, "%d", counter
);
228 name
= strrchr(sb_repo
.buf
, '/') + 1;
232 sigchain_push_common(remove_junk_on_signal
);
234 if (mkdir(sb_repo
.buf
, 0777))
235 die_errno(_("could not create directory of '%s'"), sb_repo
.buf
);
236 junk_git_dir
= xstrdup(sb_repo
.buf
);
240 * lock the incomplete repo so prune won't delete it, unlock
241 * after the preparation is over.
243 strbuf_addf(&sb
, "%s/locked", sb_repo
.buf
);
244 if (!opts
->keep_locked
)
245 write_file(sb
.buf
, "initializing");
247 write_file(sb
.buf
, "added with --lock");
249 strbuf_addf(&sb_git
, "%s/.git", path
);
250 if (safe_create_leading_directories_const(sb_git
.buf
))
251 die_errno(_("could not create leading directories of '%s'"),
253 junk_work_tree
= xstrdup(path
);
256 strbuf_addf(&sb
, "%s/gitdir", sb_repo
.buf
);
257 write_file(sb
.buf
, "%s", real_path(sb_git
.buf
));
258 write_file(sb_git
.buf
, "gitdir: %s/worktrees/%s",
259 real_path(get_git_common_dir()), name
);
261 * This is to keep resolve_ref() happy. We need a valid HEAD
262 * or is_git_directory() will reject the directory. Any value which
263 * looks like an object ID will do since it will be immediately
264 * replaced by the symbolic-ref or update-ref invocation in the new
268 strbuf_addf(&sb
, "%s/HEAD", sb_repo
.buf
);
269 write_file(sb
.buf
, "%s", sha1_to_hex(null_sha1
));
271 strbuf_addf(&sb
, "%s/commondir", sb_repo
.buf
);
272 write_file(sb
.buf
, "../..");
274 fprintf_ln(stderr
, _("Preparing %s (identifier %s)"), path
, name
);
276 argv_array_pushf(&child_env
, "%s=%s", GIT_DIR_ENVIRONMENT
, sb_git
.buf
);
277 argv_array_pushf(&child_env
, "%s=%s", GIT_WORK_TREE_ENVIRONMENT
, path
);
281 argv_array_pushl(&cp
.args
, "update-ref", "HEAD",
282 oid_to_hex(&commit
->object
.oid
), NULL
);
284 argv_array_pushl(&cp
.args
, "symbolic-ref", "HEAD",
286 cp
.env
= child_env
.argv
;
287 ret
= run_command(&cp
);
291 if (opts
->checkout
) {
293 argv_array_clear(&cp
.args
);
294 argv_array_pushl(&cp
.args
, "reset", "--hard", NULL
);
295 cp
.env
= child_env
.argv
;
296 ret
= run_command(&cp
);
302 free(junk_work_tree
);
304 junk_work_tree
= NULL
;
308 if (ret
|| !opts
->keep_locked
) {
310 strbuf_addf(&sb
, "%s/locked", sb_repo
.buf
);
311 unlink_or_warn(sb
.buf
);
313 argv_array_clear(&child_env
);
315 strbuf_release(&symref
);
316 strbuf_release(&sb_repo
);
317 strbuf_release(&sb_git
);
321 static int add(int ac
, const char **av
, const char *prefix
)
323 struct add_opts opts
;
324 const char *new_branch_force
= NULL
;
327 struct option options
[] = {
328 OPT__FORCE(&opts
.force
, N_("checkout <branch> even if already checked out in other worktree")),
329 OPT_STRING('b', NULL
, &opts
.new_branch
, N_("branch"),
330 N_("create a new branch")),
331 OPT_STRING('B', NULL
, &new_branch_force
, N_("branch"),
332 N_("create or reset a branch")),
333 OPT_BOOL(0, "detach", &opts
.detach
, N_("detach HEAD at named commit")),
334 OPT_BOOL(0, "checkout", &opts
.checkout
, N_("populate the new working tree")),
335 OPT_BOOL(0, "lock", &opts
.keep_locked
, N_("keep the new working tree locked")),
339 memset(&opts
, 0, sizeof(opts
));
341 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
342 if (!!opts
.detach
+ !!opts
.new_branch
+ !!new_branch_force
> 1)
343 die(_("-b, -B, and --detach are mutually exclusive"));
344 if (ac
< 1 || ac
> 2)
345 usage_with_options(worktree_usage
, options
);
347 path
= prefix_filename(prefix
, av
[0]);
348 branch
= ac
< 2 ? "HEAD" : av
[1];
350 if (!strcmp(branch
, "-"))
353 opts
.force_new_branch
= !!new_branch_force
;
354 if (opts
.force_new_branch
) {
355 struct strbuf symref
= STRBUF_INIT
;
357 opts
.new_branch
= new_branch_force
;
360 !strbuf_check_branch_ref(&symref
, opts
.new_branch
) &&
361 ref_exists(symref
.buf
))
362 die_if_checked_out(symref
.buf
, 0);
363 strbuf_release(&symref
);
366 if (ac
< 2 && !opts
.new_branch
&& !opts
.detach
) {
368 const char *s
= worktree_basename(path
, &n
);
369 opts
.new_branch
= xstrndup(s
, n
);
372 if (opts
.new_branch
) {
373 struct child_process cp
= CHILD_PROCESS_INIT
;
375 argv_array_push(&cp
.args
, "branch");
376 if (opts
.force_new_branch
)
377 argv_array_push(&cp
.args
, "--force");
378 argv_array_push(&cp
.args
, opts
.new_branch
);
379 argv_array_push(&cp
.args
, branch
);
380 if (run_command(&cp
))
382 branch
= opts
.new_branch
;
385 return add_worktree(path
, branch
, &opts
);
388 static void show_worktree_porcelain(struct worktree
*wt
)
390 printf("worktree %s\n", wt
->path
);
394 printf("HEAD %s\n", sha1_to_hex(wt
->head_sha1
));
396 printf("detached\n");
397 else if (wt
->head_ref
)
398 printf("branch %s\n", wt
->head_ref
);
403 static void show_worktree(struct worktree
*wt
, int path_maxlen
, int abbrev_len
)
405 struct strbuf sb
= STRBUF_INIT
;
406 int cur_path_len
= strlen(wt
->path
);
407 int path_adj
= cur_path_len
- utf8_strwidth(wt
->path
);
409 strbuf_addf(&sb
, "%-*s ", 1 + path_maxlen
+ path_adj
, wt
->path
);
411 strbuf_addstr(&sb
, "(bare)");
413 strbuf_addf(&sb
, "%-*s ", abbrev_len
,
414 find_unique_abbrev(wt
->head_sha1
, DEFAULT_ABBREV
));
416 strbuf_addstr(&sb
, "(detached HEAD)");
417 else if (wt
->head_ref
)
418 strbuf_addf(&sb
, "[%s]", shorten_unambiguous_ref(wt
->head_ref
, 0));
420 strbuf_addstr(&sb
, "(error)");
422 printf("%s\n", sb
.buf
);
427 static void measure_widths(struct worktree
**wt
, int *abbrev
, int *maxlen
)
431 for (i
= 0; wt
[i
]; i
++) {
433 int path_len
= strlen(wt
[i
]->path
);
435 if (path_len
> *maxlen
)
437 sha1_len
= strlen(find_unique_abbrev(wt
[i
]->head_sha1
, *abbrev
));
438 if (sha1_len
> *abbrev
)
443 static int list(int ac
, const char **av
, const char *prefix
)
447 struct option options
[] = {
448 OPT_BOOL(0, "porcelain", &porcelain
, N_("machine-readable output")),
452 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
454 usage_with_options(worktree_usage
, options
);
456 struct worktree
**worktrees
= get_worktrees(GWT_SORT_LINKED
);
457 int path_maxlen
= 0, abbrev
= DEFAULT_ABBREV
, i
;
460 measure_widths(worktrees
, &abbrev
, &path_maxlen
);
462 for (i
= 0; worktrees
[i
]; i
++) {
464 show_worktree_porcelain(worktrees
[i
]);
466 show_worktree(worktrees
[i
], path_maxlen
, abbrev
);
468 free_worktrees(worktrees
);
473 static int lock_worktree(int ac
, const char **av
, const char *prefix
)
475 const char *reason
= "", *old_reason
;
476 struct option options
[] = {
477 OPT_STRING(0, "reason", &reason
, N_("string"),
478 N_("reason for locking")),
481 struct worktree
**worktrees
, *wt
;
483 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
485 usage_with_options(worktree_usage
, options
);
487 worktrees
= get_worktrees(0);
488 wt
= find_worktree(worktrees
, prefix
, av
[0]);
490 die(_("'%s' is not a working tree"), av
[0]);
491 if (is_main_worktree(wt
))
492 die(_("The main working tree cannot be locked or unlocked"));
494 old_reason
= is_worktree_locked(wt
);
497 die(_("'%s' is already locked, reason: %s"),
499 die(_("'%s' is already locked"), av
[0]);
502 write_file(git_common_path("worktrees/%s/locked", wt
->id
),
504 free_worktrees(worktrees
);
508 static int unlock_worktree(int ac
, const char **av
, const char *prefix
)
510 struct option options
[] = {
513 struct worktree
**worktrees
, *wt
;
516 ac
= parse_options(ac
, av
, prefix
, options
, worktree_usage
, 0);
518 usage_with_options(worktree_usage
, options
);
520 worktrees
= get_worktrees(0);
521 wt
= find_worktree(worktrees
, prefix
, av
[0]);
523 die(_("'%s' is not a working tree"), av
[0]);
524 if (is_main_worktree(wt
))
525 die(_("The main working tree cannot be locked or unlocked"));
526 if (!is_worktree_locked(wt
))
527 die(_("'%s' is not locked"), av
[0]);
528 ret
= unlink_or_warn(git_common_path("worktrees/%s/locked", wt
->id
));
529 free_worktrees(worktrees
);
533 int cmd_worktree(int ac
, const char **av
, const char *prefix
)
535 struct option options
[] = {
539 git_config(git_default_config
, NULL
);
542 usage_with_options(worktree_usage
, options
);
545 if (!strcmp(av
[1], "add"))
546 return add(ac
- 1, av
+ 1, prefix
);
547 if (!strcmp(av
[1], "prune"))
548 return prune(ac
- 1, av
+ 1, prefix
);
549 if (!strcmp(av
[1], "list"))
550 return list(ac
- 1, av
+ 1, prefix
);
551 if (!strcmp(av
[1], "lock"))
552 return lock_worktree(ac
- 1, av
+ 1, prefix
);
553 if (!strcmp(av
[1], "unlock"))
554 return unlock_worktree(ac
- 1, av
+ 1, prefix
);
555 usage_with_options(worktree_usage
, options
);