{"thread":{"id":"46462","subject":"[PATCH] git-gui (MinGW): make use of MSys2's msgfmt","startedAt":"2017-07-25T08:37:27Z","lastAt":"2017-07-26T16:45:51Z","messageCount":3,"participants":["Johannes Schindelin","Junio C Hamano","Lars Schneider"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"325029","messageId":"8a13544743fd5e6a3b3b5fdb35e02c9c34695e25.1500971399.git.johannes.schindelin@gmx.de","threadId":"46462","inReplyTo":null,"subject":"[PATCH] git-gui (MinGW): make use of MSys2's msgfmt","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2017-07-25T08:35:57Z","receivedAt":"2017-07-25T08:37:27Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"When Git for Windows was still based on MSys1, we had no gettext, ergo\nno msgfmt, either. Therefore, we introduced a small and simple Tcl\nscript to perform the same task.\n\nHowever, with MSys2, we no longer need that because we have a proper\nmsgfmt executable. Plus, the po2msg.sh script somehow manages to hang\nwhen run in parallel in Git for Windows' SDK (symptom: the Continuous\nTesting tasks timing out).\n\nTwo reasons to use real msgfmt.exe instead.\n\nSigned-off-by: Johannes Schindelin \n---\n\n\tThis hopefully fixes the hangs with the Windows builds triggered\n\tby Travis. It was a tough one to figure out originally, and it is\n\tmy fault for prioritizing other patch contributions of this one;\n\tGit for Windows has been carrying this patch since April 6th, 2015.\n\n\tPat, I still have a couple of Pull Request open in your repository\n\tat https://github.com/patthoyts/git-gui/pulls/dscho that await any\n\treaction since October 14th last year. Please let me know when you\n\tare ready to accept code contributions again. In the meantime, I\n\twill send git-gui patches to this here mailing list, Cc:ing you,\n\tand hoping that Junio will take the patches.\n\nPublished-As: https://github.com/dscho/git/releases/tag/git-gui-msgfmt-on-windows-v1\nFetch-It-Via: git fetch https://github.com/dscho/git git-gui-msgfmt-on-windows-v1\n\n git-gui/Makefile | 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/git-gui/Makefile b/git-gui/Makefile\nindex fe30be38dc8..918a8de3691 100644\n--- a/git-gui/Makefile\n+++ b/git-gui/Makefile\n@@ -161,7 +161,9 @@ ifeq ($(uname_S),Darwin)\n \tendif\n endif\n ifneq (,$(findstring MINGW,$(uname_S)))\n+ifeq ($(shell expr \"$(uname_R)\" : '1\\.'),2)\n \tNO_MSGFMT=1\n+endif\n \tGITGUI_WINDOWS_WRAPPER := YesPlease\n \tGITGUI_RELATIVE := 1\n endif\n\nbase-commit: 5eada8987e79f216f2002a3cd991360a50cd577c\n-- \n2.13.3.windows.1.13.gaf0c2223da0\n"},{"id":"325069","messageId":"xmqqvamg9vcj.fsf@gitster.mtv.corp.google.com","threadId":"46462","inReplyTo":"8a13544743fd5e6a3b3b5fdb35e02c9c34695e25.1500971399.git.johannes.schindelin@gmx.de","subject":"Re: [PATCH] git-gui (MinGW): make use of MSys2's msgfmt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-07-25T19:20:44Z","receivedAt":"2017-07-25T20:49:42Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> \tPat, I still have a couple of Pull Request open in your repository\n> \tat https://github.com/patthoyts/git-gui/pulls/dscho that await any\n> \treaction since October 14th last year. Please let me know when you\n> \tare ready to accept code contributions again. In the meantime, I\n> \twill send git-gui patches to this here mailing list, Cc:ing you,\n> \tand hoping that Junio will take the patches.\n\nI'll try to fetch the latest from Pat, apply this on top and queue\nit in my tree in the meantime, but that is a lot more involved than\nsimply applying a single patch to a new branch and merging it to\n'pu', so it will be done later in today's integration cycle after I\nhandle other topics.\n\nThanks for working on this.\n"},{"id":"325130","messageId":"276F8090-61B8-4BF2-8D5D-7A6306880701@gmail.com","threadId":"46462","inReplyTo":"8a13544743fd5e6a3b3b5fdb35e02c9c34695e25.1500971399.git.johannes.schindelin@gmx.de","subject":"Re: [PATCH] git-gui (MinGW): make use of MSys2's msgfmt","fromName":"Lars Schneider","fromEmail":"larsxschneider@gmail.com","sentAt":"2017-07-26T16:45:44Z","receivedAt":"2017-07-26T16:45:51Z","isPatch":true,"sender":{"key":"larsxschneider@gmail.com","avatar":"https://avatars.githubusercontent.com/u/477434?v=4"},"body":"\n> On 25 Jul 2017, at 10:35, Johannes Schindelin wrote:\n> \n> When Git for Windows was still based on MSys1, we had no gettext, ergo\n> no msgfmt, either. Therefore, we introduced a small and simple Tcl\n> script to perform the same task.\n> \n> However, with MSys2, we no longer need that because we have a proper\n> msgfmt executable. Plus, the po2msg.sh script somehow manages to hang\n> when run in parallel in Git for Windows' SDK (symptom: the Continuous\n> Testing tasks timing out).\n> \n> Two reasons to use real msgfmt.exe instead.\n> \n> Signed-off-by: Johannes Schindelin \n> ---\n> \n> \tThis hopefully fixes the hangs with the Windows builds triggered\n> \tby Travis. It was a tough one to figure out originally, and it is\n\nAwesome :-) Thanks for digging into this problem!\n\n- Lars\n\n"}]}