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>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Thomas Gummerer" <t.gummerer@gmail.com>
Subject: [PATCH v13 22/27] stash: optimize `get_untracked_files()` and `check_changes()`
Date: Mon, 25 Feb 2019 23:16:26 +0000 [thread overview]
Message-ID: <20190225231631.30507-23-t.gummerer@gmail.com> (raw)
In-Reply-To: <20190225231631.30507-1-t.gummerer@gmail.com>
From: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>
This commits introduces a optimization by avoiding calling the
same functions again. For example, `git stash push -u`
would call at some points the following functions:
* `check_changes()` (inside `do_push_stash()`)
* `do_create_stash()`, which calls: `check_changes()` and
`get_untracked_files()`
Note that `check_changes()` also calls `get_untracked_files()`.
So, `check_changes()` is called 2 times and `get_untracked_files()`
3 times.
The old function `check_changes()` now consists of two functions:
`get_untracked_files()` and `check_changes_tracked_files()`.
These are the call chains for `push` and `create`:
* `push_stash()` -> `do_push_stash()` -> `do_create_stash()`
* `create_stash()` -> `do_create_stash()`
To prevent calling the same functions over and over again,
`check_changes()` inside `do_create_stash()` is now placed
in the caller functions (`create_stash()` and `do_push_stash()`).
This way `check_changes()` and `get_untracked files()` are called
only one time.
Signed-off-by: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
---
builtin/stash--helper.c | 46 ++++++++++++++++++++++++-----------------
1 file changed, 27 insertions(+), 19 deletions(-)
diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
index 8e4e96e353..4c51b58206 100644
--- a/builtin/stash--helper.c
+++ b/builtin/stash--helper.c
@@ -879,18 +879,17 @@ static int get_untracked_files(struct pathspec ps, int include_untracked,
}
/*
- * The return value of `check_changes()` can be:
+ * The return value of `check_changes_tracked_files()` can be:
*
* < 0 if there was an error
* = 0 if there are no changes.
* > 0 if there are changes.
*/
-static int check_changes(struct pathspec ps, int include_untracked)
+static int check_changes_tracked_files(struct pathspec ps)
{
int result;
struct rev_info rev;
struct object_id dummy;
- struct strbuf out = STRBUF_INIT;
/* No initial commit. */
if (get_oid("HEAD", &dummy))
@@ -918,14 +917,25 @@ static int check_changes(struct pathspec ps, int include_untracked)
if (diff_result_code(&rev.diffopt, result))
return 1;
+ return 0;
+}
+
+/*
+ * The function will fill `untracked_files` with the names of untracked files
+ * It will return 1 if there were any changes and 0 if there were not.
+ */
+static int check_changes(struct pathspec ps, int include_untracked,
+ struct strbuf *untracked_files)
+{
+ int ret = 0;
+ if (check_changes_tracked_files(ps))
+ ret = 1;
+
if (include_untracked && get_untracked_files(ps, include_untracked,
- &out)) {
- strbuf_release(&out);
- return 1;
- }
+ untracked_files))
+ ret = 1;
- strbuf_release(&out);
- return 0;
+ return ret;
}
static int save_untracked_files(struct stash_info *info, struct strbuf *msg,
@@ -1137,7 +1147,7 @@ static int do_create_stash(struct pathspec ps, struct strbuf *stash_msg_buf,
head_commit = lookup_commit(the_repository, &info->b_commit);
}
- if (!check_changes(ps, include_untracked)) {
+ if (!check_changes(ps, include_untracked, &untracked_files)) {
ret = 1;
goto done;
}
@@ -1162,8 +1172,7 @@ static int do_create_stash(struct pathspec ps, struct strbuf *stash_msg_buf,
goto done;
}
- if (include_untracked && get_untracked_files(ps, include_untracked,
- &untracked_files)) {
+ if (include_untracked) {
if (save_untracked_files(info, &msg, untracked_files)) {
if (!quiet)
fprintf_ln(stderr, _("Cannot save "
@@ -1248,6 +1257,9 @@ static int create_stash(int argc, const char **argv, const char *prefix)
0);
memset(&ps, 0, sizeof(ps));
+ if (!check_changes_tracked_files(ps))
+ return 0;
+
strbuf_addstr(&stash_msg_buf, stash_msg);
ret = do_create_stash(ps, &stash_msg_buf, include_untracked, 0, &info,
NULL, 0);
@@ -1255,12 +1267,7 @@ static int create_stash(int argc, const char **argv, const char *prefix)
printf_ln("%s", oid_to_hex(&info.w_commit));
strbuf_release(&stash_msg_buf);
-
- /*
- * ret can be 1 if there were no changes. In this case, we should
- * not error out.
- */
- return ret < 0;
+ return ret;
}
static int do_push_stash(struct pathspec ps, const char *stash_msg, int quiet,
@@ -1270,6 +1277,7 @@ static int do_push_stash(struct pathspec ps, const char *stash_msg, int quiet,
struct stash_info info;
struct strbuf patch = STRBUF_INIT;
struct strbuf stash_msg_buf = STRBUF_INIT;
+ struct strbuf untracked_files = STRBUF_INIT;
if (patch_mode && keep_index == -1)
keep_index = 1;
@@ -1304,7 +1312,7 @@ static int do_push_stash(struct pathspec ps, const char *stash_msg, int quiet,
goto done;
}
- if (!check_changes(ps, include_untracked)) {
+ if (!check_changes(ps, include_untracked, &untracked_files)) {
if (!quiet)
printf_ln(_("No local changes to save"));
goto done;
--
2.21.0.rc2.291.g17236886c5
next prev parent reply other threads:[~2019-02-25 23:17 UTC|newest]
Thread overview: 106+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <https://public-inbox.org/git/cover.1542925164.git.ungureanupaulsebastian@gmail.com/>
2018-12-20 19:44 ` [PATCH v12 00/26] Convert "git stash" to C builtin Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 01/26] sha1-name.c: add `get_oidf()` which acts like `get_oid()` Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 02/26] strbuf.c: add `strbuf_join_argv()` Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 03/26] strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()` Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 04/26] ident: add the ability to provide a "fallback identity" Paul-Sebastian Ungureanu
2018-12-26 21:21 ` Junio C Hamano
2018-12-27 21:24 ` Johannes Schindelin
2018-12-28 19:40 ` Junio C Hamano
2018-12-20 19:44 ` [PATCH v12 05/26] stash: improve option parsing test coverage Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 06/26] t3903: modernize style Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 07/26] stash: rename test cases to be more descriptive Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 08/26] stash: add tests for `git stash show` config Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 09/26] stash: mention options in `show` synopsis Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 10/26] stash: convert apply to builtin Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 11/26] stash: convert drop and clear " Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 12/26] stash: convert branch " Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 13/26] stash: convert pop " Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 14/26] stash: convert list " Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 15/26] stash: convert show " Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 16/26] stash: convert store " Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 17/26] stash: convert create " Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 18/26] stash: convert push " Paul-Sebastian Ungureanu
2019-02-08 11:30 ` SZEDER Gábor
2019-02-10 22:17 ` Thomas Gummerer
2019-02-11 1:13 ` SZEDER Gábor
2019-02-12 23:18 ` Thomas Gummerer
2019-02-19 0:23 ` SZEDER Gábor
2019-02-19 10:47 ` Johannes Schindelin
2019-02-19 19:59 ` Junio C Hamano
2019-02-20 21:01 ` Johannes Schindelin
2019-02-19 23:59 ` Thomas Gummerer
2019-02-20 4:37 ` Junio C Hamano
2019-02-20 21:10 ` Johannes Schindelin
2019-02-20 22:30 ` Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 00/27] Convert "git stash" to C builtin Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 01/27] sha1-name.c: add `get_oidf()` which acts like `get_oid()` Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 02/27] strbuf.c: add `strbuf_join_argv()` Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 03/27] strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()` Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 04/27] ident: add the ability to provide a "fallback identity" Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 05/27] stash: improve option parsing test coverage Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 06/27] t3903: modernize style Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 07/27] t3903: add test for --intent-to-add file Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 08/27] stash: rename test cases to be more descriptive Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 09/27] stash: add tests for `git stash show` config Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 10/27] stash: mention options in `show` synopsis Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 11/27] stash: convert apply to builtin Thomas Gummerer
2019-03-14 13:19 ` regression in new built-in stash + fsmonitor (was Re: [PATCH v13 11/27] stash: convert apply to builtin) Ævar Arnfjörð Bjarmason
2019-03-14 15:20 ` Johannes Schindelin
2019-03-14 15:40 ` Ævar Arnfjörð Bjarmason
2019-03-14 22:45 ` Johannes Schindelin
2019-03-14 23:39 ` Ævar Arnfjörð Bjarmason
2019-03-15 2:23 ` Ben Peart
2019-02-25 23:16 ` [PATCH v13 12/27] stash: convert drop and clear to builtin Thomas Gummerer
2019-03-07 19:15 ` Jeff King
2019-03-09 18:30 ` Thomas Gummerer
2019-03-10 23:26 ` Jeff King
2019-03-11 1:40 ` Junio C Hamano
2019-03-11 21:40 ` Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 13/27] stash: convert branch " Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 14/27] stash: convert pop " Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 15/27] stash: convert list " Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 16/27] stash: convert show " Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 17/27] stash: convert store " Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 18/27] stash: convert create " Thomas Gummerer
2019-03-07 19:18 ` Jeff King
2019-03-08 15:30 ` Johannes Schindelin
2019-03-09 18:26 ` Thomas Gummerer
2019-03-11 1:47 ` Junio C Hamano
2019-03-11 7:30 ` Junio C Hamano
2019-03-11 21:42 ` Thomas Gummerer
2019-03-11 22:16 ` [PATCH v2] stash: pass pathspec as pointer Thomas Gummerer
2019-03-12 6:50 ` Junio C Hamano
2019-03-12 22:35 ` Johannes Schindelin
2019-03-12 23:40 ` Thomas Gummerer
2019-03-13 1:47 ` Junio C Hamano
2019-03-13 22:14 ` Johannes Schindelin
2019-03-15 22:33 ` Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 19/27] stash: convert push to builtin Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 20/27] stash: make push -q quiet Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 21/27] stash: convert save to builtin Thomas Gummerer
2019-02-25 23:16 ` Thomas Gummerer [this message]
2019-02-25 23:16 ` [PATCH v13 23/27] stash: replace all `write-tree` child processes with API calls Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 24/27] stash: convert `stash--helper.c` into `stash.c` Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 25/27] stash: add back the original, scripted `git stash` Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 26/27] stash: optionally use the scripted version again Thomas Gummerer
2019-02-25 23:16 ` [PATCH v13 27/27] tests: add a special setup where stash.useBuiltin is off Thomas Gummerer
2019-02-26 12:40 ` [PATCH v13 00/27] Convert "git stash" to C builtin Johannes Schindelin
2019-02-26 20:48 ` Thomas Gummerer
2019-02-26 21:45 ` Ævar Arnfjörð Bjarmason
2019-02-26 22:37 ` Johannes Schindelin
2019-03-03 1:24 ` Junio C Hamano
2019-03-03 1:25 ` Junio C Hamano
2019-03-03 10:03 ` Thomas Gummerer
2018-12-20 19:44 ` [PATCH v12 19/26] stash: make push -q quiet Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 20/26] stash: convert save to builtin Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 21/26] stash: optimize `get_untracked_files()` and `check_changes()` Paul-Sebastian Ungureanu
2019-01-06 22:47 ` Thomas Gummerer
2018-12-20 19:44 ` [PATCH v12 22/26] stash: replace all `write-tree` child processes with API calls Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 23/26] stash: convert `stash--helper.c` into `stash.c` Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 24/26] stash: add back the original, scripted `git stash` Paul-Sebastian Ungureanu
2018-12-20 19:44 ` [PATCH v12 25/26] stash: optionally use the scripted version again Paul-Sebastian Ungureanu
2019-01-06 22:59 ` Thomas Gummerer
2018-12-20 19:44 ` [PATCH v12 26/26] tests: add a special setup where stash.useBuiltin is off Paul-Sebastian Ungureanu
2019-01-03 23:39 ` [PATCH v12 00/26] Convert "git stash" to C builtin Junio C Hamano
2019-01-18 12:06 ` Johannes Schindelin
2019-01-18 17:49 ` 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
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=20190225231631.30507-23-t.gummerer@gmail.com \
--to=t.gummerer@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@gmail.com \
--cc=ungureanupaulsebastian@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).