From: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>
To: git@vger.kernel.org
Subject: [GSoC][PATCH v7 17/26] stash: avoid spawning a "diff-index" process
Date: Wed, 8 Aug 2018 21:58:56 +0300 [thread overview]
Message-ID: <ec5b2c9ac9e0e58710bdc385e03a01e2a7fd10bd.1533753605.git.ungureanupaulsebastian@gmail.com> (raw)
In-Reply-To: <cover.1533753605.git.ungureanupaulsebastian@gmail.com>
This commits replaces spawning `diff-index` child process by using
the already existing `diff` API
---
builtin/stash--helper.c | 56 ++++++++++++++++++++++++++++++-----------
1 file changed, 42 insertions(+), 14 deletions(-)
diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
index 887b78d05..f905d3908 100644
--- a/builtin/stash--helper.c
+++ b/builtin/stash--helper.c
@@ -12,6 +12,7 @@
#include "rerere.h"
#include "revision.h"
#include "log-tree.h"
+#include "diffcore.h"
static const char * const git_stash_helper_usage[] = {
N_("git stash--helper list [<options>]"),
@@ -297,6 +298,18 @@ static int reset_head(const char *prefix)
return run_command(&cp);
}
+static void add_diff_to_buf(struct diff_queue_struct *q,
+ struct diff_options *options,
+ void *data)
+{
+ int i;
+ for (i = 0; i < q->nr; i++) {
+ struct diff_filepair *p = q->queue[i];
+ strbuf_addstr(data, p->one->path);
+ strbuf_addch(data, '\n');
+ }
+}
+
static int get_newly_staged(struct strbuf *out, struct object_id *c_tree)
{
struct child_process cp = CHILD_PROCESS_INIT;
@@ -981,14 +994,16 @@ static int stash_patch(struct stash_info *info, const char **argv)
return ret;
}
-static int stash_working_tree(struct stash_info *info, const char **argv)
+static int stash_working_tree(struct stash_info *info,
+ const char **argv, const char *prefix)
{
int ret = 0;
- struct child_process cp1 = CHILD_PROCESS_INIT;
struct child_process cp2 = CHILD_PROCESS_INIT;
struct child_process cp3 = CHILD_PROCESS_INIT;
- struct strbuf out1 = STRBUF_INIT;
struct strbuf out3 = STRBUF_INIT;
+ struct argv_array args = ARGV_ARRAY_INIT;
+ struct strbuf diff_output = STRBUF_INIT;
+ struct rev_info rev;
set_alternate_index_output(stash_index_path.buf);
if (reset_tree(&info->i_tree, 0, 0)) {
@@ -997,26 +1012,36 @@ static int stash_working_tree(struct stash_info *info, const char **argv)
}
set_alternate_index_output(".git/index");
- cp1.git_cmd = 1;
- argv_array_pushl(&cp1.args, "diff-index", "--name-only", "-z",
- "HEAD", "--", NULL);
+ argv_array_push(&args, "dummy");
if (argv)
- argv_array_pushv(&cp1.args, argv);
- argv_array_pushf(&cp1.env_array, "GIT_INDEX_FILE=%s",
- stash_index_path.buf);
+ argv_array_pushv(&args, argv);
+ git_config(git_diff_basic_config, NULL);
+ init_revisions(&rev, prefix);
+ args.argc = setup_revisions(args.argc, args.argv, &rev, NULL);
+
+ rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
+ rev.diffopt.format_callback = add_diff_to_buf;
+ rev.diffopt.format_callback_data = &diff_output;
+
+ if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
+ ret = -1;
+ goto done;
+ }
- if (pipe_command(&cp1, NULL, 0, &out1, 0, NULL, 0)) {
+ add_pending_object(&rev, parse_object(the_repository, &info->b_commit), "");
+ if (run_diff_index(&rev, 0)) {
ret = -1;
goto done;
}
cp2.git_cmd = 1;
- argv_array_pushl(&cp2.args, "update-index", "-z", "--add",
+ argv_array_pushl(&cp2.args, "update-index", "--add",
"--remove", "--stdin", NULL);
argv_array_pushf(&cp2.env_array, "GIT_INDEX_FILE=%s",
stash_index_path.buf);
- if (pipe_command(&cp2, out1.buf, out1.len, NULL, 0, NULL, 0)) {
+ if (pipe_command(&cp2, diff_output.buf, diff_output.len,
+ NULL, 0, NULL, 0)) {
ret = -1;
goto done;
}
@@ -1033,8 +1058,11 @@ static int stash_working_tree(struct stash_info *info, const char **argv)
get_oid_hex(out3.buf, &info->w_tree);
done:
- strbuf_release(&out1);
+ UNLEAK(rev);
strbuf_release(&out3);
+ argv_array_clear(&args);
+ object_array_clear(&rev.pending);
+ strbuf_release(&diff_output);
remove_path(stash_index_path.buf);
return ret;
}
@@ -1112,7 +1140,7 @@ static int do_create_stash(int argc, const char **argv, const char *prefix,
goto done;
}
} else {
- if (stash_working_tree(info, argv)) {
+ if (stash_working_tree(info, argv, prefix)) {
printf_ln("Cannot save the current worktree state");
ret = -1;
goto done;
--
2.18.0.573.g56500d98f
next prev parent reply other threads:[~2018-08-08 18:59 UTC|newest]
Thread overview: 181+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-05 2:28 [PATCH v5 0/5] Convert some stash functionality to a builtin Joel Teichroeb
2018-04-05 2:28 ` [PATCH v5 1/5] stash: improve option parsing test coverage Joel Teichroeb
2018-04-06 13:06 ` Johannes Schindelin
2018-04-06 22:48 ` Paul-Sebastian Ungureanu
2018-04-09 8:32 ` Johannes Schindelin
2018-04-05 2:28 ` [PATCH v5 2/5] stash: convert apply to builtin Joel Teichroeb
2018-04-05 7:50 ` Christian Couder
2018-04-05 7:59 ` Christian Couder
2018-04-05 8:13 ` Christian Couder
2018-04-05 13:34 ` Johannes Schindelin
2018-04-06 15:10 ` Johannes Schindelin
2018-04-06 15:17 ` Johannes Schindelin
2018-04-05 2:28 ` [PATCH v5 3/5] stash: convert drop and clear " Joel Teichroeb
2018-04-06 15:39 ` Johannes Schindelin
2018-04-05 2:28 ` [PATCH v5 4/5] stash: convert branch " Joel Teichroeb
2018-04-06 15:50 ` Johannes Schindelin
2018-04-05 2:28 ` [PATCH v5 5/5] stash: convert pop " Joel Teichroeb
2018-04-06 16:12 ` Johannes Schindelin
2018-04-06 16:15 ` [PATCH v5 0/5] Convert some stash functionality to a builtin Johannes Schindelin
2018-04-28 22:06 ` Paul-Sebastian Ungureanu
2018-04-29 13:04 ` Johannes Schindelin
[not found] ` <CA+CzEk8c1Pt+n9Jy5vL9_K60Q=6VKnLTdBY1JFRnb-POuRFv0Q@mail.gmail.com>
2018-04-30 15:43 ` Joel Teichroeb
2018-06-25 16:42 ` [PATCH v6 0/4] stash: add new tests and introduce a new helper function Paul-Sebastian Ungureanu
2018-06-25 16:42 ` [PATCH v6 1/4] sha1-name.c: added 'get_oidf', which acts like 'get_oid' Paul-Sebastian Ungureanu
2018-06-26 22:02 ` Johannes Schindelin
2018-06-25 16:42 ` [PATCH v6 2/4] stash: improve option parsing test coverage Paul-Sebastian Ungureanu
2018-06-25 16:42 ` [PATCH v6 3/4] stash: update test cases conform to coding guidelines Paul-Sebastian Ungureanu
2018-06-26 22:08 ` Johannes Schindelin
2018-06-25 16:42 ` [PATCH v6 4/4] stash: renamed test cases to be more descriptive Paul-Sebastian Ungureanu
2018-06-26 22:09 ` Johannes Schindelin
2018-06-25 16:43 ` [PATCH v6 1/4] stash: convert apply to builtin Paul-Sebastian Ungureanu
2018-06-25 16:43 ` [PATCH v6 2/4] stash: convert drop and clear " Paul-Sebastian Ungureanu
2018-06-26 22:17 ` Johannes Schindelin
2018-06-28 22:51 ` Paul-Sebastian Ungureanu
2018-06-25 16:43 ` [PATCH v6 3/4] stash: convert branch " Paul-Sebastian Ungureanu
2018-06-26 22:23 ` Johannes Schindelin
2018-06-27 18:39 ` Junio C Hamano
2018-06-28 16:17 ` Paul-Sebastian Ungureanu
2018-06-25 16:43 ` [PATCH v6 4/4] stash: convert pop " Paul-Sebastian Ungureanu
2018-06-26 22:31 ` Johannes Schindelin
2018-06-25 16:46 ` [PATCH v6 1/6] stash: implement the "list" command in the builtin Paul-Sebastian Ungureanu
2018-06-25 16:46 ` [PATCH v6 2/6] stash: convert show to builtin Paul-Sebastian Ungureanu
2018-06-25 16:46 ` [PATCH v6 3/6] stash: change `git stash show` usage text and documentation Paul-Sebastian Ungureanu
2018-06-25 16:46 ` [PATCH v6 4/6] stash: refactor `show_stash()` to use the diff API Paul-Sebastian Ungureanu
2018-06-25 16:46 ` [PATCH v6 5/6] stash: update `git stash show` documentation Paul-Sebastian Ungureanu
2018-06-25 16:46 ` [PATCH v6 6/6] stash: convert store to builtin Paul-Sebastian Ungureanu
2018-06-26 21:59 ` [PATCH v6 0/4] stash: add new tests and introduce a new helper function Johannes Schindelin
2018-06-27 18:47 ` Junio C Hamano
2018-06-28 22:32 ` Paul-Sebastian Ungureanu
2018-06-26 22:12 ` [PATCH v6 0/4] stash: Convert some `git stash` commands to a builtin Johannes Schindelin
2018-06-28 23:14 ` Paul-Sebastian Ungureanu
2018-08-08 18:58 ` [GSoC][PATCH v7 00/26] Convert "git stash" to C builtin Paul-Sebastian Ungureanu
2018-08-08 18:58 ` [GSoC][PATCH v7 01/26] sha1-name.c: added 'get_oidf', which acts like 'get_oid' Paul-Sebastian Ungureanu
2018-08-08 18:58 ` [GSoC][PATCH v7 02/26] stash: improve option parsing test coverage Paul-Sebastian Ungureanu
2018-08-08 18:58 ` [GSoC][PATCH v7 03/26] stash: update test cases conform to coding guidelines Paul-Sebastian Ungureanu
2018-08-08 18:58 ` [GSoC][PATCH v7 04/26] stash: renamed test cases to be more descriptive Paul-Sebastian Ungureanu
2018-08-15 19:31 ` Thomas Gummerer
2018-08-08 18:58 ` [GSoC][PATCH v7 05/26] stash: convert apply to builtin Paul-Sebastian Ungureanu
2018-08-08 20:18 ` Junio C Hamano
2018-08-09 20:01 ` Paul-Sebastian Ungureanu
2018-08-09 21:00 ` Junio C Hamano
2018-08-10 15:35 ` Paul-Sebastian Ungureanu
2018-08-18 16:09 ` Duy Nguyen
2018-08-08 18:58 ` [GSoC][PATCH v7 06/26] stash: convert drop and clear " Paul-Sebastian Ungureanu
2018-08-08 18:58 ` [GSoC][PATCH v7 07/26] stash: convert branch " Paul-Sebastian Ungureanu
2018-08-08 18:58 ` [GSoC][PATCH v7 08/26] stash: convert pop " Paul-Sebastian Ungureanu
2018-08-08 18:58 ` [GSoC][PATCH v7 09/26] stash: implement the "list" command in the builtin Paul-Sebastian Ungureanu
2018-08-15 19:41 ` Thomas Gummerer
2018-08-18 11:44 ` Paul Sebastian Ungureanu
2018-08-08 18:58 ` [GSoC][PATCH v7 10/26] stash: convert show to builtin Paul-Sebastian Ungureanu
2018-08-15 20:20 ` Thomas Gummerer
2018-08-18 12:11 ` Paul Sebastian Ungureanu
2018-08-08 18:58 ` [GSoC][PATCH v7 11/26] stash: change `git stash show` usage text and documentation Paul-Sebastian Ungureanu
2018-08-15 20:26 ` Thomas Gummerer
2018-08-08 18:58 ` [GSoC][PATCH v7 12/26] stash: refactor `show_stash()` to use the diff API Paul-Sebastian Ungureanu
2018-08-15 21:01 ` Thomas Gummerer
2018-08-18 15:11 ` Paul Sebastian Ungureanu
2018-08-08 18:58 ` [GSoC][PATCH v7 13/26] stash: update `git stash show` documentation Paul-Sebastian Ungureanu
2018-08-15 21:08 ` Thomas Gummerer
2018-08-08 18:58 ` [GSoC][PATCH v7 14/26] stash: convert store to builtin Paul-Sebastian Ungureanu
2018-08-15 21:26 ` Thomas Gummerer
2018-08-08 18:58 ` [GSoC][PATCH v7 15/26] stash: convert create " Paul-Sebastian Ungureanu
2018-08-15 22:13 ` Thomas Gummerer
2018-08-18 15:39 ` Paul Sebastian Ungureanu
2018-08-18 20:23 ` Thomas Gummerer
2018-08-08 18:58 ` [GSoC][PATCH v7 16/26] stash: replace spawning a "read-tree" process Paul-Sebastian Ungureanu
2018-08-18 21:07 ` Thomas Gummerer
2018-08-08 18:58 ` Paul-Sebastian Ungureanu [this message]
2018-08-18 22:06 ` [GSoC][PATCH v7 17/26] stash: avoid spawning a "diff-index" process Thomas Gummerer
2018-08-08 18:58 ` [GSoC][PATCH v7 18/26] stash: convert push to builtin Paul-Sebastian Ungureanu
2018-08-18 15:36 ` Thomas Gummerer
2018-08-08 18:58 ` [GSoC][PATCH v7 19/26] stash: make push to be quiet Paul-Sebastian Ungureanu
2018-08-18 15:46 ` Thomas Gummerer
2018-08-08 18:58 ` [GSoC][PATCH v7 20/26] stash: add tests for `git stash push -q` Paul-Sebastian Ungureanu
2018-08-18 16:12 ` Thomas Gummerer
2018-08-08 18:59 ` [GSoC][PATCH v7 21/26] stash: replace spawning `git ls-files` child process Paul-Sebastian Ungureanu
2018-08-18 22:17 ` Thomas Gummerer
2018-08-08 18:59 ` [GSoC][PATCH v7 22/26] stash: convert save to builtin Paul-Sebastian Ungureanu
2018-08-18 16:33 ` Thomas Gummerer
2018-08-08 18:59 ` [GSoC][PATCH v7 23/26] stash: convert `stash--helper.c` into `stash.c` Paul-Sebastian Ungureanu
2018-08-18 16:51 ` Thomas Gummerer
2018-08-08 18:59 ` [GSoC][PATCH v7 24/26] stash: optimize `get_untracked_files()` and `check_changes()` Paul-Sebastian Ungureanu
2018-08-18 22:33 ` Thomas Gummerer
2018-08-08 18:59 ` [GSoC][PATCH v7 25/26] stash: replace all `write-tree` child processes with API calls Paul-Sebastian Ungureanu
2018-08-19 8:17 ` Thomas Gummerer
2018-08-08 18:59 ` [GSoC][PATCH v7 26/26] stash: replace all "git apply" " Paul-Sebastian Ungureanu
2018-08-19 8:40 ` Thomas Gummerer
2018-08-15 22:25 ` [GSoC][PATCH v7 00/26] Convert "git stash" to C builtin Thomas Gummerer
2018-08-16 21:25 ` Paul Sebastian Ungureanu
2018-08-30 21:40 ` [GSoC][PATCH v8 00/20] " Paul-Sebastian Ungureanu
2018-08-30 21:40 ` [GSoC][PATCH v8 01/20] sha1-name.c: add `get_oidf()` which acts like `get_oid()` Paul-Sebastian Ungureanu
2018-08-30 21:40 ` [GSoC][PATCH v8 02/20] stash: improve option parsing test coverage Paul-Sebastian Ungureanu
2018-08-30 21:40 ` [GSoC][PATCH v8 03/20] stash: update test cases conform to coding guidelines Paul-Sebastian Ungureanu
2018-08-30 22:11 ` Junio C Hamano
2018-08-30 21:40 ` [GSoC][PATCH v8 04/20] stash: rename test cases to be more descriptive Paul-Sebastian Ungureanu
2018-08-30 21:40 ` [GSoC][PATCH v8 05/20] stash: add tests for `git stash show` config Paul-Sebastian Ungureanu
2018-08-30 22:07 ` Junio C Hamano
2018-09-03 12:11 ` Johannes Schindelin
2018-08-30 21:40 ` [GSoC][PATCH v8 06/20] stash: convert apply to builtin Paul-Sebastian Ungureanu
2018-08-30 21:40 ` [GSoC][PATCH v8 07/20] stash: convert drop and clear " Paul-Sebastian Ungureanu
2018-08-30 21:40 ` [GSoC][PATCH v8 08/20] stash: convert branch " Paul-Sebastian Ungureanu
2018-09-03 13:29 ` Johannes Schindelin
2018-08-30 21:40 ` [GSoC][PATCH v8 09/20] stash: convert pop " Paul-Sebastian Ungureanu
2018-08-30 21:40 ` [GSoC][PATCH v8 10/20] stash: convert list " Paul-Sebastian Ungureanu
2018-08-30 21:40 ` [GSoC][PATCH v8 11/20] stash: convert show " Paul-Sebastian Ungureanu
2018-08-30 21:40 ` [GSoC][PATCH v8 12/20] stash: mention options in `show` synopsis Paul-Sebastian Ungureanu
2018-08-30 21:40 ` [GSoC][PATCH v8 13/20] stash: convert store to builtin Paul-Sebastian Ungureanu
2018-09-03 13:24 ` Johannes Schindelin
2018-08-30 21:40 ` [GSoC][PATCH v8 14/20] stash: convert create " Paul-Sebastian Ungureanu
2018-09-03 16:00 ` Johannes Schindelin
2018-09-25 22:20 ` Paul-Sebastian Ungureanu
2018-11-09 12:27 ` Johannes Schindelin
2018-08-30 21:40 ` [GSoC][PATCH v8 15/20] stash: convert push " Paul-Sebastian Ungureanu
2018-09-03 14:40 ` Johannes Schindelin
2018-08-30 21:40 ` [GSoC][PATCH v8 16/20] stash: make push -q quiet Paul-Sebastian Ungureanu
2018-08-30 21:40 ` [GSoC][PATCH v8 17/20] stash: convert save to builtin Paul-Sebastian Ungureanu
2018-09-03 18:44 ` Johannes Schindelin
2018-09-03 19:06 ` Eric Sunshine
2018-09-03 20:38 ` Johannes Schindelin
2018-08-30 21:40 ` [GSoC][PATCH v8 18/20] stash: convert `stash--helper.c` into `stash.c` Paul-Sebastian Ungureanu
2018-09-03 14:57 ` Johannes Schindelin
2018-09-25 22:31 ` Paul-Sebastian Ungureanu
2018-11-09 12:26 ` Johannes Schindelin
2018-08-30 21:40 ` [GSoC][PATCH v8 19/20] stash: optimize `get_untracked_files()` and `check_changes()` Paul-Sebastian Ungureanu
2018-09-03 18:49 ` Johannes Schindelin
2018-08-30 21:40 ` [GSoC][PATCH v8 20/20] stash: replace all `write-tree` child processes with API calls Paul-Sebastian Ungureanu
2018-09-03 19:11 ` Johannes Schindelin
2018-08-30 22:19 ` [GSoC][PATCH v8 00/20] Convert "git stash" to C builtin Ævar Arnfjörð Bjarmason
2018-08-31 18:14 ` Junio C Hamano
2018-09-03 19:12 ` Johannes Schindelin
2018-09-25 22:33 ` [PATCH v9 00/21] " Paul-Sebastian Ungureanu
2018-09-25 22:33 ` [PATCH v9 01/21] sha1-name.c: add `get_oidf()` which acts like `get_oid()` Paul-Sebastian Ungureanu
2018-09-25 22:33 ` [PATCH v9 02/21] strbuf.c: add `strbuf_join_argv()` Paul-Sebastian Ungureanu
2018-09-30 16:49 ` Thomas Gummerer
2018-09-25 22:33 ` [PATCH v9 03/21] stash: improve option parsing test coverage Paul-Sebastian Ungureanu
2018-09-25 22:33 ` [PATCH v9 04/21] stash: update test cases conform to coding guidelines Paul-Sebastian Ungureanu
2018-09-30 16:59 ` Thomas Gummerer
2018-09-25 22:33 ` [PATCH v9 05/21] stash: rename test cases to be more descriptive Paul-Sebastian Ungureanu
2018-09-25 22:33 ` [PATCH v9 06/21] stash: add tests for `git stash show` config Paul-Sebastian Ungureanu
2018-09-25 22:33 ` [PATCH v9 07/21] stash: convert apply to builtin Paul-Sebastian Ungureanu
2018-09-30 17:48 ` Thomas Gummerer
2018-09-25 22:33 ` [PATCH v9 08/21] stash: convert drop and clear " Paul-Sebastian Ungureanu
2018-09-25 22:33 ` [PATCH v9 09/21] stash: convert branch " Paul-Sebastian Ungureanu
2018-09-30 17:57 ` Thomas Gummerer
2018-09-25 22:33 ` [PATCH v9 10/21] stash: convert pop " Paul-Sebastian Ungureanu
2018-09-25 22:33 ` [PATCH v9 11/21] stash: convert list " Paul-Sebastian Ungureanu
2018-09-25 22:33 ` [PATCH v9 12/21] stash: convert show " Paul-Sebastian Ungureanu
2018-09-25 22:33 ` [PATCH v9 13/21] stash: mention options in `show` synopsis Paul-Sebastian Ungureanu
2018-10-02 19:36 ` Thomas Gummerer
2018-09-25 22:33 ` [PATCH v9 14/21] stash: convert store to builtin Paul-Sebastian Ungureanu
2018-09-25 22:33 ` [PATCH v9 15/21] stash: convert create " Paul-Sebastian Ungureanu
2018-10-02 20:19 ` Thomas Gummerer
2018-09-25 22:33 ` [PATCH v9 16/21] stash: convert push " Paul-Sebastian Ungureanu
2018-10-02 20:37 ` Thomas Gummerer
2018-09-25 22:33 ` [PATCH v9 17/21] stash: make push -q quiet Paul-Sebastian Ungureanu
2018-09-25 22:33 ` [PATCH v9 18/21] stash: convert save to builtin Paul-Sebastian Ungureanu
2018-09-25 22:33 ` [PATCH v9 19/21] stash: convert `stash--helper.c` into `stash.c` Paul-Sebastian Ungureanu
2018-10-02 21:04 ` Thomas Gummerer
2018-09-25 22:33 ` [PATCH v9 20/21] stash: optimize `get_untracked_files()` and `check_changes()` Paul-Sebastian Ungureanu
2018-09-25 22:33 ` [PATCH v9 21/21] stash: replace all `write-tree` child processes with API calls Paul-Sebastian Ungureanu
2018-09-26 18:37 ` [PATCH v9 00/21] Convert "git stash" to C builtin Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ec5b2c9ac9e0e58710bdc385e03a01e2a7fd10bd.1533753605.git.ungureanupaulsebastian@gmail.com \
--to=ungureanupaulsebastian@gmail.com \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).