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 02:14:49 +0200 Organization: LINKOV.NET Message-ID: <87o98zapae.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; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1546388051 18740 195.159.176.226 (2 Jan 2019 00:14:11 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 2 Jan 2019 00:14:11 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 02 01:14:07 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 1geUAg-0004lK-M7 for ged-emacs-devel@m.gmane.org; Wed, 02 Jan 2019 01:14:07 +0100 Original-Received: from localhost ([127.0.0.1]:40950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1geUCn-0003Em-KZ for ged-emacs-devel@m.gmane.org; Tue, 01 Jan 2019 19:16:17 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:36218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1geUCi-0003Eh-DL for emacs-devel@gnu.org; Tue, 01 Jan 2019 19:16:13 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1geUCe-0002cA-UR for emacs-devel@gnu.org; Tue, 01 Jan 2019 19:16:12 -0500 Original-Received: from common.maple.relay.mailchannels.net ([23.83.214.38]:51570) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1geUCe-0002aV-LI for emacs-devel@gnu.org; Tue, 01 Jan 2019 19:16:08 -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 CA82A5C3DBF for ; Wed, 2 Jan 2019 00:16:05 +0000 (UTC) Original-Received: from pdx1-sub0-mail-a69.g.dreamhost.com (unknown [100.96.33.121]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 8192F5C2EAC for ; Wed, 2 Jan 2019 00:16:05 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from pdx1-sub0-mail-a69.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 00:16:05 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Daffy-Continue: 36be706e15b59f9c_1546388165648_2791578426 X-MC-Loop-Signature: 1546388165648:289773570 X-MC-Ingress-Time: 1546388165648 Original-Received: from pdx1-sub0-mail-a69.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a69.g.dreamhost.com (Postfix) with ESMTP id 37DD581F3C for ; Tue, 1 Jan 2019 16:16:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=linkov.net; h=from:to :subject:references:date:in-reply-to:message-id:mime-version :content-type:content-transfer-encoding; s=linkov.net; bh=7vaYWA VcYBdDWyNQmzx+usH66Ko=; b=tG+KQIKVl0IprdrVWDSCeq+Ff5yo+gT0APY/bA Qaap/CrCneKVNFOHOgjAZ/2+d68xQYsNo7FpOY7FosCr7EIacWa3Euy146T1wwes GOvq+TUMBrkNUAMp5XP8qVJ5E9sQVJw6M5AemVg/90z9/3auBJQT/A+EsqPL+8bv zN31M= 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-a69.g.dreamhost.com (Postfix) with ESMTPSA id 2214B81F33 for ; Tue, 1 Jan 2019 16:16:03 -0800 (PST) X-DH-BACKEND: pdx1-sub0-mail-a69 In-Reply-To: <87lg4aak10.fsf@mail.linkov.net> (Juri Linkov's message of "Thu, 27 Dec 2018 22:02:35 +0200") X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: 0 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtledrudehgddvtdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucggtfgfnhhsuhgsshgtrhhisggvpdfftffgtefojffquffvnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufhofhffjgfkfgggtgfgsehtkeertddtreejnecuhfhrohhmpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqnecukfhppeeluddruddvledruddtkedrudelfeenucfrrghrrghmpehmohguvgepshhmthhppdhhvghlohepmhgrihhlrdhjuhhrthgrrdhorhhgpdhinhgvthepledurdduvdelrddutdekrdduleefpdhrvghtuhhrnhdqphgrthhhpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqpdhmrghilhhfrhhomhepjhhurhhisehlihhnkhhovhdrnhgvthdpnhhrtghpthhtohepvghmrggtshdquggvvhgvlhesghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpedt X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 23.83.214.38 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:232071 Archived-At: >> And also add a new command that would use it, similar to >> vc-root-version-diff (or a new meaning to some value of the prefix >> argument). > > Adding a new command like =E2=80=98vc-merge-base-diff=E2=80=99 is easy,= but first > I'd like to try to extend the existing command because it is bound > to a short key sequence: =E2=80=98C-u C-x v D=E2=80=99 then type =E2=80= =98TAB=E2=80=99 for completion > and select e.g. =E2=80=98MERGE-BASE=E2=80=99. 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 same = output as GitLab shows in the =E2=80=9CCommits=E2=80=9D tab of the merge request. * vc-diff-mergebase (bound to =E2=80=98C-x v M D=E2=80=99) shows the same= output as GitLab shows in the =E2=80=9CChanges=E2=80=9D tab of the merge request.