@matheusbsbs / matheus-bagliano / commits / ef0f0b4509

stash: optimize `get_untracked_files()` and `check_changes()`

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> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Paul-Sebastian Ungureanu committed Feb 25, 2019 at 23:16 UTC ef0f0b4509ae8bd6736dacf740d9e1bc1281f7bd

1 file changed +27 -19

builtin/stash--helper.c

+27 -19

@@ -879,18 +879,17 @@ static int get_untracked_files(struct pathspec ps, int include_untracked,

879 }

880

881 /*

882 - * The return value of `check_changes()` can be:

882 + * The return value of `check_changes_tracked_files()` can be:

883 *

884 * < 0 if there was an error

885 * = 0 if there are no changes.

886 * > 0 if there are changes.

887 */

888 -static int check_changes(struct pathspec ps, int include_untracked)

888 +static int check_changes_tracked_files(struct pathspec ps)

889 {

890 int result;

891 struct rev_info rev;

892 struct object_id dummy;

893 - struct strbuf out = STRBUF_INIT;

893

894 /* No initial commit. */

895 if (get_oid("HEAD", &dummy))

@@ -918,14 +917,25 @@ static int check_changes(struct pathspec ps, int include_untracked)

917 if (diff_result_code(&rev.diffopt, result))

918 return 1;

919

920 + return 0;

921 +}

922 +

923 +/*

924 + * The function will fill `untracked_files` with the names of untracked files

925 + * It will return 1 if there were any changes and 0 if there were not.

926 + */

927 +static int check_changes(struct pathspec ps, int include_untracked,

928 + struct strbuf *untracked_files)

929 +{

930 + int ret = 0;

931 + if (check_changes_tracked_files(ps))

932 + ret = 1;

933 +

934 if (include_untracked && get_untracked_files(ps, include_untracked,

922 - &out)) {

923 - strbuf_release(&out);

924 - return 1;

925 - }

935 + untracked_files))

936 + ret = 1;

937

927 - strbuf_release(&out);

928 - return 0;

938 + return ret;

939 }

940

941 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,

1147 head_commit = lookup_commit(the_repository, &info->b_commit);

1148 }

1149

1140 - if (!check_changes(ps, include_untracked)) {

1150 + if (!check_changes(ps, include_untracked, &untracked_files)) {

1151 ret = 1;

1152 goto done;

1153 }

@@ -1162,8 +1172,7 @@ static int do_create_stash(struct pathspec ps, struct strbuf *stash_msg_buf,

1172 goto done;

1173 }

1174

1165 - if (include_untracked && get_untracked_files(ps, include_untracked,

1166 - &untracked_files)) {

1175 + if (include_untracked) {

1176 if (save_untracked_files(info, &msg, untracked_files)) {

1177 if (!quiet)

1178 fprintf_ln(stderr, _("Cannot save "

@@ -1248,6 +1257,9 @@ static int create_stash(int argc, const char **argv, const char *prefix)

1257 0);

1258

1259 memset(&ps, 0, sizeof(ps));

1260 + if (!check_changes_tracked_files(ps))

1261 + return 0;

1262 +

1263 strbuf_addstr(&stash_msg_buf, stash_msg);

1264 ret = do_create_stash(ps, &stash_msg_buf, include_untracked, 0, &info,

1265 NULL, 0);

@@ -1255,12 +1267,7 @@ static int create_stash(int argc, const char **argv, const char *prefix)

1267 printf_ln("%s", oid_to_hex(&info.w_commit));

1268

1269 strbuf_release(&stash_msg_buf);

1258 -

1259 - /*

1260 - * ret can be 1 if there were no changes. In this case, we should

1261 - * not error out.

1262 - */

1263 - return ret < 0;

1270 + return ret;

1271 }

1272

1273 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,

1277 struct stash_info info;

1278 struct strbuf patch = STRBUF_INIT;

1279 struct strbuf stash_msg_buf = STRBUF_INIT;

1280 + struct strbuf untracked_files = STRBUF_INIT;

1281

1282 if (patch_mode && keep_index == -1)

1283 keep_index = 1;

@@ -1304,7 +1312,7 @@ static int do_push_stash(struct pathspec ps, const char *stash_msg, int quiet,

1312 goto done;

1313 }

1314

1307 - if (!check_changes(ps, include_untracked)) {

1315 + if (!check_changes(ps, include_untracked, &untracked_files)) {

1316 if (!quiet)

1317 printf_ln(_("No local changes to save"));

1318 goto done;