Re: [PATCH] contrib/svn-fe: Fast script to remap svn history

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Oct 7, 2010, 08:28 UTC
Message-ID: <20101007082808.GC10523@burratino>
In-Reply-To: <AANLkTim_3m=YmyVL7eEoWDGwDwmuDJsYkQMgx8ciVPH0@mail.gmail.com>

Sverre Rabbelier wrote:

> On Thu, Oct 7, 2010 at 08:06, David Barr <david.barr@cordelta.com> wrote:

Show 20 quoted lines

>> --- a/fast-import.c
>> +++ b/fast-import.c
>> @@ -1454,6 +1454,15 @@ static int tree_content_set(
>>                n = slash1 - p;
>>        else
>>                n = strlen(p);
>> +       if (!slash1 && !n) {
>> +               if (!S_ISDIR(mode))
>> +                       die("Root cannot be a non-directory");
>> +               hashcpy(root->versions[1].sha1, sha1);
>> +               if (root->tree)
>> +                       release_tree_content_recursive(root->tree);
>> +               root->tree = subtree;
>> +               return 1;
>> +       }
>>        if (!n)
>>                die("Empty path component found in input");
>>        if (!slash1 && !S_ISDIR(mode) && subtree)
>
> What is this hunk about?

Ooh, ack for this part (though I agree with you that it ought to be explained in the log message).

Most git commands do their writing to the object db via the index and loose objects. When you just have a pile of trees you want to convert into commits, this is wasteful; for performance-critical operations like filter-branch --subdirectory-filter, one might want a sort of hash-object --batch-to-pack to write a pack directly.

Fortunately we have fast-import (which is one of the only git commands that will write to a pack directly) but there is not an advertised way to tell fast-import to use a given tree for its commits. So in current git, one has the unpleasant choice of writing loose objects without parsing the trees or writing straight to pack but having to parse trees to do it.

This patch changes that, by allowing

	M 040000 <tree id> ""

as a filemodify line in a commit to reset to a particular tree without any need to unpack it. For example,

	M 040000 4b825dc642cb6eb9a060e54bf8d69288fbee4904 ""

is a synonym for the deleteall command.