Web lists-archives.com

Re: GSoC Project | Submodules related work




>> Also the conclusions which I was able to make from the mails[2] are:
>>
>> 1. We are catching commands typed by the user in an unpopulated or
>>    even an uninitialized submodule.
>
> What do you mean by catch here?

By catching commands, I meant that we identify that the user has entered
the command in an unpopulated or uninitialized submodule and respond
to the user accordingly.

>
> What happens is that Git is summoned in e.g. path/super/sub/ and when
> Git wakes up, it has to find out what is going on, e.g. where the repo
> is that it should work on.
>
> (0) it checks if it is inside the .git dir by looking for files like
> HEAD, config
>     objects/.)
> 1) It looks if there is a ".git" file or directory in the current directory.
> 2) if that is not the case go up one directory and check again.
>     repeat this step until either the repo is found or a filesystem boundary
>     is reached.
>
> And as uninitialized submodules do not have a .git, we'll find the
> superproject repository. Once the superproject is found, the
> subcommand itself is invoked. (e.g. cmd_add for "git add", in
> builtin/add.c; the function signature is just like main() except that
> it has an additional prefix parameter, which indicates the path
> from where we ended up at to the original invokation point,
> i.e. when invoked in  path/super/sub/, and the superproject
> was found at path/super/, the prefix is sub/.
>
>> 2. We first check if we are present in the superproject's root dir.
>
> After the repo discovery as described above we're in a root of
> *a* repository, and we have a prefix, which may or may not be
> an uninitialized submodule.
>
>>     we check for the presence of .gitmodules file,
>
> We have an API for that. :)
> See submodule-config.h#submodule_from_path that
> either returns a struct submodule or NULL if there is no
> submodule.
>
> However to detect if there is a submodule, we can to check two
> things: if there is a .gitmodules entry and if there is a gitlink entry
> recorded in the tree. Depending on the command we'd want to
> do one before the other. e.g. git-add most likely doesn't need to
> load .gitmodules, but may have the objects already loaded.
> So checking if a given path is a submodule is cheap compared
> to loading the .gitmodules file, so we'd probably want to do the
> cheap thing first.

Adding to this, we may use here this functions is_submodule_populated()
and is_submodule_initialized() from submodule.c

>
>>    from which we can check the path give is inside some submodule.
>>    *When .git file containing just a .gitlink is present then, I am not
>>    sure but even in this case the root folder contains .gitmodules
>>    file in the case of submodules(Please correct me here, if I'm going
>>    wrong), then we may still carry the same procedure as above.
>
> I think even when the .gitmodules file is missing, we want to have
> some sort of warning here, as it is a confusing state to run git
> from an uninitialized gitlink'd repository. The user may assume they
> run the command in the gitlink'd repo, so it may be better to bail out.

Can you please give an example of such situation ? I would like to
reproduce it and think further.
(As even in the case where the superproject is initialized using gitlink,
.gitmodules is in the same folder as that of the .git file containing
GIT_DIR path)

>
>>
>> 3. Once we can detect whether the $cwd is in a submodule, we can output
>>    "The submodule 'sub' is not initialized. To init ..." for all the
>>    commands which doesn't initialize and populate the submodule.
>
> It depends on the command what we want to do; for most commands
> this seems to be the right choice. For git-log we need to do a different
> thing, as you mention in 4)
>
>> 4. As similar detection could be used in the third project listed above,
>>    hence I even wished to include it.
>>
>> What are your suggestions about these projects? Also, will it be
>> rational to consider it as one complete project for GSoC?
>
> I think it is sensible to consider enhancing multiple commands, as
> one command is a very small bite for a GSoC project.
> And once you have the first command done, you'd generally know
> the vibe and the next commands ought to be easier. (though we'd
> still need to figure out different outcomes, e.g. step 3 or 4 as above).
>

Thank you for your suggestions. I will also look into more such cases
where I may enhance multiple commands so as to expand my project.

>> I think this might interfere with Valery's proposal[3] of shell to C
>> conversion of submodule related codes. What do you all think?
>
> I do not think there is interference with Valery's proposal, as this
> proposal would mostly work in builtin/{add,log,commit}.c
> (cmd_status is in builtin/commit.c for whatever reason)
> whereas Valery's proposal would mostly revolve around working
> in git-submodule.sh (deleting lines there) and
> builtin/submodule--helper.c (adding the deleted lines back here;
> in another language)
>
>> If it does interfere, then can we both work out on something common?
>
> I really do not see a lot of interference of these 2 proposals.

Thank you for confirming that. Now I may carry-on working on my
proposal for the project :) Also if it possible, I would like to
work on a smaller task related to my project first, as it will help me
understand about the project more, and which also will help me write
my proposal for the project.

Thanks,
Prathamesh