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: Wed, 02 Jan 2019 23:29:46 +0200 Organization: LINKOV.NET Message-ID: <87ef9u951h.fsf@mail.linkov.net> References: <87bm58ornb.fsf@mail.linkov.net> <92f058a4-ef98-725b-9603-5a671113dfaa@yandex.ru> <87lg4aak10.fsf@mail.linkov.net> <87o98zapae.fsf@mail.linkov.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1546467928 6548 195.159.176.226 (2 Jan 2019 22:25:28 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 2 Jan 2019 22:25:28 +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 Wed Jan 02 23:25:23 2019 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 1geox1-0001bk-BX for ged-emacs-devel@m.gmane.org; Wed, 02 Jan 2019 23:25:23 +0100 Original-Received: from localhost ([127.0.0.1]:47717 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1geoz8-0000ua-5W for ged-emacs-devel@m.gmane.org; Wed, 02 Jan 2019 17:27:34 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:54435) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1geoxr-0000uO-QB for emacs-devel@gnu.org; Wed, 02 Jan 2019 17:26:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1geoxn-0001mo-JC for emacs-devel@gnu.org; Wed, 02 Jan 2019 17:26:15 -0500 Original-Received: from lavender.maple.relay.mailchannels.net ([23.83.214.99]:64969) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1geoxg-0001HU-T3 for emacs-devel@gnu.org; Wed, 02 Jan 2019 17:26:06 -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 853EB283E91; Wed, 2 Jan 2019 22:25:58 +0000 (UTC) Original-Received: from pdx1-sub0-mail-a23.g.dreamhost.com (unknown [100.96.20.98]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 40DC2283E73; Wed, 2 Jan 2019 22:25:58 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from pdx1-sub0-mail-a23.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); Wed, 02 Jan 2019 22:25:58 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Spill-Relation: 19840c27058c9a4f_1546467958391_2362615777 X-MC-Loop-Signature: 1546467958391:1957861288 X-MC-Ingress-Time: 1546467958390 Original-Received: from pdx1-sub0-mail-a23.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a23.g.dreamhost.com (Postfix) with ESMTP id D4D5A80045; Wed, 2 Jan 2019 14:25:57 -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:content-transfer-encoding; s=linkov.net; bh=OowEQy 1RFZPi673DCPfGczUpSLM=; b=zcThebDaV+oSe1ZHmZWQOu6w9YVMB8x9dI16R9 N2RIf9loRHpTX6mpYvLthdcS3bJEfitNQwwYF5xrKd1MqY/jzOC/ktqAUfjKRr5r /zErej1q/PvY0DVnxqjDWO7CsaupKsDotq4nXafEqQndkKHHbH62tejETuIcvN9X z7YDk= Original-Received: from mail.jurta.org (m91-129-100-233.cust.tele2.ee [91.129.100.233]) (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-a23.g.dreamhost.com (Postfix) with ESMTPSA id 083508003E; Wed, 2 Jan 2019 14:25:53 -0800 (PST) X-DH-BACKEND: pdx1-sub0-mail-a23 In-Reply-To: (Stefan Monnier's message of "Tue, 01 Jan 2019 20:55:34 -0500") X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: -100 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtledrudeigdduheehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuggftfghnshhusghstghrihgsvgdpffftgfetoffjqffuvfenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufhofhffjgfkfgggtgfgsehtkeertddtreejnecuhfhrohhmpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqnecukfhppeeluddruddvledruddttddrvdeffeenucfrrghrrghmpehmohguvgepshhmthhppdhhvghlohepmhgrihhlrdhjuhhrthgrrdhorhhgpdhinhgvthepledurdduvdelrddutddtrddvfeefpdhrvghtuhhrnhdqphgrthhhpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqpdhmrghilhhfrhhomhepjhhurhhisehlihhnkhhovhdrnhgvthdpnhhrtghpthhtohepmhhonhhnihgvrhesihhrohdruhhmohhnthhrvggrlhdrtggrnecuvehluhhsthgvrhfuihiivgeptd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 23.83.214.99 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:232112 Archived-At: >> Since there is no good solution to reuse the existing command, >> bug#33950 implements two new commands: >> >> * vc-log-mergebase (bound to =E2=80=98C-x v M L=E2=80=99) shows the sa= me output as >> GitLab shows in the =E2=80=9CCommits=E2=80=9D tab of the merge reque= st. >> >> * vc-diff-mergebase (bound to =E2=80=98C-x v M D=E2=80=99) shows the s= ame output as >> GitLab shows in the =E2=80=9CChanges=E2=80=9D tab of the merge reque= st. > > I must say I find this solution very unsatisfactory. The reason I proposed separate commands is because I can't find a good solution how to combine this with the existing commands. Unsolved problems: 1. I don't know how to change the *Completions* buffer header from =E2=80=9CPossible completions are:=E2=80=9D to =E2=80=9CPossible completions are (... means diff with common anc= estor):=E2=80=9D 2. How to support inserting a completion from the *Completions* buffer into the minibuffer but not exiting the minibuffer after choose-comple= tion. Then after selecting a completion the user could add =E2=80=9C...=E2=80= =9D to the end. 3. =E2=80=98C-u C-x v L=E2=80=99 asks for the limit only. Maybe adding a= new prefix arg =E2=80=98C-u C-u C-x v L=E2=80=99 could ask for two revisions: start r= ev and end rev. Then =E2=80=98C-u C-u C-x v D=E2=80=99 could also interpret its double pr= efix arg as diff with the common ancestor.