From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: Merge-base alias for git vc-diff Date: Sat, 29 Dec 2018 23:39:33 +0200 Organization: LINKOV.NET Message-ID: <87va3c5dhm.fsf@mail.linkov.net> References: <87bm58ornb.fsf@mail.linkov.net> <92f058a4-ef98-725b-9603-5a671113dfaa@yandex.ru> <87lg4aak10.fsf@mail.linkov.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1546123997 29535 195.159.176.226 (29 Dec 2018 22:53:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 29 Dec 2018 22:53:17 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 29 23:53:13 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdNTl-0007ao-GN for ged-emacs-devel@m.gmane.org; Sat, 29 Dec 2018 23:53:13 +0100 Original-Received: from localhost ([127.0.0.1]:42003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdNVs-0008WN-6B for ged-emacs-devel@m.gmane.org; Sat, 29 Dec 2018 17:55:24 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:60038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdNQX-0002iM-Pm for emacs-devel@gnu.org; Sat, 29 Dec 2018 17:49:58 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gdN7h-00016s-60 for emacs-devel@gnu.org; Sat, 29 Dec 2018 17:31:06 -0500 Original-Received: from catfish.maple.relay.mailchannels.net ([23.83.214.32]:49871) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gdN7c-0000yg-SN for emacs-devel@gnu.org; Sat, 29 Dec 2018 17:30:22 -0500 X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 10D3E5E3506; Sat, 29 Dec 2018 22:30:19 +0000 (UTC) Original-Received: from pdx1-sub0-mail-a25.g.dreamhost.com (unknown [100.96.29.126]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 002F25E3439; Sat, 29 Dec 2018 22:30:08 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from pdx1-sub0-mail-a25.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.16.2); Sat, 29 Dec 2018 22:30:18 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Name-Shrill: 0e6c825502912162_1546122609109_3932502749 X-MC-Loop-Signature: 1546122609109:4095127471 X-MC-Ingress-Time: 1546122609108 Original-Received: from pdx1-sub0-mail-a25.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a25.g.dreamhost.com (Postfix) with ESMTP id 45704819BA; Sat, 29 Dec 2018 14:30:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=linkov.net; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=linkov.net; bh=wu6GwsqzdcY1CdmfdWpf4uqQ/Xk=; b= hg9VOF313mU/Q6jyMVrO4azo3dTGi31YgBJcCs8PgunOM0baggil7GtsosjiblGa Q3J+OPma1ChpKSncEZPDkm5WNpnmydOYwtZVj4a/g4DOVkwO7Hc/SOo97pSCNFWC hZu2m7WvRYn4y+2JHhDrwyOc2kkM9tB3GapPJPIpgbk= Original-Received: from mail.jurta.org (m91-129-108-193.cust.tele2.ee [91.129.108.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: jurta@jurta.org) by pdx1-sub0-mail-a25.g.dreamhost.com (Postfix) with ESMTPSA id 7FE49819B9; Sat, 29 Dec 2018 14:30:04 -0800 (PST) X-DH-BACKEND: pdx1-sub0-mail-a25 In-Reply-To: (Stefan Monnier's message of "Fri, 28 Dec 2018 12:53:28 -0500") X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: -100 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtledrtdekgdduieefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuggftfghnshhusghstghrihgsvgdpffftgfetoffjqffuvfenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufhofhffjgfkfgggtgesthdtredttdertdenucfhrhhomheplfhurhhiucfnihhnkhhovhcuoehjuhhriheslhhinhhkohhvrdhnvghtqeenucfkphepledurdduvdelrddutdekrdduleefnecurfgrrhgrmhepmhhouggvpehsmhhtphdphhgvlhhopehmrghilhdrjhhurhhtrgdrohhrghdpihhnvghtpeeluddruddvledruddtkedrudelfedprhgvthhurhhnqdhprghthheplfhurhhiucfnihhnkhhovhcuoehjuhhriheslhhinhhkohhvrdhnvghtqedpmhgrihhlfhhrohhmpehjuhhriheslhhinhhkohhvrdhnvghtpdhnrhgtphhtthhopehmohhnnhhivghrsehirhhordhumhhonhhtrhgvrghlrdgtrgenucevlhhushhtvghrufhiiigvpedv X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 23.83.214.32 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:232040 Archived-At: >> This is another problem, then we need to add the prefix MERGE-BASE >> to all branches listed in the completions: MERGE-BASE:master, >> MERGE-BASE:branch-a, MERGE-BASE:branch-b, ... Too bad. > > Maybe we should allow the "old revision" to be of the form "..." > and/or the "new revision" to be of the form "...". This is the most natural representation, but the only problem is its discoverability - the users have to learn this syntax. OTOH, after typing TAB TAB we can show the virtual revision name MERGE-BASE in the list of completions, but its drawback is that after selecting MERGE-BASE we have to show another minibuffer asking for the branch name where to look for the common ancestor. Or we could support both ways.