From: "Philip Oakley" <philipoakley@iee.org>
To: "Pavel Kretov" <firegurafiku@gmail.com>, <git@vger.kernel.org>
Subject: Re: [idea] File history tracking hints
Date: Mon, 11 Sep 2017 22:48:46 +0100 [thread overview]
Message-ID: <E8C827ED458648F78F263F2F2712493B@PhilipOakley> (raw)
In-Reply-To: CAOZF3=Ouvk8ccME+fXr_T=GL1j4Gx3Hgj3ao_-GQng-noeOubg@mail.gmail.com
From: "Pavel Kretov" <firegurafiku@gmail.com>
> Hi all,
>
> Excuse me if the topic I'm going to raise here has been already discussed
> on the mailing list, forums, or IRC, but I couldn't find anything related.
>
>
> The problem:
>
> Git, being "a stupid content tracker", doesn't try to keep an eye on
> operations which happens to individual files; things like file renames
> aren't recorded during commit, but heuristically detected later.
>
> Unfortunately, the heuristic can only deal with simple file renames with
> no substantial content changes; it's helpless when you:
>
> - rename file and change it's content significantly;
> - split single file into several files;
> - merge several files into another;
> - copy entire file from another commit, and do other things like these.
>
> However, if we're able to preserve this information, it's possible
> not only to do more accurate 'git blame', but also merge revisions with
> fewer conflicts.
>
>
> The proposal:
>
> The idea is to let user give hints about what was changed during
> the commit. For example, if user did a rename which wasn't automatically
> detected, he would append something like the following to his commit
> message:
>
> Tracking-hints: rename dev-vcs/git/git-1.0.ebuild ->
> dev-vcs/git/git-2.0.ebuild
>
> or (if full paths of affected files can be unambiguously omitted):
>
> Tracking-hints: rename git-1.0.ebuild -> git-2.0.ebuild
>
> There may be other hint types:
>
> Tracking-hint: recreate LICENSE.txt
> Tracking-hint: split main.c -> main.c cmdline.c
> Tracking-hint: merge linalg.py <- vector.py matrix.py
>
> or even something like this:
>
> Tracking-hint: copy json.py <-
> libs/json.py@4db88291251151d8c5c8e4f20430fa4def2cb2ed
>
> If file transformation cannot be described by a single tracking hint, it
> shall
> be possible to specify a sequence of hints at once:
>
> Tracking-hint:
> split Utils.java -> AppHelpers.java StringHelpers.java
> recreate Utils.java
>
> Note that in the above example the order of operations really matters, so
> both lines have to reside in one 'Tracking-hint' block.
>
> * * *
>
> How do you think, is this idea worth implementing?
> Any other thoughts on this?
>
> -- Pavel Kretov.
Maybe use the "interpret-trailers" methods for standardising your hints
locally (in your team / workplace) to see how it goes and flesh out what
works and what doesn't. Trying to decide, a-priori, what are the right hints
is likely to be the hard part.
--
Philip
next prev parent reply other threads:[~2017-09-11 21:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-11 7:11 [idea] File history tracking hints Pavel Kretov
2017-09-11 18:11 ` Stefan Beller
2017-09-11 18:47 ` Jacob Keller
2017-09-11 18:41 ` Jeff King
2017-09-11 20:09 ` Igor Djordjevic
2017-09-11 21:48 ` Philip Oakley [this message]
2017-09-13 11:38 ` Johannes Schindelin
2017-09-14 23:22 ` Philip Oakley
2017-09-29 23:12 ` Johannes Schindelin
2017-09-30 8:02 ` Jeff Hostetler
2017-09-30 15:11 ` Johannes Schindelin
2017-10-01 3:27 ` Junio C Hamano
2017-10-02 17:41 ` Stefan Beller
2017-10-02 18:51 ` Jeff Hostetler
2017-10-02 19:18 ` Stefan Beller
2017-10-02 20:02 ` Jeff Hostetler
2017-10-03 0:52 ` Junio C Hamano
2017-10-03 0:45 ` 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=E8C827ED458648F78F263F2F2712493B@PhilipOakley \
--to=philipoakley@iee.org \
--cc=firegurafiku@gmail.com \
--cc=git@vger.kernel.org \
/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).