Hi, On Fri, Oct 30, 2020 at 2:02 AM Kaartic Sivaraam <kaartic.sivaraam@xxxxxxxxx> wrote: > > Hi Elijah, > > On 26/10/20 10:22 pm, Elijah Newren wrote: > > > > On Mon, Oct 26, 2020 at 1:44 AM Sangeeta NB <sangunb09@xxxxxxxxx> wrote: > >> > >> I would love to participate in outreachy this year with Git in the > >> project "Accelerate rename detection and the range-diff command in > >> Git". I have contributed to the microproject "Unify the meaning of > >> dirty between diff and describe"[1] which is still under review, but > >> through the process, I have got myself familiar with the mailing list > >> and patch review system. I am also contributing to another issue[2] > >> which is still under discussion[3] about `git bisect` and `git > >> rebase`. > >> > >> [1] https://lore.kernel.org/git/pull.751.git.1602781723670.gitgitgadget@xxxxxxxxx > >> [2] https://github.com/gitgitgadget/git/issues/486 > >> [3] https://lore.kernel.org/git/pull.765.git.1603271344522.gitgitgadget@xxxxxxxxx/ > >> > >> Coming to the project, I have read more about it[4] and have created > >> the initial version for the timeline. I would really love to have > >> comments on it. > >> > >> [4] https://github.com/gitgitgadget/git/issues/519 > > > > I might be the bearer of some bad or concerning news. This email is > > directed more to the mentors and others on the git mailing list, but > > obviously may affect you as well: > > > > I apologize for not stating my concerns more forcefully earlier, but I > > didn't have as many details at the time or have an idea how fast > > merge-ort could be upstreamed. Anyway, I'm still concerned that this > > might not be a good project for Outreachy due to two factors: unclear > > benefit, and conflicts: > > > > 1) I've got merges down to the point where even if there is a massive > > rename of 26000 files (e.g. renaming "drivers/" to "pilots/" in the > > linux kernel), rename detection is NOT the long tent pole in a merge. > > So although this project is interesting, it's not clear that this > > project will help us much. It might be better to get my changes > > merged down and see if there's enough need for additional > > optimizations first. > > > > 2) Ignoring what I've already submitted, the remaining diffstat for > > merge-ort is about 5500 lines.... > > 2a) If I break that ~5500 lines into patches with 50 lines each, > > that's 111 patches. If I assume I can send 10-20 patches per week > > without overwhelming folks, that's 6-11 weeks, pulling us somewhere > > into mid-December or mid-January. 10-20 patches per week might be > > over-optimistic on reviewer fatigue, which would push it out even > > further. > > 2b) Work is going to soon rotate me onto other non-git projects, > > meaning even if the mailing list can review my changes aggressively, > > there's a chance I might not be able to keep up on feeding them to the > > list. > > 2c) diffcore-rename.c is only ~700 lines right now. My 5500 lines > > of changes includes over 1000 new lines for diffcore-rename.c and > > about 150 line removals for it. These changes are spread all over the > > file; only four small functions remain untouched. In fact, I even > > made big changes to struct diff_rename_dst too, so any new uses of it > > would almost certainly have textual conflicts. > > 2d) My diffcore-rename.c changes probably do not make logical sense > > to submit first. They should come after some groundwork is laid for > > merge-ort. > > > > Even though at a high level this project is complementary to the > > optimizations I made in my 'merge-ort' work, I fear there will be LOTS > > of intermediate conflicts as we both make changes to the same areas > > during the same time and make a mess of things. > > > > Thanks for the detailed concerns. Some thoughts: > > - Given that a major portion of the project would be to evaluate > various algorithms and identifying the most suitable one, I believe > implementation conflict shouldn't be a problem as it's expected to > start only by late-January. Also, as Christian pointed out elsewhere > it might be a good learning experience. "late-January" _might_ be okay, but I'm worried that relying on optimistic timelines is a bad idea. However, if the primary purpose is a good learning experience, or if the primary purpose is to evaluate different algorithms (i.e. we're not relying on the timelines to avoid conflict, it's just a bonus if they don't), then sure, no problem there. > - I do have a concern about one thing, though. For evaluating the > algorithm in the context of Git, we might need to do some experimental > implementations to get some metrics which would serve as the data that > we could use to identify the optimal algorithm. I'm wondering whether > your planned changes might affect that. In the sense that, is there a > chance for the evaluation to become obsolete as a consequence of those > changes? If yes, what could we do to overcome that? Any thoughts on > this would be helpful. That is certainly a possibility, yes. One way to address that concern is for me to freeze some branch (likely some version that I deploy internally at $DAYJOB for testing), and for you to build on that. If all the new merge backend code gets reviewed and upstreamed fast enough, and the areas you depend on don't change too drastically based on reviewer comments, then building on merge-ort creates no impediments for the Outreachy project to get upstreamed at the normal time. I can understand, though, if that plan seems worrisome due to worries about how fast the new backend will be upstreamed or how much it needs to change in the process; that is, after all, why I raised my concerns in the first place.
