mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
worktree: teach list
to annotate prunable worktree
The "git worktree list" command shows the absolute path to the worktree, the commit that is checked out, the name of the branch, and a "locked" annotation if the worktree is locked, however, it does not indicate whether the worktree is prunable. The "prune" command will remove a worktree if it is prunable unless `--dry-run` option is specified. This could lead to a worktree being removed without the user realizing before it is too late, in case the user forgets to pass --dry-run for instance. If the "list" command shows which worktree is prunable, the user could verify before running "git worktree prune" and hopefully prevents the working tree to be removed "accidentally" on the worse case scenario. Let's teach "git worktree list" to show when a worktree is a prunable candidate for both default and porcelain format. In the default format a "prunable" text is appended: $ git worktree list /path/to/main aba123 [main] /path/to/linked 123abc [branch-a] /path/to/prunable ace127 (detached HEAD) prunable In the --porcelain format a prunable label is added followed by its reason: $ git worktree list --porcelain ... worktree /path/to/prunable HEAD abc1234abc1234abc1234abc1234abc1234abc12 detached prunable gitdir file points to non-existent location ... Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Rafael Silva <rafaeloliveira.cs@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
862c723d18
commit
9b19a58f66
|
@ -97,8 +97,9 @@ list::
|
||||||
List details of each working tree. The main working tree is listed first,
|
List details of each working tree. The main working tree is listed first,
|
||||||
followed by each of the linked working trees. The output details include
|
followed by each of the linked working trees. The output details include
|
||||||
whether the working tree is bare, the revision currently checked out, the
|
whether the working tree is bare, the revision currently checked out, the
|
||||||
branch currently checked out (or "detached HEAD" if none), and "locked" if
|
branch currently checked out (or "detached HEAD" if none), "locked" if
|
||||||
the worktree is locked.
|
the worktree is locked, "prunable" if the worktree can be pruned by `prune`
|
||||||
|
command.
|
||||||
|
|
||||||
lock::
|
lock::
|
||||||
|
|
||||||
|
@ -234,6 +235,9 @@ This can also be set up as the default behaviour by using the
|
||||||
|
|
||||||
--expire <time>::
|
--expire <time>::
|
||||||
With `prune`, only expire unused working trees older than `<time>`.
|
With `prune`, only expire unused working trees older than `<time>`.
|
||||||
|
+
|
||||||
|
With `list`, annotate missing working trees as prunable if they are
|
||||||
|
older than `<time>`.
|
||||||
|
|
||||||
--reason <string>::
|
--reason <string>::
|
||||||
With `lock`, an explanation why the working tree is locked.
|
With `lock`, an explanation why the working tree is locked.
|
||||||
|
@ -372,6 +376,19 @@ $ git worktree list
|
||||||
/path/to/other-linked-worktree 1234abc (detached HEAD)
|
/path/to/other-linked-worktree 1234abc (detached HEAD)
|
||||||
------------
|
------------
|
||||||
|
|
||||||
|
The command also shows annotations for each working tree, according to its state.
|
||||||
|
These annotations are:
|
||||||
|
|
||||||
|
* `locked`, if the working tree is locked.
|
||||||
|
* `prunable`, if the working tree can be pruned via `git worktree prune`.
|
||||||
|
|
||||||
|
------------
|
||||||
|
$ git worktree list
|
||||||
|
/path/to/linked-worktree abcd1234 [master]
|
||||||
|
/path/to/locked-worktreee acbd5678 (brancha) locked
|
||||||
|
/path/to/prunable-worktree 5678abc (detached HEAD) prunable
|
||||||
|
------------
|
||||||
|
|
||||||
Porcelain Format
|
Porcelain Format
|
||||||
~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~
|
||||||
The porcelain format has a line per attribute. Attributes are listed with a
|
The porcelain format has a line per attribute. Attributes are listed with a
|
||||||
|
@ -405,6 +422,11 @@ HEAD 3456def3456def3456def3456def3456def3456b
|
||||||
branch refs/heads/locked-with-reason
|
branch refs/heads/locked-with-reason
|
||||||
locked reason why is locked
|
locked reason why is locked
|
||||||
|
|
||||||
|
worktree /path/to/linked-worktree-prunable
|
||||||
|
HEAD 1233def1234def1234def1234def1234def1234b
|
||||||
|
detached
|
||||||
|
prunable gitdir file points to non-existent location
|
||||||
|
|
||||||
------------
|
------------
|
||||||
|
|
||||||
If the lock reason contains "unusual" characters such as newline, they
|
If the lock reason contains "unusual" characters such as newline, they
|
||||||
|
|
|
@ -592,6 +592,10 @@ static void show_worktree_porcelain(struct worktree *wt)
|
||||||
} else if (reason)
|
} else if (reason)
|
||||||
printf("locked\n");
|
printf("locked\n");
|
||||||
|
|
||||||
|
reason = worktree_prune_reason(wt, expire);
|
||||||
|
if (reason)
|
||||||
|
printf("prunable %s\n", reason);
|
||||||
|
|
||||||
printf("\n");
|
printf("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -620,6 +624,9 @@ static void show_worktree(struct worktree *wt, int path_maxlen, int abbrev_len)
|
||||||
if (worktree_lock_reason(wt))
|
if (worktree_lock_reason(wt))
|
||||||
strbuf_addstr(&sb, " locked");
|
strbuf_addstr(&sb, " locked");
|
||||||
|
|
||||||
|
if (worktree_prune_reason(wt, expire))
|
||||||
|
strbuf_addstr(&sb, " prunable");
|
||||||
|
|
||||||
printf("%s\n", sb.buf);
|
printf("%s\n", sb.buf);
|
||||||
strbuf_release(&sb);
|
strbuf_release(&sb);
|
||||||
}
|
}
|
||||||
|
@ -663,9 +670,12 @@ static int list(int ac, const char **av, const char *prefix)
|
||||||
|
|
||||||
struct option options[] = {
|
struct option options[] = {
|
||||||
OPT_BOOL(0, "porcelain", &porcelain, N_("machine-readable output")),
|
OPT_BOOL(0, "porcelain", &porcelain, N_("machine-readable output")),
|
||||||
|
OPT_EXPIRY_DATE(0, "expire", &expire,
|
||||||
|
N_("add 'prunable' annotation to worktrees older than <time>")),
|
||||||
OPT_END()
|
OPT_END()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
expire = TIME_MAX;
|
||||||
ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
|
ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
|
||||||
if (ac)
|
if (ac)
|
||||||
usage_with_options(worktree_usage, options);
|
usage_with_options(worktree_usage, options);
|
||||||
|
|
|
@ -104,6 +104,38 @@ test_expect_success '"list" all worktrees --porcelain with locked reason newline
|
||||||
test_cmp expect actual
|
test_cmp expect actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success '"list" all worktrees with prunable annotation' '
|
||||||
|
test_when_finished "rm -rf prunable unprunable out && git worktree prune" &&
|
||||||
|
git worktree add --detach prunable &&
|
||||||
|
git worktree add --detach unprunable &&
|
||||||
|
rm -rf prunable &&
|
||||||
|
git worktree list >out &&
|
||||||
|
grep "/prunable *[0-9a-f].* prunable$" out &&
|
||||||
|
! grep "/unprunable *[0-9a-f].* prunable$"
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success '"list" all worktrees --porcelain with prunable' '
|
||||||
|
test_when_finished "rm -rf prunable out && git worktree prune" &&
|
||||||
|
git worktree add --detach prunable &&
|
||||||
|
rm -rf prunable &&
|
||||||
|
git worktree list --porcelain >out &&
|
||||||
|
sed -n "/^worktree .*\/prunable$/,/^$/p" <out >only_prunable &&
|
||||||
|
test_i18ngrep "^prunable gitdir file points to non-existent location$" only_prunable
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success '"list" all worktrees with prunable consistent with "prune"' '
|
||||||
|
test_when_finished "rm -rf prunable unprunable out && git worktree prune" &&
|
||||||
|
git worktree add --detach prunable &&
|
||||||
|
git worktree add --detach unprunable &&
|
||||||
|
rm -rf prunable &&
|
||||||
|
git worktree list >out &&
|
||||||
|
grep "/prunable *[0-9a-f].* prunable$" out &&
|
||||||
|
! grep "/unprunable *[0-9a-f].* unprunable$" out &&
|
||||||
|
git worktree prune --verbose >out &&
|
||||||
|
test_i18ngrep "^Removing worktrees/prunable" out &&
|
||||||
|
test_i18ngrep ! "^Removing worktrees/unprunable" out
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'bare repo setup' '
|
test_expect_success 'bare repo setup' '
|
||||||
git init --bare bare1 &&
|
git init --bare bare1 &&
|
||||||
echo "data" >file1 &&
|
echo "data" >file1 &&
|
||||||
|
|
Loading…
Reference in a new issue