From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: "Jeff King" <peff@peff.net>,
"Martin Ågren" <martin.agren@gmail.com>,
"Christian Couder" <christian.couder@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH] revision: introduce prepare_revision_walk_extended()
Date: Sat, 16 Dec 2017 13:12:16 +0100 [thread overview]
Message-ID: <6ace4f8f-824b-2825-ef18-1fccebb9fb5c@web.de> (raw)
prepare_revision_walk() allows callers to take ownership of the array of
pending objects by setting the rev_info flag "leak_pending" and copying
the object_array "pending". They use it to clear commit marks after
setup is done. This interface is brittle enough that it requires
extensive comments.
Provide an easier way by adding a function that can hand over the array
to a caller-supplied output parameter and converting all users of the
flag "leak_pending" to call prepare_revision_walk_extended() instead.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
---
Documentation/technical/api-revision-walking.txt | 6 ++++++
bisect.c | 17 +++++------------
builtin/checkout.c | 9 +--------
bundle.c | 9 +--------
revision.c | 10 +++++++++-
revision.h | 14 ++------------
6 files changed, 24 insertions(+), 41 deletions(-)
diff --git a/Documentation/technical/api-revision-walking.txt b/Documentation/technical/api-revision-walking.txt
index 55b878ade8..9dc573d2ec 100644
--- a/Documentation/technical/api-revision-walking.txt
+++ b/Documentation/technical/api-revision-walking.txt
@@ -50,6 +50,12 @@ function.
returns any error (non-zero return code) and if it does not, you can
start using get_revision() to do the iteration.
+`prepare_revision_walk_extended`::
+
+ Like prepare_revision_walk(), but allows callers to take ownership
+ of the array of pending objects by passing an object_array pointer
+ as the second parameter; passing NULL clears the array.
+
`get_revision`::
Takes a pointer to a `rev_info` structure and iterates over it,
diff --git a/bisect.c b/bisect.c
index 0fca17c02b..a2af405d28 100644
--- a/bisect.c
+++ b/bisect.c
@@ -641,9 +641,10 @@ static void bisect_rev_setup(struct rev_info *revs, const char *prefix,
/* XXX leak rev_argv, as "revs" may still be pointing to it */
}
-static void bisect_common(struct rev_info *revs)
+static void bisect_common(struct rev_info *revs,
+ struct object_array *old_pending_ptr)
{
- if (prepare_revision_walk(revs))
+ if (prepare_revision_walk_extended(revs, old_pending_ptr))
die("revision walk setup failed");
if (revs->tree_objects)
mark_edges_uninteresting(revs, NULL);
@@ -825,15 +826,7 @@ static int check_ancestors(const char *prefix)
bisect_rev_setup(&revs, prefix, "^%s", "%s", 0);
/* Save pending objects, so they can be cleaned up later. */
- pending_copy = revs.pending;
- revs.leak_pending = 1;
-
- /*
- * bisect_common calls prepare_revision_walk right away, which
- * (together with .leak_pending = 1) makes us the sole owner of
- * the list of pending objects.
- */
- bisect_common(&revs);
+ bisect_common(&revs, &pending_copy);
res = (revs.commits != NULL);
/* Clean up objects used, as they will be reused. */
@@ -964,7 +957,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
bisect_rev_setup(&revs, prefix, "%s", "^%s", 1);
revs.limited = 1;
- bisect_common(&revs);
+ bisect_common(&revs, NULL);
find_bisection(&revs.commits, &reaches, &all, !!skipped_revs.nr);
revs.commits = managed_skipped(revs.commits, &tried);
diff --git a/builtin/checkout.c b/builtin/checkout.c
index e1e157d205..1f04f5d5e5 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -796,14 +796,7 @@ static void orphaned_commit_warning(struct commit *old, struct commit *new)
add_pending_oid(&revs, "HEAD", &new->object.oid, UNINTERESTING);
/* Save pending objects, so they can be cleaned up later. */
- refs = revs.pending;
- revs.leak_pending = 1;
-
- /*
- * prepare_revision_walk (together with .leak_pending = 1) makes us
- * the sole owner of the list of pending objects.
- */
- if (prepare_revision_walk(&revs))
+ if (prepare_revision_walk_extended(&revs, &refs))
die(_("internal error in revision walk"));
if (!(old->object.flags & UNINTERESTING))
suggest_reattach(old, &revs);
diff --git a/bundle.c b/bundle.c
index 93290962c9..6af6e38c40 100644
--- a/bundle.c
+++ b/bundle.c
@@ -158,14 +158,7 @@ int verify_bundle(struct bundle_header *header, int verbose)
setup_revisions(2, argv, &revs, NULL);
/* Save pending objects, so they can be cleaned up later. */
- refs = revs.pending;
- revs.leak_pending = 1;
-
- /*
- * prepare_revision_walk (together with .leak_pending = 1) makes us
- * the sole owner of the list of pending objects.
- */
- if (prepare_revision_walk(&revs))
+ if (prepare_revision_walk_extended(&revs, &refs))
die(_("revision walk setup failed"));
i = req_nr;
diff --git a/revision.c b/revision.c
index f6a3da5cd9..3a231451a4 100644
--- a/revision.c
+++ b/revision.c
@@ -2841,6 +2841,12 @@ void reset_revision_walk(void)
}
int prepare_revision_walk(struct rev_info *revs)
+{
+ return prepare_revision_walk_extended(revs, NULL);
+}
+
+int prepare_revision_walk_extended(struct rev_info *revs,
+ struct object_array *old_pending_ptr)
{
int i;
struct object_array old_pending;
@@ -2860,7 +2866,9 @@ int prepare_revision_walk(struct rev_info *revs)
}
}
}
- if (!revs->leak_pending)
+ if (old_pending_ptr)
+ *old_pending_ptr = old_pending;
+ else
object_array_clear(&old_pending);
/* Signal whether we need per-parent treesame decoration */
diff --git a/revision.h b/revision.h
index 54761200ad..5d4b475334 100644
--- a/revision.h
+++ b/revision.h
@@ -150,18 +150,6 @@ struct rev_info {
date_mode_explicit:1,
preserve_subject:1;
unsigned int disable_stdin:1;
- /*
- * Set `leak_pending` to prevent `prepare_revision_walk()` from clearing
- * the array of pending objects (`pending`). It will still forget about
- * the array and its entries, so they really are leaked. This can be
- * useful if the `struct object_array` `pending` is copied before
- * calling `prepare_revision_walk()`. By setting `leak_pending`, you
- * effectively claim ownership of the old array, so you should most
- * likely call `object_array_clear(&pending_copy)` once you are done.
- * Observe that this is about ownership of the array and its entries,
- * not the commits referenced by those entries.
- */
- unsigned int leak_pending:1;
/* --show-linear-break */
unsigned int track_linear:1,
track_first_time:1,
@@ -270,6 +258,8 @@ extern int handle_revision_arg(const char *arg, struct rev_info *revs,
extern void reset_revision_walk(void);
extern int prepare_revision_walk(struct rev_info *revs);
+extern int prepare_revision_walk_extended(struct rev_info *revs,
+ struct object_array *old_pending_ptr);
extern struct commit *get_revision(struct rev_info *revs);
extern char *get_revision_mark(const struct rev_info *revs,
const struct commit *commit);
--
2.15.1
next reply other threads:[~2017-12-16 12:12 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-16 12:12 René Scharfe [this message]
2017-12-17 10:20 ` [PATCH] revision: introduce prepare_revision_walk_extended() Martin Ågren
2017-12-18 15:10 ` Jeff King
2017-12-18 19:18 ` René Scharfe
2017-12-19 11:49 ` Jeff King
2017-12-19 18:33 ` Junio C Hamano
2017-12-20 13:08 ` Jeff King
2017-12-21 18:41 ` René Scharfe
2017-12-24 14:22 ` Jeff King
2017-12-25 17:36 ` René Scharfe
2017-12-25 17:41 ` [PATCH v2 0/9] revision: get rid of the flag leak_pending René Scharfe
2017-12-25 17:43 ` [PATCH v2 1/9] commit: avoid allocation in clear_commit_marks_many() René Scharfe
2018-01-10 7:54 ` Jeff King
2017-12-25 17:44 ` [PATCH v2 2/9] commit: use clear_commit_marks_many() in remove_redundant() René Scharfe
2017-12-25 17:44 ` [PATCH v2 3/9] ref-filter: use clear_commit_marks_many() in do_merge_filter() René Scharfe
2017-12-25 17:44 ` [PATCH v2 4/9] object: add clear_commit_marks_all() René Scharfe
2018-01-10 7:58 ` Jeff King
2018-01-11 18:57 ` René Scharfe
2018-01-12 15:20 ` Jeff King
2017-12-25 17:45 ` [PATCH v2 5/9] bisect: avoid using the rev_info flag leak_pending René Scharfe
2018-01-10 8:07 ` Jeff King
2018-01-11 18:57 ` René Scharfe
2018-01-12 15:23 ` Jeff King
2017-12-25 17:46 ` [PATCH v2 6/9] bundle: " René Scharfe
2017-12-28 21:13 ` Junio C Hamano
2018-01-10 8:18 ` Jeff King
2017-12-25 17:47 ` [PATCH v2 7/9] checkout: " René Scharfe
2017-12-28 21:24 ` Junio C Hamano
2017-12-25 17:47 ` [PATCH v2 8/9] revision: remove the unused " René Scharfe
2017-12-25 17:48 ` [PATCH v2 9/9] commit: remove unused function clear_commit_marks_for_object_array() René Scharfe
2017-12-28 20:32 ` [PATCH v2 0/9] revision: get rid of the flag leak_pending Junio C Hamano
2018-01-10 8:20 ` Jeff King
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=6ace4f8f-824b-2825-ef18-1fccebb9fb5c@web.de \
--to=l.s.r@web.de \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=peff@peff.net \
/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).