From: David Woodhouse <dwmw2@infradead.org>
To: git@vger.kernel.org
Cc: James Bottomley <James.Bottomley@SteelEye.com>
Subject: Handling renames.
Date: Thu, 14 Apr 2005 18:54:20 +0100 [thread overview]
Message-ID: <1113501260.27227.26.camel@hades.cambridge.redhat.com> (raw)
I've been looking at tracking file revisions. One proposed solution was
to have a separate revision history for individual files, with a new
kind of 'filecommit' object which parallels the existing 'commit',
referencing a blob instead of a tree. Then trees would reference such
objects instead of referencing blobs directly.
I think that introduces a lot of redundancy though, because 99% of the
time, the revision history of the individual file is entirely
reproducible from the revision history of the tree. It's only when files
are renamed that we fall over -- and I think we can handle renames
fairly well if we just log them in the commit object.
My 'gitfilelog.sh' script is already capable of tracking a given file
back through multiple tree commits, listing those commits where the file
in question was actually changed. It uses my patched version of diff-
tree which supports 'diff-tree <TREE_A> <TREE_B> <filename>' in order to
do this.
By storing rename information in the commit object, the script (or a
reimplementation of a similar algorithm) could know when to change the
filename it's looking for, as it goes back through the tree. That ought
to be perfectly sufficient.
So a commit involving a rename would look something like this...
tree 82ba574c85e9a2e4652419c88244e9dd1bfa8baa
parent bb95843a5a0f397270819462812735ee29796fb4
rename foo.c bar.c
author David Woodhouse <dwmw2@hades.cambridge.redhat.com> 1113499881 +0100
committer David Woodhouse <dwmw2@hades.cambridge.redhat.com> 1113499881 +0100
Rename foo.c to bar.c and s/foo_/bar_/g
Opinions? Dissent? We'd probably need to escape the filenames in some
way -- handwave over that for now.
--
dwmw2
next reply other threads:[~2005-04-14 17:51 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-14 17:54 David Woodhouse [this message]
2005-04-14 18:11 ` Handling renames Linus Torvalds
2005-04-14 19:09 ` David Woodhouse
2005-04-14 18:12 ` Ingo Molnar
2005-04-14 18:32 ` Linus Torvalds
2005-04-14 18:58 ` Ingo Molnar
2005-04-14 19:20 ` David Woodhouse
2005-04-14 19:21 ` David Mansfield
2005-04-14 18:21 ` H. Peter Anvin
2005-04-14 18:48 ` Linus Torvalds
2005-04-14 18:49 ` H. Peter Anvin
2005-04-14 19:22 ` Zach Welch
2005-04-14 19:40 ` Andrew Timberlake-Newell
2005-04-14 20:42 ` Naming the SCM (was Re: Handling renames.) Steven Cole
2005-04-14 20:53 ` Petr Baudis
2005-04-14 20:58 ` H. Peter Anvin
2005-04-14 21:01 ` Petr Baudis
2005-04-14 23:17 ` Peter Williams
2005-04-14 22:23 ` Handling renames Daniel Barkalow
2005-04-14 22:46 ` David Woodhouse
-- strict thread matches above, loose matches on Subject: below --
2005-04-15 13:37 linux
2005-04-15 13:53 ` David Woodhouse
2005-10-21 23:40 git-rev-list: add "--dense" flag Linus Torvalds
2005-10-22 0:37 ` Petr Baudis
2005-10-22 0:47 ` Handling renames Petr Baudis
2005-10-22 1:28 ` Linus Torvalds
2005-10-22 1:51 ` Petr Baudis
2005-10-22 2:10 ` Junio C Hamano
2005-10-22 2:49 ` Petr Baudis
2005-10-22 3:23 ` Linus Torvalds
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=1113501260.27227.26.camel@hades.cambridge.redhat.com \
--to=dwmw2@infradead.org \
--cc=James.Bottomley@SteelEye.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).