From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#33950: 27.0.50; Merge-base alias for git vc-diff Date: Wed, 02 Jan 2019 02:11:17 +0200 Organization: LINKOV.NET Message-ID: <87r2dvapga.fsf@mail.linkov.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1546387869 7236 195.159.176.226 (2 Jan 2019 00:11:09 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 2 Jan 2019 00:11:09 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) To: 33950@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jan 02 01:11:05 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1geU7k-0001mu-Hb for geb-bug-gnu-emacs@m.gmane.org; Wed, 02 Jan 2019 01:11:04 +0100 Original-Received: from localhost ([127.0.0.1]:40940 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1geU9r-0002Uh-6F for geb-bug-gnu-emacs@m.gmane.org; Tue, 01 Jan 2019 19:13:15 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:35570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1geU9h-0002Rx-Pt for bug-gnu-emacs@gnu.org; Tue, 01 Jan 2019 19:13:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1geU9e-0008Qk-Km for bug-gnu-emacs@gnu.org; Tue, 01 Jan 2019 19:13:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:58787) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1geU9e-0008Qg-H1 for bug-gnu-emacs@gnu.org; Tue, 01 Jan 2019 19:13:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1geU9e-0001zs-BE for bug-gnu-emacs@gnu.org; Tue, 01 Jan 2019 19:13:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 02 Jan 2019 00:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33950 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.15463879557636 (code B ref -1); Wed, 02 Jan 2019 00:13:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 2 Jan 2019 00:12:35 +0000 Original-Received: from localhost ([127.0.0.1]:44207 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1geU9D-0001z6-GN for submit@debbugs.gnu.org; Tue, 01 Jan 2019 19:12:35 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:52253) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1geU9A-0001yy-W4 for submit@debbugs.gnu.org; Tue, 01 Jan 2019 19:12:33 -0500 Original-Received: from listsout.gnu.org ([209.51.188.17]:41875) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1geU9A-0007iM-JE for submit@debbugs.gnu.org; Tue, 01 Jan 2019 19:12:32 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:35494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1geU99-0001qE-40 for bug-gnu-emacs@gnu.org; Tue, 01 Jan 2019 19:12:32 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1geU95-0007fz-Ru for bug-gnu-emacs@gnu.org; Tue, 01 Jan 2019 19:12:31 -0500 Original-Received: from insect.birch.relay.mailchannels.net ([23.83.209.93]:59502) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1geU92-0007Ml-2o for bug-gnu-emacs@gnu.org; Tue, 01 Jan 2019 19:12:26 -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 EC10B124020 for ; Wed, 2 Jan 2019 00:12:17 +0000 (UTC) Original-Received: from pdx1-sub0-mail-a69.g.dreamhost.com (unknown [100.96.19.74]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id AA4BE121015 for ; Wed, 2 Jan 2019 00:12:17 +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:12:17 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Inform-Stretch: 5d0657df407e3994_1546387937786_3849144768 X-MC-Loop-Signature: 1546387937786:182613255 X-MC-Ingress-Time: 1546387937785 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 6D55F81F3D for ; Tue, 1 Jan 2019 16:12:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=linkov.net; h=from:to :subject:date:message-id:mime-version:content-type; s= linkov.net; bh=+TsDB2dqffIp6xnRuNgKRiSMcsE=; b=xycWzZxflsJy/NCQ9 9lWVmjR9UatC9MlSHEfl5ez4mDmIWiEysB+Zd2381/gjSJW/Mi6+suoIOtCTUMQh wm2TmL19EY5cnaVKivEl09su5kLmNM7N+hjlG2PisEK10NEcBYY7jZG3OPpthOYf oM+sQinasKN9MN0feBLkUa4BbM= 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 5D2F081F38 for ; Tue, 1 Jan 2019 16:12:15 -0800 (PST) X-DH-BACKEND: pdx1-sub0-mail-a69 X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: 0 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtledrudehgddulecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucggtfgfnhhsuhgsshgtrhhisggvpdfftffgtefojffquffvnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufhofffkfgggtgesmhdtreertdertdenucfhrhhomheplfhurhhiucfnihhnkhhovhcuoehjuhhriheslhhinhhkohhvrdhnvghtqeenucffohhmrghinhepghhnuhdrohhrghenucfkphepledurdduvdelrddutdekrdduleefnecurfgrrhgrmhepmhhouggvpehsmhhtphdphhgvlhhopehmrghilhdrjhhurhhtrgdrohhrghdpihhnvghtpeeluddruddvledruddtkedrudelfedprhgvthhurhhnqdhprghthheplfhurhhiucfnihhnkhhovhcuoehjuhhriheslhhinhhkohhvrdhnvghtqedpmhgrihhlfhhrohhmpehjuhhriheslhhinhhkohhvrdhnvghtpdhnrhgtphhtthhopegsuhhgqdhgnhhuqdgvmhgrtghssehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:154076 Archived-At: --=-=-= Content-Type: text/plain Following https://lists.gnu.org/archive/html/emacs-devel/2018-12/msg00446.html here's the patch that implement this feature: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=vc-mergebase.patch diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 84e11f2e01..f32e536981 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -890,6 +890,8 @@ vc-prefix-map (define-key map "L" 'vc-print-root-log) (define-key map "I" 'vc-log-incoming) (define-key map "O" 'vc-log-outgoing) + (define-key map "ML" 'vc-log-mergebase) + (define-key map "MD" 'vc-diff-mergebase) (define-key map "m" 'vc-merge) (define-key map "r" 'vc-retrieve-tag) (define-key map "s" 'vc-create-tag) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 48b7c98dfa..ccd03c4427 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -429,6 +429,10 @@ ;; - region-history-mode () ;; ;; Major mode to use for the output of `region-history'. +;; +;; - mergebase (rev1 &optional rev2) +;; +;; Return the common ancestor between REV1 and REV2 revisions. ;; TAG SYSTEM ;; @@ -1849,6 +1853,30 @@ vc-root-version-diff t (list backend (list rootdir)) rev1 rev2 (called-interactively-p 'interactive))))) + +;;;###autoload +(defun vc-diff-mergebase (_files rev1 rev2) + "Report diffs between the merge base of REV1 and REV2 revisions. +The merge base is a common ancestor between REV1 and REV2 revisions." + (interactive (vc-diff-build-argument-list-internal)) + (when (and (not rev1) rev2) + (error "Not a valid revision range")) + (let ((backend (vc-deduce-backend)) + (default-directory default-directory) + rootdir) + (if backend + (setq rootdir (vc-call-backend backend 'root default-directory)) + (setq rootdir (read-directory-name "Directory for VC root-diff: ")) + (setq backend (vc-responsible-backend rootdir)) + (if backend + (setq default-directory rootdir) + (error "Directory is not version controlled"))) + (let ((default-directory rootdir) + (rev1 (vc-call-backend backend 'mergebase rev1 rev2))) + (vc-diff-internal + t (list backend (list rootdir)) rev1 rev2 + (called-interactively-p 'interactive))))) + ;;;###autoload (defun vc-diff (&optional historic not-urgent) "Display diffs between file revisions. @@ -2491,6 +2519,25 @@ vc-log-outgoing (vc-incoming-outgoing-internal backend (or remote-location "") "*vc-outgoing*" 'log-outgoing))) +;;;###autoload +(defun vc-log-mergebase (_files rev1 rev2) + "Show a log of changes between the merge base of REV1 and REV2 revisions. +The merge base is a common ancestor between REV1 and REV2 revisions." + (interactive (vc-diff-build-argument-list-internal)) + (let ((backend (vc-deduce-backend)) + (default-directory default-directory) + rootdir) + (if backend + (setq rootdir (vc-call-backend backend 'root default-directory)) + (setq rootdir (read-directory-name "Directory for VC root-log: ")) + (setq backend (vc-responsible-backend rootdir)) + (unless backend + (error "Directory is not version controlled"))) + (setq default-directory rootdir) + (unless rev2 (setq rev2 "HEAD")) + (setq rev1 (vc-call-backend backend 'mergebase rev1 rev2)) + (vc-print-log-internal backend (list rootdir) rev1 t rev2))) + ;;;###autoload (defun vc-region-history (from to) "Show the history of the region between FROM and TO. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index aa6809f626..82ff2b58e7 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1045,8 +1045,12 @@ vc-git-print-log ,(format "--pretty=tformat:%s" (car vc-git-root-log-format)) "--abbrev-commit")) - (when limit (list "-n" (format "%s" limit))) - (when start-revision (list start-revision)) + (when (numberp limit) + (list "-n" (format "%s" limit))) + (when start-revision + (if (and limit (not (numberp limit))) + (list (concat start-revision ".." limit)) + (list start-revision))) '("--"))))))) (defun vc-git-log-outgoing (buffer remote-location) @@ -1077,6 +1081,12 @@ vc-git-log-incoming "@{upstream}" remote-location)))) +(eval-when-compile (require 'subr-x)) ; for string-trim-right + +(defun vc-git-mergebase (rev1 &optional rev2) + (unless rev2 (setq rev2 "HEAD")) + (string-trim-right (vc-git--run-command-string nil "merge-base" rev1 rev2))) + (defvar log-view-message-re) (defvar log-view-file-re) (defvar log-view-font-lock-keywords) --=-=-=--