From: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [RFC] git blame-tree
Date: Wed, 2 Mar 2011 22:24:29 +0100 [thread overview]
Message-ID: <AANLkTi=hqVcGw16q6uJBO5kPjKtsa=ujtQxg4FRj_+i6@mail.gmail.com> (raw)
In-Reply-To: <20110302211035.GC20400@sigill.intra.peff.net>
On Wed, Mar 2, 2011 at 10:10 PM, Jeff King <peff@peff.net> wrote:
> On Wed, Mar 02, 2011 at 07:39:20PM +0100, Piotr Krukowiecki wrote:
>
>> I'd expect this to be something like union. Currently I can only think about
>> following case:
>>
>> Some files were changed in branch1, some in branch2, some in both.
>> Show me how the files are changed. For example:
>> file1 changed in branch1 in commit1
>> file2 changed in branch2 in commit2
>> file3 changed in branch1 in commit3 and in branch2 in commit4
>>
>> If file was not changed since branch creation then don't show it (optionally).
>
> I think we are getting into something different here, because you are
> caring not just about the commit in some traversal that touched a file,
> but for each source, which commits got us there and potentially multiple
> such commits, one per source for each file.
Yah, it might be something for git-log or git-diff.
> And that's a bit more expensive to compute, and the answers are not
> always unambiguous. For example, let's say branch1 and branch2 fork from
> some merge-base M. In the parent of M, file "foo" was changed. We
> traverse from branch1 and branch2, not seeing anything interesting for
> "foo". We hit M, and then finally see that its parent touched "foo".
So it's like this?
B1
|
M - B2
|
P <- changes foo
> What do we output? Both branches have equal claim to the commit.
That's easy. In "show only differences" we don't show anything,
because on both branches last-change-commit of "foo" is the same.
In "show all" last-change-commit is P so show it (with message like
"changed in common root" or whatever).
> I think you could figure out semantics that make sense if you spent
> enough time on it. But I also think it is making the relatively simple
> problem of blame-tree a lot more complex.
I think this is simple, but maybe I don't understand some git
internals that make it hard.
--
Piotrek
next prev parent reply other threads:[~2011-03-02 21:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-02 16:40 [RFC] git blame-tree Jeff King
2011-03-02 17:16 ` Jeff King
2011-03-02 17:51 ` Piotr Krukowiecki
2011-03-02 18:07 ` Jeff King
2011-03-02 18:39 ` Piotr Krukowiecki
2011-03-02 21:10 ` Jeff King
2011-03-02 21:24 ` Piotr Krukowiecki [this message]
2011-03-02 21:41 ` Jeff King
2011-03-02 18:31 ` Junio C Hamano
2011-03-02 21:04 ` Jeff King
2011-03-02 23:22 ` Junio C Hamano
2011-03-03 15:36 ` Jeff King
2011-03-05 5:41 ` Ryan Tomayko
2011-03-03 20:20 ` Jakub Narebski
2011-03-02 17:40 ` Jeff King
2011-03-04 14:40 ` Will Palmer
2011-03-04 14:53 ` 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='AANLkTi=hqVcGw16q6uJBO5kPjKtsa=ujtQxg4FRj_+i6@mail.gmail.com' \
--to=piotr.krukowiecki@gmail.com \
--cc=git@vger.kernel.org \
--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).