From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?Q?Daniel_Mart=C3=ADn?= Newsgroups: gmane.emacs.devel Subject: Re: ediff merge wrapper Date: Tue, 03 Nov 2020 10:23:29 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8813"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (darwin) Cc: emacs-devel To: Eliza Velasquez Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Nov 03 10:25:13 2020 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kZsYy-0002BG-Oj for ged-emacs-devel@m.gmane-mx.org; Tue, 03 Nov 2020 10:25:12 +0100 Original-Received: from localhost ([::1]:39426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZsYx-0004Dr-QV for ged-emacs-devel@m.gmane-mx.org; Tue, 03 Nov 2020 04:25:11 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:32920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZsXZ-0003Te-4p for emacs-devel@gnu.org; Tue, 03 Nov 2020 04:23:48 -0500 Original-Received: from sonic304-21.consmr.mail.ir2.yahoo.com ([77.238.179.146]:37508) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kZsXT-0003mj-IF for emacs-devel@gnu.org; Tue, 03 Nov 2020 04:23:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.es; s=s2048; t=1604395413; bh=J60YksMpn4Ty5bAan/mrjXTpzlK1mey71BW+RKu3QpY=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From:Subject; b=flEExB/DrwOASSWGcNFaZLYe4Vxv8ol8opT0E0CH4bJXDgvOwMe5MKKnOhbHKZlj3aFchw8P8igFLuJ35dPM3JbI4QO3kRXlq0caFffOyNp3XqiaNyHy4AhD4JEB9AlikpiDfbrW2ss6wcvXXiHYSL98bJTUVQuPqp0vXzcuSVQKxIbqXn2C7f1PSvDKl0B24uIHT9ytTYPT3uUxSdYLVCOBGJG1AL1Uyo/3qYFlC/fIlrRk/Ag9UKKXlU474PJbsQekDMBvp5AFwYFVzRjdYN/UazShlSPhWgFyj4uEo5byqCrHogvj7EFQK8a/ja9h+ZbRTXiOnccv5ilrCyysaQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1604395413; bh=oDRg9BXHylGTlrPdhqCBdZ+tR5mJKnJnyDgCqD2+hYa=; h=From:To:Subject:Date; b=g2Rs2fvJL5gHSAbAArXzf+MQZkr6EANv7iZSosq/Eh8V14wgXXwRx0YyfcN90kDYkBfA+HVw/92uImSaT5YMsX2Z6Nkp+GaUyUu7oqoJc+9xzIL9pXC8kvRqnD7FTooWf2A9QfuqYoLnHQ6hUn/OFk/sAcD1OR5PQihr3KZbAjtEVfeD1mtlZxwmkeBakXOiHn97nYArJT0qYqLSRQE5qoA8yoiaxJdDLMwRxwbzGi4h64X1byE0mSbo5gJmwj6YVQ5ZY+0pPoFh7day9OjXNHMJ+tnX9SYINGmh7cFy6dhxoQdVz4mDkiFAKUpeBDCIfcQ3xJv2DhPbNpE1eYtP6Q== X-YMail-OSG: dAkmNHEVM1lJLdLXu78BBd5McY8HOukjTS3EKfly42aqEwdPMBWzlcnOU9tPqzG WJuPzCdEUcFTF86LzBGznFpRIQ23BHgqFAnZOm82.G4peQAmXAPnB6teAQQe9kvn5cTnF6QVWhPl HiU2R9fs16GYzKdLZhZ.LGjC6widj.ETMmMz6DwiNmd4U_IYji_ms3Bm.2yQvvBgjWyOp7fcbotQ B95HfT23SrbKUHVB9pmwfKZDa.Y3sIFSQeNsTkAJCiiQZl6M7trfGoHGrOR6ytWFRCFY8Z4MD513 GYVSWrOQWqZBIUgkM8.4SQC7yPEM3Fd1c.wN2YGtLd6Hc0EkkPBAFTtCNCw55vNoaoFCXGRmJDPy UcUpDavZSSO6bXLijVOkHgCgN8uZgLUsr9YnHCIJy1AnDuUe551RQ70A.RmPi6ef0TUUNbz.0MVe PnSeJ3kyfZ4A2Q3RppyGabyYPQwW78tTL56p_nRqSWd8KCl3Jh954WI6SO_96lduXyiqIB6RVyb_ Vh6XG64AWx_w3zEckc4sVjR7UZuLSUGgLljqx8bNDpRXRzPT6UZcLtltGA6CDIz0xd_bhT9THqhP zSyHO3zIDSE4wCrS6rpMDZweY85CCIDWNDbd.8hua2vW4w_IWk4G8dJYLEnXOtbAkEkjnbM_4c9y kY85.RmePv0stCYxktNtTekC4rAim.Yp2FUZwytD38TPtkzFR3ZvgmfdshirS8eLqIQWmTDTt3Er p1NkYoAah2VT5y1jjV9b7wS8E81vTbGbDk1UAXYI8zoH9nLuAyPfiZ4lSQoeO_pJWZheuw9twC1i A6Tuu_5KSDwMw.uvAdS0lhGScJ.udDmH41_sJ.oMKO Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic304.consmr.mail.ir2.yahoo.com with HTTP; Tue, 3 Nov 2020 09:23:33 +0000 Original-Received: by smtp412.mail.ir2.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID e04b93e2533a181cbf1911fa1ce83d36; Tue, 03 Nov 2020 09:23:30 +0000 (UTC) In-Reply-To: (Eliza Velasquez's message of "Mon, 2 Nov 2020 12:01:33 -0800") X-Mailer: WebService/1.1.16944 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Apache-HttpAsyncClient/4.1.4 (Java/11.0.7) Received-SPF: pass client-ip=77.238.179.146; envelope-from=mardani29@yahoo.es; helo=sonic304-21.consmr.mail.ir2.yahoo.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 04:23:33 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:258637 Archived-At: Eliza Velasquez writes: > Hello, > > Internally at Google, we have a wrapper performing an ediff merge with > emacs/emacsclient which blocks until the merge operation has > completed. It automatically handles edge cases such as creating a new > frame over ssh in tty mode or being invoked as an emacs subprocess. I > think it would be really useful to upstream a tool like this, given > that using emacs as a merge tool that can be invoked by software such > as mercurial or perforce can be very fiddly or have unexpected > behavior. > > The biggest caveat is that the internal tool is written in golang, and > I imagine that you will want it to be rewritten to C. So before I go > and do that, I would like to gauge interest in distributing such a > wrapper alongside emacsclient and the like. What do you think? I think it's an interesting wrapper, yes. I assume the main use case is a very big repository where merge sets can be very large, right? We could discuss if it has enough applicability to be in the Emacs core distribution, but it's something I'd definitely like to see, at least as part of the Emacs/VCS free software community. Thanks.