{"thread":{"id":"48639","subject":"[GSoC] GSoC with git, week 5","startedAt":"2018-06-03T21:50:28Z","lastAt":"2018-06-03T21:50:28Z","messageCount":1,"participants":["Alban Gruin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"349193","messageId":"7aa242ed-0d19-669b-574f-9d0847e2169e@gmail.com","threadId":"48639","inReplyTo":null,"subject":"[GSoC] GSoC with git, week 5","fromName":"Alban Gruin","fromEmail":"alban.gruin@gmail.com","sentAt":"2018-06-03T21:50:15Z","receivedAt":"2018-06-03T21:50:28Z","isPatch":false,"sender":{"key":"alban.gruin@gmail.com","avatar":"https://avatars.githubusercontent.com/u/6310153?v=4"},"body":"Hi,\n\nI wrote a post about this week. Unfortunately, I have a technical issue\nwith my website, so you can find it right in this email instead. I’m\nsorry about that. I will publish it on my blog as soon as it comes back\nonline.\n\nFeel free to give me your feedback!\n\nCheers,\nAlban\n\n\n--\n\nAs you may know, I made no less than three attempts to upstream my\nchanges about ``preserve-merges`` last week.\n\nThis week began by a fourth one[1].\n\n4th attempt\n-----------\n\nJohannes pointed out some problems with my commit messages on that\nseries:\n\n - some lines are too long\n - they do not describe what I wanted to do well.\n\nOn the first point, commits messages should wrap at 72 characters, but\nI configured Emacs to wrap pretty much anything at 80 characters.\n\nHe also wanted to keep the original name of\n``git_rebase__interactive__preserve_merges()`` (which I renamed\n``git_rebase__preserve_merges()``), but I decided not to, as this\nfunction is now part of ``git-rebase--preserve-merges.sh``.\n\nAlso, Friday, Junio Hamano announced[2] that my changes (among many\nothers) have been merged into the ``pu`` (proposed updates) branch of\ngit.git. This does not mean that it will necessarily hit ``master``,\nbut it’s a start.\n\nTODO: help\n----------\n\nWhen you start an interactive rebase, you’re greeted with your\n``$EDITOR``, containing a list of commits to edit, and an help text\nexplaining you how this works.\n\nSo, this week, I rewrote the code writing this message from shell\nto C. You can find the branch here[3], and the discussion on the list\nhere[4].\n\nThe conversion itself is quite trivial, but strings are a rather\ncurious case here: some of them begins with one or two newlines. As\nthis becomes useless in C, Stefan advised me to remove them, as this\nwould probably cause less confusion for the translators, but it\nimplies changing the translations, as pointed out by Johannes and\nPhillip Wood. Right now, no clear opinion has emerged from the\ndiscussion.\n\nSome additionnal work and refactoring could be made once more code has\nbeen converted. For instance, the todo-list file is opened, modified,\nand closed several times. Instead, we could create a ``strbuf``, build\nit progressively, then write it once to the todo file.\n\nWhat’s next?\n------------\n\nI’ve started to work on converting the ``edit-todo`` functionnality of\ninteractive rebase. This is also a straightforward change, but it\nwould also require some future work once the conversion is completed.\n\n[1]\nhttps://public-inbox.org/git/20180528123422.6718-1-alban.gruin@gmail.com/\n[2] https://public-inbox.org/git/xmqqa7sf7yzs.fsf@gitster-ct.c.googlers.com/\n[3] https://github.com/agrn/git/tree/ag/append-todo-help-c\n[4]\nhttps://public-inbox.org/git/20180531110130.18839-1-alban.gruin@gmail.com/\n"}]}