From: Kevin Bracey <kevin@bracey.fi>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC/PATCH] Make --full-history consider more merges
Date: Fri, 26 Apr 2013 22:18:28 +0300 [thread overview]
Message-ID: <517AD304.6020807@bracey.fi> (raw)
In-Reply-To: <7v1u9y4gnq.fsf@alter.siamese.dyndns.org>
On 25/04/2013 21:19, Junio C Hamano wrote:
> How many decorations are we talking about here? One for each merge
> commit in the entire history? Do we have a cue that can tell us when
> we are really done with a commit that lets us discard the associated
> data as we go on digging, keeping the size of our working set somewhat
> bounded, perhaps proportional to the number of commits in our
> rev_info->commits queue?
As it stands, it's one decoration per interesting merge commit that's
processed by try_to_simplify_commit(), if simplify_merges is set. (Only
simplify_merges needs the information at present - conceivably
limit_to_ancestry could use it too). I don't know how to go about
discarding the data, or when it could be done - I'm not clear enough on
the wider sequencing machinery in revision.c yet.
I have a first draft of a set of patches, which will follow this message.
1/3 addresses the initial "get simplify_merges right", passing your
test. That patch is written to make it easy to extend with the next two,
which add a "never eliminate all our TREESAME parents" rule, and
reinstate your reverted"eliminate irrelevant side branches". The error I
spotted in that was that you weren't checking that you were eliminating
root commits - with that fixed it seems sound to me.
I need to create a new test for patch 2, but this version passes the
full test suite, including fixing the known failure in t6012, and it
also gets the examples in the manual right. (I've extended the examples
to include the irrelevant side branch - not sure this is worthwhile, as
it's such an unusual case, and I think that section is confusing enough
for newbies...)
Kevin
next prev parent reply other threads:[~2013-04-26 19:27 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-09 18:00 Locating merge that dropped a change Kevin Bracey
2013-04-11 17:28 ` Kevin Bracey
2013-04-11 19:21 ` Junio C Hamano
2013-04-22 19:23 ` [RFC/PATCH] Make --full-history consider more merges Kevin Bracey
2013-04-22 19:49 ` Junio C Hamano
2013-04-23 16:35 ` Kevin Bracey
2013-04-24 22:34 ` Junio C Hamano
2013-04-25 1:59 ` Junio C Hamano
2013-04-25 15:48 ` Kevin Bracey
2013-04-25 16:51 ` Junio C Hamano
2013-04-25 17:11 ` Kevin Bracey
2013-04-25 18:19 ` Junio C Hamano
2013-04-26 19:18 ` Kevin Bracey [this message]
2013-04-26 19:31 ` [RFC/PATCH 1/3] revision.c: tighten up TREESAME handling of merges Kevin Bracey
2013-04-26 19:31 ` [RFC/PATCH 2/3] simplify-merges: never remove all TREESAME parents Kevin Bracey
2013-04-27 23:02 ` Junio C Hamano
2013-04-28 7:10 ` Kevin Bracey
2013-04-28 18:09 ` Junio C Hamano
2013-04-26 19:31 ` [RFC/PATCH 3/3] simplify-merges: drop merge from irrelevant side branch Kevin Bracey
2013-04-27 22:36 ` [RFC/PATCH 1/3] revision.c: tighten up TREESAME handling of merges Junio C Hamano
2013-04-27 22:57 ` David Aguilar
2013-04-28 7:03 ` Kevin Bracey
2013-04-28 18:38 ` Junio C Hamano
2013-04-29 17:46 ` Kevin Bracey
2013-04-29 18:11 ` 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=517AD304.6020807@bracey.fi \
--to=kevin@bracey.fi \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).