From mboxrd@z Thu Jan 1 00:00:00 1970 From: Piotr Krukowiecki Subject: Re: git cherry improvements suggestions Date: Thu, 24 Mar 2011 08:40:39 +0100 Message-ID: References: <4D89CF8E.4070100@drmicha.warpmail.net> <4D89F6BC.2040902@drmicha.warpmail.net> <4D8A0741.9000506@drmicha.warpmail.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Git Mailing List To: Michael J Gruber X-From: git-owner@vger.kernel.org Thu Mar 24 08:40:54 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Q2fA6-00065f-AX for gcvg-git-2@lo.gmane.org; Thu, 24 Mar 2011 08:40:54 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933604Ab1CXHkm convert rfc822-to-quoted-printable (ORCPT ); Thu, 24 Mar 2011 03:40:42 -0400 Received: from mail-vw0-f46.google.com ([209.85.212.46]:45427 "EHLO mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933550Ab1CXHkk convert rfc822-to-8bit (ORCPT ); Thu, 24 Mar 2011 03:40:40 -0400 Received: by vws1 with SMTP id 1so6271024vws.19 for ; Thu, 24 Mar 2011 00:40:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=r8rnr5GkJvln3HmKl/b15x3f5plwJW4oTf/xEpMhdKg=; b=wNcPlCS33e375hik+f3jEgcfLnmMTmIrW8mtAlGSGFz5ffiWUOhajZSLlI4+Z8syy6 z6UgN2DuJEG8mKUHIKMWPZCPqTS6kmwcM1Zy94cNCtOOkFUwwRLplK2eCQbqpzuD30gz AF0P04wTwiBGLvMCEiu79PfLzJW/9RnmBAC3A= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=EcdilCID6Y9/qFbcuC6qn4QjqDNhE/VGGBOc5mTeFBtYwXZbElNcBldhN4Lm5P6gfD mi9G5ouYi1tWC6FnUTBCcSC5eGsxYBToApcuzDFgwMaPydhrS1qUnw891TigD+vOEWXq Vp6bmgMORPYaWzQDUCAbKkEgY36TguEFjEEtg= Received: by 10.52.95.135 with SMTP id dk7mr85652vdb.93.1300952439189; Thu, 24 Mar 2011 00:40:39 -0700 (PDT) Received: by 10.220.210.16 with HTTP; Thu, 24 Mar 2011 00:40:39 -0700 (PDT) In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Wed, Mar 23, 2011 at 8:28 PM, Piotr Krukowiecki wrote: > On Wed, Mar 23, 2011 at 3:44 PM, Michael J Gruber > wrote: >> Piotr Krukowiecki venit, vidit, dixit 23.03.2011 15:43: >>> On Wed, Mar 23, 2011 at 2:33 PM, Michael J Gruber >>> wrote: >>>> Piotr Krukowiecki venit, vidit, dixit 23.03.2011 14:23: >>>>> Just some stats: >>>>> >>>>> =A0 =A0git log --cherry-mark --left-right --oneline --date-order = branch...trunk >>>>> >>>>> lists 1004 commits, takes about 20s and memory peaks to about 670= MB >>>>> twice during the run (I'm on linux with AMD Phenom II X4 945) >>>>> >>>>> With limit it prints X last commits (the limiting seems to take p= lace after all >>>>> work, on the output list only). >>>>> >>>>> branch..trunk is 551 commits, the other way is 453 commits. >>>>> 710 commits are found to be "=3D", 98 "<", 196 ">". >>>>> >>>>> Note, I'm not saying it's too slow, or that it's working incorrec= tly, I'm just >>>>> giving real-life stats if anyone was interested. >>>>> I suspect such checks won't be done frequently. >>>> >>>> You don't need to say it's slow - I've said so already :( >>>> >>>> http://permalink.gmane.org/gmane.comp.version-control.git/169725 >>> >>> In the link above: >>> =A0 git cherry A B: 0.4s >>> =A0 git rev-list --cherry A...B: 1.7s >>> >>> So rev-list is 4.25x slower. >>> >>> In my case it's only 1.23x slower: >>> >>> =A0 =A0$ time git rev-list --cherry branch...trunk =A0> /tmp/rev-li= st >>> =A0 =A0real =A0 =A0 =A0 0m18.627s >>> =A0 =A0user =A0 =A0 =A0 0m17.710s >>> =A0 =A0sys =A0 =A0 =A0 =A00m0.900s >>> >>> =A0 =A0$ time git cherry =A0branch trunk =A0> /tmp/cherry >>> =A0 =A0real =A0 =A0 =A0 0m15.345s >>> =A0 =A0user =A0 =A0 =A0 0m14.310s >>> =A0 =A0sys =A0 =A0 =A0 =A00m1.020s >>> >>> >> >> How's that with > /dev/null (or with --count for rev-list)? Also, ho= w >> many merge bases do you have: >> >> git merge-base --all branch trunk | wc -l > > I expect only one - there should be no merges between those two > branches. > > I will do measurements tomorrow. Branches might change a bit since yesterday so the exact numbers might be a bit different. $ time git cherry branch trunk > /dev/null real 0m15.246s user 0m14.260s sys 0m0.970s $ time git rev-list --cherry branch...trunk > /dev/null real 0m18.801s user 0m17.980s sys 0m0.800s $ time git rev-list --cherry --count branch...trunk 556 real 0m18.825s user 0m18.010s sys 0m0.770s $ time git merge-base --all branch trunk | wc -l 2 real 0m0.538s user 0m0.490s sys 0m0.040s I expected one merge base, but it appears our history is seriously fscked, either by past svn operations or by git-svn clone :) (I'm not saying there's an error somewhere, just that the history is ... complicated) --=20 Piotr Krukowiecki