From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: joaotavora@gmail.com (=?iso-8859-1?Q?Jo=E3o_T=E1vora?=) Newsgroups: gmane.emacs.devel Subject: Re: Merge-base alias for git vc-diff Date: Thu, 03 Jan 2019 13:30:17 +0000 Message-ID: References: <87bm58ornb.fsf@mail.linkov.net> <92f058a4-ef98-725b-9603-5a671113dfaa@yandex.ru> <87lg4aak10.fsf@mail.linkov.net> <87o98zapae.fsf@mail.linkov.net> <7e8020d6-92df-a475-cbd7-98f42676a99b@yandex.ru> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1546522150 24292 195.159.176.226 (3 Jan 2019 13:29:10 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 3 Jan 2019 13:29:10 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (windows-nt) Cc: Juri Linkov , emacs-devel , Dmitry Gutov To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 03 14:29:06 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from listsout.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gf33a-0006Dm-4s for ged-emacs-devel@m.gmane.org; Thu, 03 Jan 2019 14:29:06 +0100 Original-Received: from localhost ([127.0.0.1]:53785 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf35g-0004RZ-Kx for ged-emacs-devel@m.gmane.org; Thu, 03 Jan 2019 08:31:16 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:50884) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf350-0004RP-FH for emacs-devel@gnu.org; Thu, 03 Jan 2019 08:30:35 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gf34s-0007Pf-Iw for emacs-devel@gnu.org; Thu, 03 Jan 2019 08:30:34 -0500 Original-Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:54071) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gf34p-0007L8-1W for emacs-devel@gnu.org; Thu, 03 Jan 2019 08:30:23 -0500 Original-Received: by mail-wm1-x32c.google.com with SMTP id d15so29267992wmb.3 for ; Thu, 03 Jan 2019 05:30:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=WZO54G5j8ZEn6J/7fo2YDuk0csDixoEfH/txfZFZDj4=; b=jOv2b1Ogqjhe2byr0AmGco0/8jTgGm2FNH15ZEACORlUDg/cexxwzVsTZv2O5MnAlK 2djO62RkTQufnmSnFXOZdL8JsGDCMoJgtDFdo95xnFWHgjtW8x64IYypPScYKkwkCzGK mxqoAs/Uo2VPNQwdti+2yEdYDNCFXqtcRRr2G5N85i8jh6UirTq6ywdilhzjhBAxTi3o yRv9Ng6sD3Qk2aa2n0N7kKmf5qrp85FjBMINKoobnazk88j6bZnb+AAI1dw4PaONTdLu kImK6TF0/h6T8XdR2oSEqaw6mcZ8Kjc45Wc46izTKWwENy70ifcaGPijgTp2r/xd4keI G37w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=WZO54G5j8ZEn6J/7fo2YDuk0csDixoEfH/txfZFZDj4=; b=o8HdyKZ8+Xsbg2wxuL9xdKv6S/+2WE/u8P3rOG9yY6pL2pB7P4e38JRSi3nxmhLTkM IsNrNDwCehz9bPNvvNSoA6VBGFQ9jneUl2C6yXOSQrou/kGNMSFyMVz0ECcORevpju0g rHI4x7h7QXYAEZkVBKUb05LH6ReqN4m7Rxlk1nPra4HoFcoNPAX+DXbDm+rD0C5e1YaV VDs0eVMdKU6A1+FMEJ5yf0qQiwAv4rKUZ3sI1H1aUagQpGXi85bPvuWsjRi03NgZ3JiT LauecLQ/3uWeGeihO9UCeeXFTLkBLZjU9Za1tF7gZOBUt5gGX/Atd3ckUAawIdBmAMwm hl0Q== X-Gm-Message-State: AJcUukcEkepoGKUMd+uaSDTv/8fTW4gPJ3LnjQKOld7lEC/zS0pR1IBI Eqat+OYIb3yMLopMPNX5iw2iVWt4 X-Google-Smtp-Source: ALg8bN7lq8ROn0phxjkxI7kOqSmB/11Hb+Tn3oByKbtKsuP0JMZ8Cd3YWpxynxL2jd1KS5jdtfJEqA== X-Received: by 2002:a1c:f319:: with SMTP id q25mr26704136wmq.151.1546522220955; Thu, 03 Jan 2019 05:30:20 -0800 (PST) Original-Received: from GONDOMAR.yourcompany.com (mail3.siscog.pt. [195.23.29.18]) by smtp.gmail.com with ESMTPSA id f137sm31855217wmg.29.2019.01.03.05.30.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Jan 2019 05:30:19 -0800 (PST) In-Reply-To: (Stefan Monnier's message of "Wed, 02 Jan 2019 22:22:59 -0500") X-Antivirus: AVG (VPS 190103-0, 03-01-2019), Outbound message X-Antivirus-Status: Clean X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32c X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:232134 Archived-At: Stefan Monnier writes: > FWIW, my minibuffer has 1 line and can't grow because it's in > a minibuffer-only frame. Kinky :) I don't think a rigid minibuffer is a great idea, but scratch the multi-line minibuffer approach, just add a C-h shortcut that displays some contextual help like `save-some-buffers'. Or add some hint to the beginning of the line, there's plenty of space. Here's two other ideas: 1. Isn't merge-base suitable for a toggle switch? Could sth like vc-git-prefer-merge-base be useful? Maybe I'd set that to t, and it shows nicely in a checkbox in the VC menu for discoverability. But I like the next idea better. 2. A diff is always a comparison of two revisions, right? For vc-dir, isn't a UI like query-replace's suitable here? You know, that thing where you type the pattern and the replacement interactively in the same minibuffer prompt, separated by the arrow. You can M-p, C-r, etc, flawlessly. I really like that UI, it's really intuitive (kudos to whoever participated, btw). =20=20=20=20 So here, instead of pattern and replacement, two revisions. All one would need, apparently, is to turn the arrow into a ".." and make it toggleable to "..." with say, C-M-y. I think it would simplify the completion problem: on both sides of the ".." or "..." you just complete a revision using whatever system we presumably already have in place for that. Jo=E3o