From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Derrick Stolee" <stolee@gmail.com>,
"René Scharfe" <l.s.r@web.de>,
git@vger.kernel.org, "SZEDER Gábor" <szeder.dev@gmail.com>
Subject: [PATCH v2 11/13] name-rev: drop name_rev()'s 'generation' and 'distance' parameters
Date: Tue, 12 Nov 2019 11:38:19 +0100 [thread overview]
Message-ID: <20191112103821.30265-12-szeder.dev@gmail.com> (raw)
In-Reply-To: <20191112103821.30265-1-szeder.dev@gmail.com>
Following the previous patches in this series we can get the values of
name_rev()'s 'generation' and 'distance' parameters from the 'stuct
rev_name' associated with the commit as well.
Let's simplify the function's signature and remove these two
unnecessary parameters.
Note that at this point we could do the same with the 'tip_name',
'taggerdate' and 'from_tag' parameters as well, but those parameters
will be necessary later, after the recursion is eliminated.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
---
builtin/name-rev.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 6416c49f67..fc61d6fa71 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -106,8 +106,9 @@ static struct rev_name *create_or_update_name(struct commit *commit,
static void name_rev(struct commit *commit,
const char *tip_name, timestamp_t taggerdate,
- int generation, int distance, int from_tag)
+ int from_tag)
{
+ struct rev_name *name = get_commit_rev_name(commit);
struct commit_list *parents;
int parent_number = 1;
@@ -116,7 +117,7 @@ static void name_rev(struct commit *commit,
parents = parents->next, parent_number++) {
struct commit *parent = parents->item;
const char *new_name;
- int new_generation, new_distance;
+ int generation, distance;
parse_commit(parent);
if (parent->date < cutoff)
@@ -126,25 +127,25 @@ static void name_rev(struct commit *commit,
size_t len;
strip_suffix(tip_name, "^0", &len);
- if (generation > 0)
+ if (name->generation > 0)
new_name = xstrfmt("%.*s~%d^%d", (int)len, tip_name,
- generation, parent_number);
+ name->generation,
+ parent_number);
else
new_name = xstrfmt("%.*s^%d", (int)len, tip_name,
parent_number);
- new_generation = 0;
- new_distance = distance + MERGE_TRAVERSAL_WEIGHT;
+ generation = 0;
+ distance = name->distance + MERGE_TRAVERSAL_WEIGHT;
} else {
new_name = tip_name;
- new_generation = generation + 1;
- new_distance = distance + 1;
+ generation = name->generation + 1;
+ distance = name->distance + 1;
}
if (create_or_update_name(parent, new_name, taggerdate,
- new_generation, new_distance,
+ generation, distance,
from_tag))
- name_rev(parent, new_name, taggerdate,
- new_generation, new_distance, from_tag);
+ name_rev(parent, new_name, taggerdate, from_tag);
}
}
@@ -288,7 +289,7 @@ static int name_ref(const char *path, const struct object_id *oid, int flags, vo
tip_name = xstrdup(path);
if (create_or_update_name(commit, tip_name, taggerdate,
0, 0, from_tag))
- name_rev(commit, tip_name, taggerdate, 0, 0,
+ name_rev(commit, tip_name, taggerdate,
from_tag);
else
free(to_free);
--
2.24.0.388.gde53c094ea
next prev parent reply other threads:[~2019-11-12 10:38 UTC|newest]
Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-19 21:46 [PATCH 00/15] name-rev: eliminate recursion SZEDER Gábor
2019-09-19 21:46 ` [PATCH 01/15] t6120-describe: correct test repo history graph in comment SZEDER Gábor
2019-09-20 21:47 ` Junio C Hamano
2019-09-20 22:29 ` SZEDER Gábor
2019-09-28 4:06 ` Junio C Hamano
2019-09-19 21:46 ` [PATCH 02/15] t6120-describe: modernize the 'check_describe' helper SZEDER Gábor
2019-09-20 21:49 ` Junio C Hamano
2019-09-19 21:46 ` [PATCH 03/15] name-rev: use strip_suffix() in get_rev_name() SZEDER Gábor
2019-09-20 16:36 ` René Scharfe
2019-09-20 17:10 ` SZEDER Gábor
2019-09-19 21:46 ` [PATCH 04/15] name-rev: avoid unnecessary cast in name_ref() SZEDER Gábor
2019-09-20 16:37 ` René Scharfe
2019-09-19 21:47 ` [PATCH 05/15] name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation SZEDER Gábor
2019-09-20 15:11 ` Derrick Stolee
2019-09-20 15:40 ` SZEDER Gábor
2019-09-20 16:37 ` René Scharfe
2019-09-19 21:47 ` [PATCH 06/15] t6120: add a test to cover inner conditions in 'git name-rev's name_rev() SZEDER Gábor
2019-09-20 15:14 ` Derrick Stolee
2019-09-20 15:44 ` SZEDER Gábor
2019-09-19 21:47 ` [PATCH 07/15] name-rev: extract creating/updating a 'struct name_rev' into a helper SZEDER Gábor
2019-09-20 15:18 ` Derrick Stolee
2019-09-22 8:18 ` [PATCH] name-rev: rewrite create_or_update_name() Martin Ågren
2019-12-09 12:43 ` SZEDER Gábor
2019-09-19 21:47 ` [PATCH 08/15] name-rev: pull out deref handling from the recursion SZEDER Gábor
2019-09-20 15:21 ` Derrick Stolee
2019-09-20 17:42 ` SZEDER Gábor
2019-09-20 16:37 ` René Scharfe
2019-09-20 18:13 ` SZEDER Gábor
2019-09-20 18:14 ` SZEDER Gábor
2019-09-21 9:57 ` SZEDER Gábor
2019-09-21 12:37 ` René Scharfe
2019-09-22 19:05 ` SZEDER Gábor
2019-09-23 18:43 ` René Scharfe
2019-09-23 18:59 ` SZEDER Gábor
2019-09-23 19:55 ` René Scharfe
2019-09-23 20:47 ` SZEDER Gábor
2019-09-24 17:03 ` René Scharfe
2019-09-26 17:33 ` SZEDER Gábor
2019-09-21 12:37 ` René Scharfe
2019-09-21 14:21 ` SZEDER Gábor
2019-09-21 15:52 ` René Scharfe
2019-09-19 21:47 ` [PATCH 09/15] name-rev: restructure parsing commits and applying date cutoff SZEDER Gábor
2019-09-21 12:37 ` René Scharfe
2019-09-19 21:47 ` [PATCH 10/15] name-rev: restructure creating/updating 'struct rev_name' instances SZEDER Gábor
2019-09-20 15:27 ` Derrick Stolee
2019-09-20 17:09 ` SZEDER Gábor
2019-09-19 21:47 ` [PATCH 11/15] name-rev: drop name_rev()'s 'generation' and 'distance' parameters SZEDER Gábor
2019-09-19 21:47 ` [PATCH 12/15] name-rev: eliminate recursion in name_rev() SZEDER Gábor
2019-09-19 21:47 ` [PATCH 13/15] name-rev: cleanup name_ref() SZEDER Gábor
2019-09-19 21:47 ` [PATCH 14/15] name-rev: plug a memory leak in name_rev() SZEDER Gábor
2019-09-19 21:47 ` [PATCH 14/15] name-rev: plug memory leak in name_rev() in the deref case SZEDER Gábor
2019-09-19 22:47 ` SZEDER Gábor
2019-09-19 21:47 ` [PATCH 15/15] name-rev: plug a " SZEDER Gábor
2019-09-20 15:35 ` Derrick Stolee
2019-09-19 21:47 ` [PATCH 15/15] name-rev: plug memory leak in name_rev() SZEDER Gábor
2019-09-19 22:48 ` SZEDER Gábor
2019-09-20 15:37 ` [PATCH 00/15] name-rev: eliminate recursion Derrick Stolee
2019-09-20 17:37 ` SZEDER Gábor
2019-11-12 10:38 ` [PATCH v2 00/13] " SZEDER Gábor
2019-11-12 10:38 ` [PATCH v2 01/13] t6120-describe: correct test repo history graph in comment SZEDER Gábor
2019-11-12 10:38 ` [PATCH v2 02/13] t6120-describe: modernize the 'check_describe' helper SZEDER Gábor
2019-11-27 18:02 ` Jonathan Tan
2019-11-12 10:38 ` [PATCH v2 03/13] name-rev: use strbuf_strip_suffix() in get_rev_name() SZEDER Gábor
2019-11-12 19:02 ` René Scharfe
2019-11-12 10:38 ` [PATCH v2 04/13] name-rev: avoid unnecessary cast in name_ref() SZEDER Gábor
2019-11-12 10:38 ` [PATCH v2 05/13] name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation SZEDER Gábor
2019-11-12 10:38 ` [PATCH v2 06/13] t6120: add a test to cover inner conditions in 'git name-rev's name_rev() SZEDER Gábor
2019-11-12 10:38 ` [PATCH v2 07/13] name-rev: extract creating/updating a 'struct name_rev' into a helper SZEDER Gábor
2019-11-12 10:38 ` [PATCH v2 08/13] name-rev: pull out deref handling from the recursion SZEDER Gábor
2019-11-12 10:38 ` [PATCH v2 09/13] name-rev: restructure parsing commits and applying date cutoff SZEDER Gábor
2019-11-12 10:38 ` [PATCH v2 10/13] name-rev: restructure creating/updating 'struct rev_name' instances SZEDER Gábor
2019-11-12 10:38 ` SZEDER Gábor [this message]
2019-11-27 18:13 ` [PATCH v2 11/13] name-rev: drop name_rev()'s 'generation' and 'distance' parameters Jonathan Tan
2019-11-12 10:38 ` [PATCH v2 12/13] name-rev: eliminate recursion in name_rev() SZEDER Gábor
2019-11-27 17:57 ` Jonathan Tan
2019-12-09 12:22 ` SZEDER Gábor
2019-11-12 10:38 ` [PATCH v2 13/13] name-rev: cleanup name_ref() SZEDER Gábor
2019-11-27 18:01 ` Jonathan Tan
2019-12-09 12:32 ` SZEDER Gábor
2019-11-12 19:17 ` [PATCH v2 00/13] name-rev: eliminate recursion Johannes Schindelin
2019-11-13 19:25 ` Sebastiaan Dammann
2019-12-09 11:52 ` [PATCH v3 00/14] " SZEDER Gábor
2019-12-09 11:52 ` [PATCH v3 01/14] t6120-describe: correct test repo history graph in comment SZEDER Gábor
2019-12-09 11:52 ` [PATCH v3 02/14] t6120-describe: modernize the 'check_describe' helper SZEDER Gábor
2019-12-09 11:52 ` [PATCH v3 03/14] name-rev: use strbuf_strip_suffix() in get_rev_name() SZEDER Gábor
2019-12-09 11:52 ` [PATCH v3 04/14] name-rev: avoid unnecessary cast in name_ref() SZEDER Gábor
2019-12-09 11:52 ` [PATCH v3 05/14] name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation SZEDER Gábor
2019-12-09 11:52 ` [PATCH v3 06/14] t6120: add a test to cover inner conditions in 'git name-rev's name_rev() SZEDER Gábor
2019-12-09 11:52 ` [PATCH v3 07/14] name-rev: extract creating/updating a 'struct name_rev' into a helper SZEDER Gábor
2019-12-09 11:52 ` [PATCH v3 08/14] name-rev: pull out deref handling from the recursion SZEDER Gábor
2019-12-09 11:52 ` [PATCH v3 09/14] name-rev: restructure parsing commits and applying date cutoff SZEDER Gábor
2019-12-09 11:52 ` [PATCH v3 10/14] name-rev: restructure creating/updating 'struct rev_name' instances SZEDER Gábor
2019-12-09 11:52 ` [PATCH v3 11/14] name-rev: drop name_rev()'s 'generation' and 'distance' parameters SZEDER Gábor
2019-12-09 11:52 ` [PATCH v3 12/14] name-rev: use 'name->tip_name' instead of 'tip_name' SZEDER Gábor
2019-12-09 11:52 ` [PATCH v3 13/14] name-rev: eliminate recursion in name_rev() SZEDER Gábor
2019-12-09 11:52 ` [PATCH v3 14/14] name-rev: cleanup name_ref() SZEDER Gábor
2019-12-09 15:08 ` [PATCH v3 00/14] name-rev: eliminate recursion Derrick Stolee
2019-12-11 17:33 ` 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=20191112103821.30265-12-szeder.dev@gmail.com \
--to=szeder.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=stolee@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.
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).