Re: [PATCH 7/7] sparse-checkout: provide a new update subcommand
From: Elijah Newren <hidden>
Date: 2020-03-16 19:24:03
On Mon, Mar 16, 2020 at 10:18 AM Derrick Stolee [off-list ref] wrote:
On 3/16/2020 1:05 PM, Elijah Newren wrote:quoted
On Sun, Mar 15, 2020 at 9:24 AM Derrick Stolee [off-list ref] wrote:quoted
On 3/14/2020 3:11 AM, Elijah Newren via GitGitGadget wrote:quoted
From: Elijah Newren <redacted> +static int sparse_checkout_update(int argc, const char **argv) +{ + repo_read_index(the_repository); + return update_working_directory(NULL); +} +Short and sweet! I suppose my earlier comment about whether repo_read_index() was necessary is answered here. Perhaps it should be part of update_working_directory()? (And pass a repository pointer to it?)Good question. Is there a chance we want to make update_working_directory() available to other areas of git outside of sparse-checkout.c? If so, potentially re-reading the index might not be friendly, but if sparse-checkout.c is going to remain the only caller then it probably makes sense to move it inside.Minh had an interesting idea during side-conversations at the summit: have a way for an in-tree description of some sparse-checkout cones. The idea was to be able to automatically update the sparse-checkout while moving between commits that may have different dependency configurations. In the world of Office it would mean that there is some file ".sparse/word" that describes the directories required to build Word, and ".sparse/ppt" for building PowerPoint. Then, based on local Git config, we would see that we want our sparse-checkout cone to match the union of the directories in .sparse/word and .sparse/ppt. As we move HEAD, we would want to automatically update the sparse cone when those files change. I'm working on a design document for how this idea would work, realistically, that I plan to share here and with the Office team to see if it is actually a helpful plan. I think it would reduce the performance cost of the hook we plan to use for this, and would reduce the investment needed for a project to adopt sparse-checkout. All that is to say, yes we may want to add other callers to update_working_directory() outside of the sparse-checkout builtin. With that in mind, perhaps its name should reflect the fact that we are only updating it according to the sparse cone? Thanks, -Stolee
Interesting. Some context on another usecase (which may not modify
your plans but I'll throw it out there for consideration):
For us, we have a bunch of modules/* directories. Each has a file
which lists the other modules it directly depends upon. Thus to get
all dependencies both direct and indirect, something has to walk that
DAG. Being required to list the dependencies in both some place that
the build system understand, and one that git understands, doesn't
sound like fun. Also, requiring users to list all transitive
dependencies or remembering to run some script to do so sounds
problematic.
We do have a special file that defines teams, e.g. team-1 means these
three modules (plus implicitly any of their direct and indirect
dependencies), team-2 means this one module, etc.
Also, we do record the user's specification of the modules/teams they
want already, but not within the repo as you're doing in e.g.
.sparse/team-1, .sparse/team-2. If the user runs './sparsify
--modules A B', we record the modules in
.git/info/sparse-module-specification. This differs from
.git/info/sparse-checkout because the latter has full path ("module/A"
and "module/B" instead of just "A" and "B") and because it has
transitive dependencies (thus may have hundreds of directories even if
the user just specified two).
git would thus be unable to use our
.git/info/sparse-module-specification to do updates, and as above we
don't want to have to store the dependencies in another place, and the
fully resolved ones at that. However, we do get partial auto-updating
because the build system has a pre-build hook that essentially runs
`git sparse-checkout reapply` whenever any relevant
dependency-declaration file is newer than .git/info/sparse-checkout.
Of course, waiting until a build may be good enough for us, but others
might want updates when they switch branches or do other operations
(merge, rebase, cherry-pick, revert, am, reset, etc.). In such a
case, maybe we could use some kind of hook? Is this what
post-index-change is for? (If not, I certainly don't want to try to
navigate post-checkout and post-merge and add post-* for all the other
operations).
Anyway, some food for thought while you're working in this area...