Re: [PATCH v10 08/21] stash: convert apply to builtin
On 10/15, Johannes Schindelin wrote:
> Hi Paul,
>
> On Mon, 15 Oct 2018, Paul-Sebastian Ungureanu wrote:
>
> > +static void assert_stash_like(struct stash_info *info, const char
> > *revision)
> > +{
> > + if (get_oidf(>b_commit, "%s^1", revision) ||
> > + get_oidf(>w_tree, "%s:", revision) ||
> > + get_oidf(>b_tree, "%s^1:", revision) ||
> > + get_oidf(>i_tree, "%s^2:", revision)) {
> > + error(_("'%s' is not a stash-like commit"), revision);
> > + free_stash_info(info);
> > + exit(128);
>
> Thomas had mentioned earlier that this should probably be a die() (and
> that the `free_stash_info()` should simply be dropped), see
> https://public-inbox.org/git/20180930174848.ge2...@hank.intra.tgummerer.com/
I think the way this is now is fine by me. Not sure how much we care
about freeing 'info' or not (do we care about leaks when we 'die()'
anyway?), but this is done in the right order now, so we don't print
garbage in the error message anymore, and I'm happy with either this
or replacing all this with 'die()'.
> > + }
> > +}
> > +
> > +static int get_stash_info(struct stash_info *info, int argc, const char
> > **argv)
> > +{
> > + int ret;
> > + char *end_of_rev;
> > + char *expanded_ref;
> > + const char *revision;
> > + const char *commit = NULL;
> > + struct object_id dummy;
> > + struct strbuf symbolic = STRBUF_INIT;
> > +
> > + if (argc > 1) {
> > + int i;
> > + struct strbuf refs_msg = STRBUF_INIT;
> > + for (i = 0; i < argc; i++)
> > + strbuf_addf(_msg, " '%s'", argv[i]);
>
> Thomas had also mentioned that this should be a `strbuf_join_argv()` call
> now.
Re-reading this we quote the individual args here, which is not
possible with 'strbuf_join_argv()', which I failed to notice when
reading this the other time. We don't currently quote them, but I
think the quoting may actually be useful.
It would however have been nice if the reason why the suggestion was
rejected would have been written down as a reply to my original
review, to avoid misunderstandings like this :)
> Maybe v10 is an accidental re-send of v9?
>
> Ciao,
> Dscho
>
> > +
> > + fprintf_ln(stderr, _("Too many revisions specified:%s"),
> > + refs_msg.buf);
> > + strbuf_release(_msg);
> > +
> > + return -1;
> > + }
> > +
> > + if (argc == 1)
> > + commit = argv[0];
> > +
> > + strbuf_init(>revision, 0);
> > + if (!commit) {
> > + if (!ref_exists(ref_stash)) {
> > + free_stash_info(info);
> > + fprintf_ln(stderr, _("No stash entries found."));
> > + return -1;
> > + }
> > +
> > + strbuf_addf(>revision, "%s@{0}", ref_stash);
> > + } else if (strspn(commit, "0123456789") == strlen(commit)) {
> > + strbuf_addf(>revision, "%s@{%s}", ref_stash, commit);
> > + } else {
> > + strbuf_addstr(>revision, commit);
> > + }
> > +
> > + revision = info->revision.buf;
> > +
> > + if (get_oid(revision, >w_commit)) {
> > + error(_("%s is not a valid reference"), revision);
> > + free_stash_info(info);
> > + return -1;
> > + }
> > +
> > + assert_stash_like(info, revision);
> > +
> > + info->has_u = !get_oidf(>u_tree, "%s^3:", revision);
> > +
> > + end_of_rev = strchrnul(revision, '@');
> > + strbuf_add(, revision, end_of_rev - revision);
> > +
> > + ret = dwim_ref(symbolic.buf, symbolic.len, , _ref);
> > + strbuf_release();
> > + switch (ret) {
> > + case 0: /* Not found, but valid ref */
> > + info->is_stash_ref = 0;
> > + break;
> > + case 1:
> > + info->is_stash_ref = !strcmp(expanded_ref, ref_stash);
> > + break;
> > + default: /* Invalid or ambiguous */
> > + free_stash_info(info);
> > + }
> > +
> > + free(expanded_ref);
> > + return !(ret == 0 || ret == 1);
> > +}
> > +
> > +static int reset_tree(struct object_id *i_tree, int update, int reset)
> > +{
> > + int nr_trees = 1;
> > + struct unpack_trees_options opts;
> > + struct tree_desc t[MAX_UNPACK_TREES];
> > + struct tree *tree;
> > + struct lock_file lock_file = LOCK_INIT;
> > +
> > + read_cache_preload(NULL);
> > + if (refresh_cache(REFRESH_QUIET))
> > + return -1;
> > +
> > + hold_locked_index(_file, LOCK_DIE_ON_ERROR);
> > +
> > + memset(, 0, sizeof(opts));
> > +
> > + tree = parse_tree_indirect(i_tree);
> > + if (parse_tree(tree))
> > + return -1;
> > +
> > + init_tree_desc(t, tree->buffer, tree->size);
> > +
> > + opts.head_idx = 1;
> > + opts.src_index = _index;
> > + opts.dst_index = _index;
> > + opts.merge = 1;
> > + opts.reset = reset;
> > + opts.update = update;
> > + opts.fn = oneway_merge;
> > +
> > + if (unpack_trees(nr_trees, t, ))
> > + return -1;
> > +
> > + if (write_locked_index(_index, _file,
Re: [PATCH v10 08/21] stash: convert apply to builtin
Hi Paul,
On Mon, 15 Oct 2018, Paul-Sebastian Ungureanu wrote:
> +static void assert_stash_like(struct stash_info *info, const char *revision)
> +{
> + if (get_oidf(>b_commit, "%s^1", revision) ||
> + get_oidf(>w_tree, "%s:", revision) ||
> + get_oidf(>b_tree, "%s^1:", revision) ||
> + get_oidf(>i_tree, "%s^2:", revision)) {
> + error(_("'%s' is not a stash-like commit"), revision);
> + free_stash_info(info);
> + exit(128);
Thomas had mentioned earlier that this should probably be a die() (and
that the `free_stash_info()` should simply be dropped), see
https://public-inbox.org/git/20180930174848.ge2...@hank.intra.tgummerer.com/
> + }
> +}
> +
> +static int get_stash_info(struct stash_info *info, int argc, const char
> **argv)
> +{
> + int ret;
> + char *end_of_rev;
> + char *expanded_ref;
> + const char *revision;
> + const char *commit = NULL;
> + struct object_id dummy;
> + struct strbuf symbolic = STRBUF_INIT;
> +
> + if (argc > 1) {
> + int i;
> + struct strbuf refs_msg = STRBUF_INIT;
> + for (i = 0; i < argc; i++)
> + strbuf_addf(_msg, " '%s'", argv[i]);
Thomas had also mentioned that this should be a `strbuf_join_argv()` call
now.
Maybe v10 is an accidental re-send of v9?
Ciao,
Dscho
> +
> + fprintf_ln(stderr, _("Too many revisions specified:%s"),
> +refs_msg.buf);
> + strbuf_release(_msg);
> +
> + return -1;
> + }
> +
> + if (argc == 1)
> + commit = argv[0];
> +
> + strbuf_init(>revision, 0);
> + if (!commit) {
> + if (!ref_exists(ref_stash)) {
> + free_stash_info(info);
> + fprintf_ln(stderr, _("No stash entries found."));
> + return -1;
> + }
> +
> + strbuf_addf(>revision, "%s@{0}", ref_stash);
> + } else if (strspn(commit, "0123456789") == strlen(commit)) {
> + strbuf_addf(>revision, "%s@{%s}", ref_stash, commit);
> + } else {
> + strbuf_addstr(>revision, commit);
> + }
> +
> + revision = info->revision.buf;
> +
> + if (get_oid(revision, >w_commit)) {
> + error(_("%s is not a valid reference"), revision);
> + free_stash_info(info);
> + return -1;
> + }
> +
> + assert_stash_like(info, revision);
> +
> + info->has_u = !get_oidf(>u_tree, "%s^3:", revision);
> +
> + end_of_rev = strchrnul(revision, '@');
> + strbuf_add(, revision, end_of_rev - revision);
> +
> + ret = dwim_ref(symbolic.buf, symbolic.len, , _ref);
> + strbuf_release();
> + switch (ret) {
> + case 0: /* Not found, but valid ref */
> + info->is_stash_ref = 0;
> + break;
> + case 1:
> + info->is_stash_ref = !strcmp(expanded_ref, ref_stash);
> + break;
> + default: /* Invalid or ambiguous */
> + free_stash_info(info);
> + }
> +
> + free(expanded_ref);
> + return !(ret == 0 || ret == 1);
> +}
> +
> +static int reset_tree(struct object_id *i_tree, int update, int reset)
> +{
> + int nr_trees = 1;
> + struct unpack_trees_options opts;
> + struct tree_desc t[MAX_UNPACK_TREES];
> + struct tree *tree;
> + struct lock_file lock_file = LOCK_INIT;
> +
> + read_cache_preload(NULL);
> + if (refresh_cache(REFRESH_QUIET))
> + return -1;
> +
> + hold_locked_index(_file, LOCK_DIE_ON_ERROR);
> +
> + memset(, 0, sizeof(opts));
> +
> + tree = parse_tree_indirect(i_tree);
> + if (parse_tree(tree))
> + return -1;
> +
> + init_tree_desc(t, tree->buffer, tree->size);
> +
> + opts.head_idx = 1;
> + opts.src_index = _index;
> + opts.dst_index = _index;
> + opts.merge = 1;
> + opts.reset = reset;
> + opts.update = update;
> + opts.fn = oneway_merge;
> +
> + if (unpack_trees(nr_trees, t, ))
> + return -1;
> +
> + if (write_locked_index(_index, _file, COMMIT_LOCK))
> + return error(_("unable to write new index file"));
> +
> + return 0;
> +}
> +
> +static int diff_tree_binary(struct strbuf *out, struct object_id *w_commit)
> +{
> + struct child_process cp = CHILD_PROCESS_INIT;
> + const char *w_commit_hex = oid_to_hex(w_commit);
> +
> + /*
> + * Diff-tree would not be very hard to replace with a native function,
> + * however it should be done together with apply_cached.
> + */
> + cp.git_cmd = 1;
> + argv_array_pushl(, "diff-tree", "--binary", NULL);
> + argv_array_pushf(, "%s^2^..%s^2", w_commit_hex, w_commit_hex);
> +
> + return pipe_command(, NULL, 0, out, 0, NULL, 0);
> +}
> +
> +static int apply_cached(struct strbuf *out)
> +{
> + struct child_process cp = CHILD_PROCESS_INIT;
> +
> + /*
> + * Apply currently only reads either from stdin
[PATCH v10 08/21] stash: convert apply to builtin
From: Joel Teichroeb
Add a builtin helper for performing stash commands. Converting
all at once proved hard to review, so starting with just apply
lets conversion get started without the other commands being
finished.
The helper is being implemented as a drop in replacement for
stash so that when it is complete it can simply be renamed and
the shell script deleted.
Delete the contents of the apply_stash shell function and replace
it with a call to stash--helper apply until pop is also
converted.
Signed-off-by: Joel Teichroeb
Signed-off-by: Paul-Sebastian Ungureanu
---
.gitignore | 1 +
Makefile| 1 +
builtin.h | 1 +
builtin/stash--helper.c | 454
git-stash.sh| 78 +--
git.c | 1 +
6 files changed, 465 insertions(+), 71 deletions(-)
create mode 100644 builtin/stash--helper.c
diff --git a/.gitignore b/.gitignore
index ffceea7d59..b59661cb88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -157,6 +157,7 @@
/git-show-ref
/git-stage
/git-stash
+/git-stash--helper
/git-status
/git-stripspace
/git-submodule
diff --git a/Makefile b/Makefile
index d03df31c2a..f900c68e69 100644
--- a/Makefile
+++ b/Makefile
@@ -1093,6 +1093,7 @@ BUILTIN_OBJS += builtin/shortlog.o
BUILTIN_OBJS += builtin/show-branch.o
BUILTIN_OBJS += builtin/show-index.o
BUILTIN_OBJS += builtin/show-ref.o
+BUILTIN_OBJS += builtin/stash--helper.o
BUILTIN_OBJS += builtin/stripspace.o
BUILTIN_OBJS += builtin/submodule--helper.o
BUILTIN_OBJS += builtin/symbolic-ref.o
diff --git a/builtin.h b/builtin.h
index 99206df4bd..317bc338f7 100644
--- a/builtin.h
+++ b/builtin.h
@@ -223,6 +223,7 @@ extern int cmd_show(int argc, const char **argv, const char
*prefix);
extern int cmd_show_branch(int argc, const char **argv, const char *prefix);
extern int cmd_show_index(int argc, const char **argv, const char *prefix);
extern int cmd_status(int argc, const char **argv, const char *prefix);
+extern int cmd_stash__helper(int argc, const char **argv, const char *prefix);
extern int cmd_stripspace(int argc, const char **argv, const char *prefix);
extern int cmd_submodule__helper(int argc, const char **argv, const char
*prefix);
extern int cmd_symbolic_ref(int argc, const char **argv, const char *prefix);
diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
new file mode 100644
index 00..c43e0aacbb
--- /dev/null
+++ b/builtin/stash--helper.c
@@ -0,0 +1,454 @@
+#include "builtin.h"
+#include "config.h"
+#include "parse-options.h"
+#include "refs.h"
+#include "lockfile.h"
+#include "cache-tree.h"
+#include "unpack-trees.h"
+#include "merge-recursive.h"
+#include "argv-array.h"
+#include "run-command.h"
+#include "dir.h"
+#include "rerere.h"
+
+static const char * const git_stash_helper_usage[] = {
+ N_("git stash--helper apply [--index] [-q|--quiet] []"),
+ NULL
+};
+
+static const char * const git_stash_helper_apply_usage[] = {
+ N_("git stash--helper apply [--index] [-q|--quiet] []"),
+ NULL
+};
+
+static const char *ref_stash = "refs/stash";
+static struct strbuf stash_index_path = STRBUF_INIT;
+
+/*
+ * w_commit is set to the commit containing the working tree
+ * b_commit is set to the base commit
+ * i_commit is set to the commit containing the index tree
+ * u_commit is set to the commit containing the untracked files tree
+ * w_tree is set to the working tree
+ * b_tree is set to the base tree
+ * i_tree is set to the index tree
+ * u_tree is set to the untracked files tree
+ */
+
+struct stash_info {
+ struct object_id w_commit;
+ struct object_id b_commit;
+ struct object_id i_commit;
+ struct object_id u_commit;
+ struct object_id w_tree;
+ struct object_id b_tree;
+ struct object_id i_tree;
+ struct object_id u_tree;
+ struct strbuf revision;
+ int is_stash_ref;
+ int has_u;
+};
+
+static void free_stash_info(struct stash_info *info)
+{
+ strbuf_release(>revision);
+}
+
+static void assert_stash_like(struct stash_info *info, const char *revision)
+{
+ if (get_oidf(>b_commit, "%s^1", revision) ||
+ get_oidf(>w_tree, "%s:", revision) ||
+ get_oidf(>b_tree, "%s^1:", revision) ||
+ get_oidf(>i_tree, "%s^2:", revision)) {
+ error(_("'%s' is not a stash-like commit"), revision);
+ free_stash_info(info);
+ exit(128);
+ }
+}
+
+static int get_stash_info(struct stash_info *info, int argc, const char **argv)
+{
+ int ret;
+ char *end_of_rev;
+ char *expanded_ref;
+ const char *revision;
+ const char *commit = NULL;
+ struct object_id dummy;
+ struct strbuf symbolic = STRBUF_INIT;
+
+ if (argc > 1) {
+ int i;
+ struct strbuf refs_msg = STRBUF_INIT;
+ for (i = 0; i < argc; i++)
+ strbuf_addf(_msg, " '%s'", argv[i]);
+
