[v13,12/27] stash: convert drop and clear to builtin

Message ID	20190225231631.30507-13-t.gummerer@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: Thomas Gummerer <t.gummerer@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Johannes Schindelin <Johannes.Schindelin@gmx.de>, Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>, =?utf-8?q?SZED?= =?utf-8?q?ER_G=C3=A1bor?= <szeder.dev@gmail.com>, Joel Teichroeb <joel@teichroeb.net>, Thomas Gummerer <t.gummerer@gmail.com> Subject: [PATCH v13 12/27] stash: convert drop and clear to builtin Date: Mon, 25 Feb 2019 23:16:16 +0000 Message-Id: <20190225231631.30507-13-t.gummerer@gmail.com> In-Reply-To: <20190225231631.30507-1-t.gummerer@gmail.com> References: <nycvar.QRO.7.76.6.1902191127420.41@tvgsbejvaqbjf.bet> <20190225231631.30507-1-t.gummerer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk
Series	Convert "git stash" to C builtin \| expand [v13,00/27] Convert "git stash" to C builtin [v13,01/27] sha1-name.c: add `get_oidf()` which acts like `get_oid()` [v13,02/27] strbuf.c: add `strbuf_join_argv()` [v13,03/27] strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()` [v13,04/27] ident: add the ability to provide a "fallback identity" [v13,05/27] stash: improve option parsing test coverage [v13,06/27] t3903: modernize style [v13,07/27] t3903: add test for --intent-to-add file [v13,08/27] stash: rename test cases to be more descriptive [v13,09/27] stash: add tests for `git stash show` config [v13,10/27] stash: mention options in `show` synopsis [v13,11/27] stash: convert apply to builtin [v13,12/27] stash: convert drop and clear to builtin [v13,13/27] stash: convert branch to builtin [v13,14/27] stash: convert pop to builtin [v13,15/27] stash: convert list to builtin [v13,16/27] stash: convert show to builtin [v13,17/27] stash: convert store to builtin [v13,18/27] stash: convert create to builtin [v13,19/27] stash: convert push to builtin [v13,20/27] stash: make push -q quiet [v13,21/27] stash: convert save to builtin [v13,22/27] stash: optimize `get_untracked_files()` and `check_changes()` [v13,23/27] stash: replace all `write-tree` child processes with API calls [v13,24/27] stash: convert `stash--helper.c` into `stash.c` [v13,25/27] stash: add back the original, scripted `git stash` [v13,26/27] stash: optionally use the scripted version again [v13,27/27] tests: add a special setup where stash.useBuiltin is off

diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c index 03511f466b..c515f0b358 100644 --- a/builtin/stash--helper.c +++ b/builtin/stash--helper.c @@ -12,7 +12,14 @@ #include "rerere.h" static const char * const git_stash_helper_usage[] = { + N_("git stash--helper drop [-q|--quiet] [<stash>]"), N_("git stash--helper apply [--index] [-q|--quiet] [<stash>]"), + N_("git stash--helper clear"), + NULL +}; + +static const char * const git_stash_helper_drop_usage[] = { + N_("git stash--helper drop [-q|--quiet] [<stash>]"), NULL }; @@ -21,6 +28,11 @@ static const char * const git_stash_helper_apply_usage[] = { NULL }; +static const char * const git_stash_helper_clear_usage[] = { + N_("git stash--helper clear"), + NULL +}; + static const char *ref_stash = "refs/stash"; static struct strbuf stash_index_path = STRBUF_INIT; @@ -136,6 +148,32 @@ static int get_stash_info(struct stash_info *info, int argc, const char **argv) return !(ret == 0 || ret == 1); } +static int do_clear_stash(void) +{ + struct object_id obj; + if (get_oid(ref_stash, &obj)) + return 0; + + return delete_ref(NULL, ref_stash, &obj, 0); +} + +static int clear_stash(int argc, const char **argv, const char *prefix) +{ + struct option options[] = { + OPT_END() + }; + + argc = parse_options(argc, argv, prefix, options, + git_stash_helper_clear_usage, + PARSE_OPT_STOP_AT_NON_OPTION); + + if (argc) + return error(_("git stash clear with parameters is " + "unimplemented")); + + return do_clear_stash(); +} + static int reset_tree(struct object_id *i_tree, int update, int reset) { int nr_trees = 1; @@ -423,6 +461,81 @@ static int apply_stash(int argc, const char **argv, const char *prefix) return ret; } +static int do_drop_stash(const char *prefix, struct stash_info *info, int quiet) +{ + int ret; + struct child_process cp_reflog = CHILD_PROCESS_INIT; + struct child_process cp = CHILD_PROCESS_INIT; + + /* + * reflog does not provide a simple function for deleting refs. One will + * need to be added to avoid implementing too much reflog code here + */ + + cp_reflog.git_cmd = 1; + argv_array_pushl(&cp_reflog.args, "reflog", "delete", "--updateref", + "--rewrite", NULL); + argv_array_push(&cp_reflog.args, info->revision.buf); + ret = run_command(&cp_reflog); + if (!ret) { + if (!quiet) + printf_ln(_("Dropped %s (%s)"), info->revision.buf, + oid_to_hex(&info->w_commit)); + } else { + return error(_("%s: Could not drop stash entry"), + info->revision.buf); + } + + /* + * This could easily be replaced by get_oid, but currently it will throw + * a fatal error when a reflog is empty, which we can not recover from. + */ + cp.git_cmd = 1; + /* Even though --quiet is specified, rev-parse still outputs the hash */ + cp.no_stdout = 1; + argv_array_pushl(&cp.args, "rev-parse", "--verify", "--quiet", NULL); + argv_array_pushf(&cp.args, "%s@{0}", ref_stash); + ret = run_command(&cp); + + /* do_clear_stash if we just dropped the last stash entry */ + if (ret) + do_clear_stash(); + + return 0; +} + +static void assert_stash_ref(struct stash_info *info) +{ + if (!info->is_stash_ref) { + error(_("'%s' is not a stash reference"), info->revision.buf); + free_stash_info(info); + exit(1); + } +} + +static int drop_stash(int argc, const char **argv, const char *prefix) +{ + int ret; + int quiet = 0; + struct stash_info info; + struct option options[] = { + OPT__QUIET(&quiet, N_("be quiet, only report errors")), + OPT_END() + }; + + argc = parse_options(argc, argv, prefix, options, + git_stash_helper_drop_usage, 0); + + if (get_stash_info(&info, argc, argv)) + return -1; + + assert_stash_ref(&info); + + ret = do_drop_stash(prefix, &info, quiet); + free_stash_info(&info); + return ret; +} + int cmd_stash__helper(int argc, const char **argv, const char *prefix) { pid_t pid = getpid(); @@ -445,6 +558,10 @@ int cmd_stash__helper(int argc, const char **argv, const char *prefix) usage_with_options(git_stash_helper_usage, options); if (!strcmp(argv[0], "apply")) return !!apply_stash(argc, argv, prefix); + else if (!strcmp(argv[0], "clear")) + return !!clear_stash(argc, argv, prefix); + else if (!strcmp(argv[0], "drop")) + return !!drop_stash(argc, argv, prefix); usage_msg_opt(xstrfmt(_("unknown subcommand: %s"), argv[0]), git_stash_helper_usage, options); diff --git a/git-stash.sh b/git-stash.sh index 366a082853..b8f70230f9 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -670,7 +670,7 @@ apply) ;; clear) shift - clear_stash "$@" + git stash--helper clear "$@" ;; create) shift @@ -682,7 +682,7 @@ store) ;; drop) shift - drop_stash "$@" + git stash--helper drop "$@" ;; pop) shift

[v13,12/27] stash: convert drop and clear to builtin

Commit Message

Comments

Patch