From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Kevin Willford <kcwillford@gmail.com>,
git@vger.kernel.org, Kevin Willford <kewillf@microsoft.com>
Subject: Re: [[PATCH v2] 4/4] rebase: avoid computing unnecessary patch IDs
Date: Tue, 2 Aug 2016 12:45:17 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.20.1608021244450.79248@virtualbox> (raw)
In-Reply-To: <xmqqtwf4i71l.fsf@gitster.mtv.corp.google.com>
Hi Junio,
On Mon, 1 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > On Fri, 29 Jul 2016, Junio C Hamano wrote:
> >
> >> Kevin Willford <kcwillford@gmail.com> writes:
> >>
> >> > static int patch_id_cmp(struct patch_id *a,
> >> > struct patch_id *b,
> >> > - void *keydata)
> >> > + struct diff_options *opt)
> >> > {
> >> > + if (is_null_sha1(a->patch_id) &&
> >> > + commit_patch_id(a->commit, opt, a->patch_id, 0))
> >> > + return error("Could not get patch ID for %s",
> >> > + oid_to_hex(&a->commit->object.oid));
> >> > + if (is_null_sha1(b->patch_id) &&
> >> > + commit_patch_id(b->commit, opt, b->patch_id, 0))
> >> > + return error("Could not get patch ID for %s",
> >> > + oid_to_hex(&b->commit->object.oid));
> >> > return hashcmp(a->patch_id, b->patch_id);
> >> > }
> >>
> >> These error returns initially looks slightly iffy in that in general
> >> the caller of any_cmp_fn() wants to know how a/b compares, but by
> >> returning error(), it always says "a is smaller than b".
> >
> > I am to blame, as this is my design.
> >
> > And yes, it is kind of funny that we require a cmpfn that returns <0, ==0
> > and >0 for comparisons, when hashmaps try to avoid any order.
>
> Perhaps hashmap API needs fixing in the longer term not to call this
> type hashmap_cmp_fn; instead it should lose cmp and say something
> like hashmap_eq_fn or something.
Maybe.
But to make sure: you do not expect Kevin to do that in the context of
this here patch series, right?
Ciao,
Dscho
next prev parent reply other threads:[~2016-08-02 10:46 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-29 16:19 [[PATCH v2] 0/4] Use header data patch ids for rebase to avoid loading file content Kevin Willford
2016-07-29 16:19 ` [[PATCH v2] 1/4] patch-ids: stop using a hand-rolled hashmap implementation Kevin Willford
2016-07-29 20:47 ` Junio C Hamano
2016-08-01 8:54 ` Johannes Schindelin
2016-08-01 20:04 ` Junio C Hamano
2016-08-01 22:34 ` Eric Wong
2016-08-02 10:30 ` Johannes Schindelin
2016-08-02 17:01 ` Junio C Hamano
2016-08-02 18:04 ` Junio C Hamano
2016-07-29 21:29 ` Junio C Hamano
2016-07-29 16:19 ` [[PATCH v2] 2/4] patch-ids: replace the seen indicator with a commit pointer Kevin Willford
2016-07-29 21:03 ` Junio C Hamano
2016-07-29 16:19 ` [[PATCH v2] 3/4] patch-ids: add flag to create the diff patch id using header only data Kevin Willford
2016-07-29 16:19 ` [[PATCH v2] 4/4] rebase: avoid computing unnecessary patch IDs Kevin Willford
2016-07-29 21:46 ` Junio C Hamano
2016-08-01 8:58 ` Johannes Schindelin
2016-08-01 20:11 ` Junio C Hamano
2016-08-02 9:50 ` Jakub Narębski
2016-08-02 17:06 ` Junio C Hamano
2016-08-02 10:45 ` Johannes Schindelin [this message]
2016-08-02 17:08 ` Junio C Hamano
2016-08-04 3:00 ` Junio C Hamano
2016-08-04 14:21 ` Johannes Schindelin
2016-07-29 20:22 ` [[PATCH v2] 0/4] Use header data patch ids for rebase to avoid loading file content Junio C Hamano
2016-08-01 9:01 ` Johannes Schindelin
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=alpine.DEB.2.20.1608021244450.79248@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kcwillford@gmail.com \
--cc=kewillf@microsoft.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).