From: Eric Sunshine <sunshine@sunshineco.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Subject: Re: [PATCH 6/7] worktree remove: new command
Date: Fri, 2 Feb 2018 06:47:13 -0500 [thread overview]
Message-ID: <CAPig+cQvVreeggOj52bVLS6R0ZCar_yfUcyLbN3-nLG81eOQaA@mail.gmail.com> (raw)
In-Reply-To: <20180124095357.19645-7-pclouds@gmail.com>
On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:
> This command allows to delete a worktree. Like 'move' you cannot
> remove the main worktree, or one with submodules inside [1].
> [...]
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> diff --git a/builtin/worktree.c b/builtin/worktree.c
> @@ -688,6 +689,132 @@ static int move_worktree(int ac, const char **av, const char *prefix)
> +static void check_clean_worktree(struct worktree *wt,
> + const char *original_path)
> +{
> + [...]
> + validate_no_submodules(wt);
It's slightly strange seeing worktree validation in a function
checking whether the worktree is clean since submodule validation
isn't an issue of cleanliness. I'd have expected the caller to invoke
it instead:
int remove_worktree(...) {
...
if (!force) {
validate_no_submodules(wt);
check_clean_worktree(wt, av[0]);
}
...
}
On the other hand, I could imagine it being called here as appropriate
if submodule validation eventually also checks submodule cleanliness
as hinted by the commit message.
> + argv_array_pushf(&child_env, "%s=%s/.git",
> + GIT_DIR_ENVIRONMENT, wt->path);
> + argv_array_pushf(&child_env, "%s=%s",
> + GIT_WORK_TREE_ENVIRONMENT, wt->path);
> + memset(&cp, 0, sizeof(cp));
> + argv_array_pushl(&cp.args, "status",
> + "--porcelain", "--ignore-submodules=none",
> + NULL);
> + cp.env = child_env.argv;
> + cp.git_cmd = 1;
> + cp.dir = wt->path;
> + cp.out = -1;
> + ret = start_command(&cp);
> + if (ret)
> + die_errno(_("failed to run git-status on '%s'"),
> + original_path);
Minor: I think there was some effort recently to remove "git-foo"
style mentions from documentation and error messages. Perhaps this
could be "failed to run 'git status' on '%s'". Ditto below.
> + ret = xread(cp.out, buf, sizeof(buf));
> + if (ret)
> + die(_("'%s' is dirty, use --force to delete it"),
> + original_path);
> + close(cp.out);
> + ret = finish_command(&cp);
> + if (ret)
> + die_errno(_("failed to run git-status on '%s', code %d"),
> + original_path, ret);
> +}
> +
> +static int delete_git_work_tree(struct worktree *wt)
> +{
> + struct strbuf sb = STRBUF_INIT;
> + int ret = 0;
> +
> + strbuf_addstr(&sb, wt->path);
> + if (remove_dir_recursively(&sb, 0)) {
> + error_errno(_("failed to delete '%s'"), sb.buf);
> + ret = -1;
> + }
> + strbuf_release(&sb);
> +
> + return ret;
> +}
Style nit: In the very similar delete_git_dir(), just below, there is
no blank line before 'return'.
> +
> +static int delete_git_dir(struct worktree *wt)
> +{
> + struct strbuf sb = STRBUF_INIT;
> + int ret = 0;
> +
> + strbuf_addstr(&sb, git_common_path("worktrees/%s", wt->id));
> + if (remove_dir_recursively(&sb, 0)) {
> + error_errno(_("failed to delete '%s'"), sb.buf);
> + ret = -1;
> + }
> + strbuf_release(&sb);
> + return ret;
> +}
> +
> +static int remove_worktree(int ac, const char **av, const char *prefix)
> +{
> + [...]
> + if (reason) {
> + if (*reason)
> + die(_("cannot remove a locked working tree, lock reason: %s"),
> + reason);
> + die(_("cannot remove a locked working tree"));
> + }
> + if (validate_worktree(wt, &errmsg))
> + die(_("validation failed, cannot remove working tree:\n%s"),
> + errmsg.buf);
Minor: Same concern as in 3/7 about the multi-line error message
making scripted handling of error message collection more difficult.
> + strbuf_release(&errmsg);
> +
> + if (!force)
> + check_clean_worktree(wt, av[0]);
> +
> + ret |= delete_git_work_tree(wt);
> + /*
> + * continue on even if ret is non-zero, there's no going back
> + * from here.
> + */
> + ret |= delete_git_dir(wt);
> +
> + free_worktrees(worktrees);
> + return ret;
> +}
> diff --git a/t/t2028-worktree-move.sh b/t/t2028-worktree-move.sh
> @@ -90,4 +90,30 @@ test_expect_success 'move main worktree' '
> +test_expect_success 'remove locked worktree' '
> + git worktree lock destination &&
> + test_must_fail git worktree remove destination &&
> + git worktree unlock destination
> +'
Perhaps place 'unlock' in test_when_finished()[1].
> +test_expect_success 'remove worktree with dirty tracked file' '
> + echo dirty >>destination/init.t &&
> + test_must_fail git worktree remove destination
> +'
> +
> +test_expect_success 'remove worktree with untracked file' '
> + git -C destination checkout init.t &&
Reversion of 'init.t' probably belongs in the preceding test which
modified it, wrapped in test_when_finished()[1].
> + : >destination/untracked &&
> + test_must_fail git worktree remove destination
> +'
[1]: https://public-inbox.org/git/CAPig+cSV9_6j6Nkptma3BewKW8QQcem7gwFCb42VBW4Xe0Vr2w@mail.gmail.com/
next prev parent reply other threads:[~2018-02-02 11:47 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-24 9:53 [PATCH 0/7] nd/worktree-move reboot Nguyễn Thái Ngọc Duy
2018-01-24 9:53 ` [PATCH 1/7] worktree.c: add validate_worktree() Nguyễn Thái Ngọc Duy
2018-01-24 9:53 ` [PATCH 2/7] worktree.c: add update_worktree_location() Nguyễn Thái Ngọc Duy
2018-02-02 8:23 ` Eric Sunshine
2018-02-02 9:35 ` Duy Nguyen
2018-01-24 9:53 ` [PATCH 3/7] worktree move: new command Nguyễn Thái Ngọc Duy
2018-02-02 9:15 ` Eric Sunshine
2018-02-02 11:23 ` Eric Sunshine
2018-02-05 13:28 ` Duy Nguyen
2018-02-06 2:13 ` Jeff King
2018-02-06 20:05 ` Martin Ågren
2018-02-12 9:56 ` Duy Nguyen
2018-02-12 22:15 ` Martin Ågren
2018-02-13 0:27 ` Duy Nguyen
2018-02-14 3:16 ` Jeff King
2018-02-14 9:07 ` Duy Nguyen
2018-02-14 17:35 ` Junio C Hamano
2018-02-14 21:56 ` [PATCH] t/known-leaky: add list of known-leaky test scripts Martin Ågren
2018-02-19 21:29 ` Jeff King
2018-02-20 20:44 ` Martin Ågren
2018-02-20 21:08 ` Jeff King
2018-02-21 16:53 ` Junio C Hamano
2018-02-21 18:25 ` Jeff King
2018-02-25 3:48 ` Kaartic Sivaraam
2018-02-26 21:22 ` Martin Ågren
2018-01-24 9:53 ` [PATCH 4/7] worktree move: accept destination as directory Nguyễn Thái Ngọc Duy
2018-02-02 9:35 ` Eric Sunshine
2018-01-24 9:53 ` [PATCH 5/7] worktree move: refuse to move worktrees with submodules Nguyễn Thái Ngọc Duy
2018-02-02 10:06 ` Eric Sunshine
2018-01-24 9:53 ` [PATCH 6/7] worktree remove: new command Nguyễn Thái Ngọc Duy
2018-02-02 11:47 ` Eric Sunshine [this message]
2018-02-12 9:26 ` Duy Nguyen
2018-01-24 9:53 ` [PATCH 7/7] worktree remove: allow it when $GIT_WORK_TREE is already gone Nguyễn Thái Ngọc Duy
2018-02-02 12:59 ` Eric Sunshine
2018-01-24 20:42 ` [PATCH 0/7] nd/worktree-move reboot Junio C Hamano
2018-02-12 9:49 ` [PATCH v2 " Nguyễn Thái Ngọc Duy
2018-02-12 9:49 ` [PATCH v2 1/7] worktree.c: add validate_worktree() Nguyễn Thái Ngọc Duy
2018-02-12 9:49 ` [PATCH v2 2/7] worktree.c: add update_worktree_location() Nguyễn Thái Ngọc Duy
2018-02-12 9:49 ` [PATCH v2 3/7] worktree move: new command Nguyễn Thái Ngọc Duy
2018-02-12 9:49 ` [PATCH v2 4/7] worktree move: accept destination as directory Nguyễn Thái Ngọc Duy
2018-02-12 9:49 ` [PATCH v2 5/7] worktree move: refuse to move worktrees with submodules Nguyễn Thái Ngọc Duy
2018-02-12 9:49 ` [PATCH v2 6/7] worktree remove: new command Nguyễn Thái Ngọc Duy
2018-02-12 9:49 ` [PATCH v2 7/7] worktree remove: allow it when $GIT_WORK_TREE is already gone Nguyễn Thái Ngọc Duy
2018-03-04 5:26 ` [PATCH] t2028: fix minor error and issues in newly-added "worktree move" tests Eric Sunshine
2018-03-05 9:32 ` Duy Nguyen
2018-03-05 12:48 ` SZEDER Gábor
2018-03-05 18:37 ` Junio C Hamano
2018-03-05 18:44 ` Eric Sunshine
2018-03-04 5:36 ` [PATCH v2 0/7] nd/worktree-move reboot Eric Sunshine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPig+cQvVreeggOj52bVLS6R0ZCar_yfUcyLbN3-nLG81eOQaA@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kaartic.sivaraam@gmail.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).