From: Stefan Beller <sbeller@google.com>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Ronnie Sahlberg <ronniesahlberg@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH v2 08/24] Extract function should_expire_reflog_ent()
Date: Fri, 12 Dec 2014 12:02:09 -0800 [thread overview]
Message-ID: <CAGZ79kYYoJL4oXzTq0w7rV-qVfdn0HnDGCua1ONd5MKD91PJ-Q@mail.gmail.com> (raw)
In-Reply-To: <1418374623-5566-9-git-send-email-mhagger@alum.mit.edu>
On Fri, Dec 12, 2014 at 12:56 AM, Michael Haggerty <mhagger@alum.mit.edu> wrote:
> Extract from expire_reflog_ent() a function that is solely responsible
> for deciding whether a reflog entry should be expired. By separating
> this "business logic" from the mechanics of actually expiring entries,
> we are working towards the goal of encapsulating reflog expiry within
> the refs API, with policy decided by a callback function passed to it
> by its caller.
>
> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Stefan Beller <sbeller@google.com>
> ---
> builtin/reflog.c | 70 +++++++++++++++++++++++++++++++++-----------------------
> 1 file changed, 42 insertions(+), 28 deletions(-)
>
> diff --git a/builtin/reflog.c b/builtin/reflog.c
> index ba5b3d3..06ce8b1 100644
> --- a/builtin/reflog.c
> +++ b/builtin/reflog.c
> @@ -288,51 +288,65 @@ static int unreachable(struct expire_reflog_cb *cb, struct commit *commit, unsig
> return !(commit->object.flags & REACHABLE);
> }
>
> -static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
> - const char *email, unsigned long timestamp, int tz,
> - const char *message, void *cb_data)
> +/*
> + * Return true iff the specified reflog entry should be expired.
> + */
> +static int should_expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
> + const char *email, unsigned long timestamp, int tz,
> + const char *message, void *cb_data)
> {
> struct expire_reflog_cb *cb = cb_data;
> struct commit *old, *new;
>
> if (timestamp < cb->cmd->expire_total)
> - goto prune;
> -
> - if (cb->cmd->rewrite)
> - osha1 = cb->last_kept_sha1;
> + return 1;
>
> old = new = NULL;
> if (cb->cmd->stalefix &&
> (!keep_entry(&old, osha1) || !keep_entry(&new, nsha1)))
> - goto prune;
> + return 1;
>
> if (timestamp < cb->cmd->expire_unreachable) {
> if (cb->unreachable_expire_kind == UE_ALWAYS)
> - goto prune;
> + return 1;
> if (unreachable(cb, old, osha1) || unreachable(cb, new, nsha1))
> - goto prune;
> + return 1;
> }
>
> if (cb->cmd->recno && --(cb->cmd->recno) == 0)
> - goto prune;
> -
> - if (cb->newlog) {
> - char sign = (tz < 0) ? '-' : '+';
> - int zone = (tz < 0) ? (-tz) : tz;
> - fprintf(cb->newlog, "%s %s %s %lu %c%04d\t%s",
> - sha1_to_hex(osha1), sha1_to_hex(nsha1),
> - email, timestamp, sign, zone,
> - message);
> - hashcpy(cb->last_kept_sha1, nsha1);
> - }
> - if (cb->cmd->verbose)
> - printf("keep %s", message);
> + return 1;
> +
> return 0;
> - prune:
> - if (!cb->newlog)
> - printf("would prune %s", message);
> - else if (cb->cmd->verbose)
> - printf("prune %s", message);
> +}
> +
> +static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
> + const char *email, unsigned long timestamp, int tz,
> + const char *message, void *cb_data)
> +{
> + struct expire_reflog_cb *cb = cb_data;
> +
> + if (cb->cmd->rewrite)
> + osha1 = cb->last_kept_sha1;
> +
> + if (should_expire_reflog_ent(osha1, nsha1, email, timestamp, tz,
> + message, cb_data)) {
> + if (!cb->newlog)
> + printf("would prune %s", message);
> + else if (cb->cmd->verbose)
> + printf("prune %s", message);
> + } else {
> + if (cb->newlog) {
> + char sign = (tz < 0) ? '-' : '+';
> + int zone = (tz < 0) ? (-tz) : tz;
> + fprintf(cb->newlog, "%s %s %s %lu %c%04d\t%s",
> + sha1_to_hex(osha1), sha1_to_hex(nsha1),
> + email, timestamp, sign, zone,
> + message);
> + hashcpy(cb->last_kept_sha1, nsha1);
> + }
> + if (cb->cmd->verbose)
> + printf("keep %s", message);
> + }
> return 0;
> }
>
> --
> 2.1.3
>
next prev parent reply other threads:[~2014-12-12 20:02 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-12 8:56 [PATCH v2 00/24] Add reflog_expire() to the references API Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 01/24] refs.c: make ref_transaction_create a wrapper for ref_transaction_update Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 02/24] refs.c: make ref_transaction_delete " Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 03/24] refs.c: add a function to append a reflog entry to a fd Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 04/24] expire_reflog(): it's not an each_ref_fn anymore Michael Haggerty
2014-12-12 18:09 ` Stefan Beller
2014-12-12 8:56 ` [PATCH v2 05/24] expire_reflog(): rename "ref" parameter to "refname" Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 06/24] expire_reflog(): return early if the reference has no reflog Michael Haggerty
2014-12-12 18:15 ` Stefan Beller
2014-12-12 8:56 ` [PATCH v2 07/24] expire_reflog(): use a lock_file for rewriting the reflog file Michael Haggerty
2014-12-12 18:57 ` Stefan Beller
2014-12-12 8:56 ` [PATCH v2 08/24] Extract function should_expire_reflog_ent() Michael Haggerty
2014-12-12 20:02 ` Stefan Beller [this message]
2014-12-12 8:56 ` [PATCH v2 09/24] expire_reflog(): extract two policy-related functions Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 10/24] expire_reflog(): add a "flags" argument Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 11/24] expire_reflog(): move dry_run to flags argument Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 12/24] expire_reflog(): move updateref " Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 13/24] Rename expire_reflog_cb to expire_reflog_policy_cb Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 14/24] struct expire_reflog_cb: a new callback data type Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 15/24] expire_reflog(): pass flags through to expire_reflog_ent() Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 16/24] expire_reflog(): move verbose to flags argument Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 17/24] expire_reflog(): move rewrite " Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 18/24] Move newlog and last_kept_sha1 to "struct expire_reflog_cb" Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 19/24] expire_reflog(): treat the policy callback data as opaque Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 20/24] reflog_expire(): new function in the reference API Michael Haggerty
2014-12-12 8:57 ` [PATCH v2 21/24] refs.c: remove unlock_ref/close_ref/commit_ref from the refs api Michael Haggerty
2014-12-12 8:57 ` [PATCH v2 22/24] lock_any_ref_for_update(): inline function Michael Haggerty
2014-12-12 20:04 ` Stefan Beller
2014-12-12 8:57 ` [PATCH v2 23/24] refs.c: don't expose the internal struct ref_lock in the header file Michael Haggerty
2014-12-12 8:57 ` [PATCH v2 24/24] refs.c: let fprintf handle the formatting Michael Haggerty
2014-12-12 20:58 ` [PATCH v2 00/24] Add reflog_expire() to the references API 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=CAGZ79kYYoJL4oXzTq0w7rV-qVfdn0HnDGCua1ONd5MKD91PJ-Q@mail.gmail.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=mhagger@alum.mit.edu \
--cc=ronniesahlberg@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).