From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 01 19:12:35 2019 Received: (at submit) by debbugs.gnu.org; 2 Jan 2019 00:12:35 +0000 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 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 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 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.3.2 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 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 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) 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 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 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= 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 From: Juri Linkov To: bug-gnu-emacs@gnu.org Subject: 27.0.50; Merge-base alias for git vc-diff Organization: LINKOV.NET Date: Wed, 02 Jan 2019 02:11:17 +0200 Message-ID: <87r2dvapga.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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-Received-From: 23.83.209.93 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy] X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.1 (-----) --=-=-= 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) --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 01 19:27:58 2019 Received: (at control) by debbugs.gnu.org; 2 Jan 2019 00:27:58 +0000 Received: from localhost ([127.0.0.1]:44210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1geUO6-0002N4-2c for submit@debbugs.gnu.org; Tue, 01 Jan 2019 19:27:58 -0500 Received: from indri.birch.relay.mailchannels.net ([23.83.209.92]:49315) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1geUO4-0002Mv-8b for control@debbugs.gnu.org; Tue, 01 Jan 2019 19:27:56 -0500 X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id CA14C682B26 for ; Wed, 2 Jan 2019 00:27:54 +0000 (UTC) Received: from pdx1-sub0-mail-a69.g.dreamhost.com (unknown [100.96.29.126]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 8F06E6822C5 for ; Wed, 2 Jan 2019 00:27:54 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org 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:27:54 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Eyes-Skirt: 27a03bd22e075a9d_1546388874664_155622499 X-MC-Loop-Signature: 1546388874664:2378293405 X-MC-Ingress-Time: 1546388874663 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 3C86881F42 for ; Tue, 1 Jan 2019 16:27:54 -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; s=linkov.net; bh=0VWJc/TDALKAfCNq7TQ4SlQvsxk=; b= YR5tPVae9PmiwHJ+A8tdYLlQ3wCvqDaLoJaCoH9gLChhOXO3Q51N38z++fzZY0j/ dOrM+gZyAThnD17y2Jpck8KMqinmggmbH/wXIgJqBxg6QqCJf3xQkS1l14mWNoJS F4TvpPBhMGILryOZFcy1WemN4hqZncyu/P6AiyKPEG8= 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 1416081F3C for ; Tue, 1 Jan 2019 16:27:52 -0800 (PST) X-DH-BACKEND: pdx1-sub0-mail-a69 From: Juri Linkov To: control@debbugs.gnu.org Subject: Re: bug#33950: 27.0.50; Merge-base alias for git vc-diff Organization: LINKOV.NET References: <87r2dvapga.fsf@mail.linkov.net> Date: Wed, 02 Jan 2019 02:27:24 +0200 In-Reply-To: <87r2dvapga.fsf@mail.linkov.net> (Juri Linkov's message of "Wed, 02 Jan 2019 02:11:17 +0200") Message-ID: <87h8eraopf.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: 0 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtledrudehgddvvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucggtfgfnhhsuhgsshgtrhhisggvpdfftffgtefojffquffvnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufhofhffjgfkfgggtgesthdtredttdertdenucfhrhhomheplfhurhhiucfnihhnkhhovhcuoehjuhhriheslhhinhhkohhvrdhnvghtqeenucfkphepledurdduvdelrddutdekrdduleefnecurfgrrhgrmhepmhhouggvpehsmhhtphdphhgvlhhopehmrghilhdrjhhurhhtrgdrohhrghdpihhnvghtpeeluddruddvledruddtkedrudelfedprhgvthhurhhnqdhprghthheplfhurhhiucfnihhnkhhovhcuoehjuhhriheslhhinhhkohhvrdhnvghtqedpmhgrihhlfhhrohhmpehjuhhriheslhhinhhkohhvrdhnvghtpdhnrhgtphhtthhopegtohhnthhrohhlseguvggssghughhsrdhgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptd X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) severity 33950 wishlist tags 33950 patch quit From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 25 17:46:15 2019 Received: (at 33950-done) by debbugs.gnu.org; 25 Mar 2019 21:46:15 +0000 Received: from localhost ([127.0.0.1]:58752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h8XQ7-00031R-5W for submit@debbugs.gnu.org; Mon, 25 Mar 2019 17:46:15 -0400 Received: from eastern.maple.relay.mailchannels.net ([23.83.214.55]:48462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h8XQ5-00031I-9J for 33950-done@debbugs.gnu.org; Mon, 25 Mar 2019 17:46:14 -0400 X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 7E8B15C51DA for <33950-done@debbugs.gnu.org>; Mon, 25 Mar 2019 21:46:11 +0000 (UTC) Received: from pdx1-sub0-mail-a57.g.dreamhost.com (unknown [100.96.39.118]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 403DF5C51CF for <33950-done@debbugs.gnu.org>; Mon, 25 Mar 2019 21:46:11 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Received: from pdx1-sub0-mail-a57.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.17.2); Mon, 25 Mar 2019 21:46:11 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Shoe-Skirt: 2ad09c20381190ac_1553550371337_1600056957 X-MC-Loop-Signature: 1553550371337:4145375521 X-MC-Ingress-Time: 1553550371336 Received: from pdx1-sub0-mail-a57.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a57.g.dreamhost.com (Postfix) with ESMTP id 00D4680056 for <33950-done@debbugs.gnu.org>; Mon, 25 Mar 2019 14:46:11 -0700 (PDT) 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; s=linkov.net; bh=4uFkDOSmZKl1S0Rxi1iCoBvLcIo=; b= WCVXUt2cq7La7ELwI2swe7U2wavSe32ualhQ8q6UeLdJEChhagYKm9wE38EWMnTX 7lGjjO7eNNKs7SBQEuAjPZVmEmeoe+TOcN2BdFA2ScXBSnAL0qRBjRxfZKsBBdcG frihrEgb46+GjbBGMyBCTTubHL8Kg3fRjc5ARjV0hgA= Received: from mail.jurta.org (m91-129-108-250.cust.tele2.ee [91.129.108.250]) (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-a57.g.dreamhost.com (Postfix) with ESMTPSA id C876380052 for <33950-done@debbugs.gnu.org>; Mon, 25 Mar 2019 14:46:09 -0700 (PDT) X-DH-BACKEND: pdx1-sub0-mail-a57 From: Juri Linkov To: 33950-done@debbugs.gnu.org Subject: Re: bug#33950: 27.0.50; Merge-base alias for git vc-diff Organization: LINKOV.NET References: <87r2dvapga.fsf@mail.linkov.net> Date: Mon, 25 Mar 2019 23:45:42 +0200 In-Reply-To: <87r2dvapga.fsf@mail.linkov.net> (Juri Linkov's message of "Wed, 02 Jan 2019 02:11:17 +0200") Message-ID: <877ecmocft.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: 0 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedutddrjeekgdduheehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuggftfghnshhusghstghrihgsvgdpffftgfetoffjqffuvfenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuohhfffgjkfgfgggtsehttdertddtredtnecuhfhrohhmpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqnecuffhomhgrihhnpehgnhhurdhorhhgnecukfhppeeluddruddvledruddtkedrvdehtdenucfrrghrrghmpehmohguvgepshhmthhppdhhvghlohepmhgrihhlrdhjuhhrthgrrdhorhhgpdhinhgvthepledurdduvdelrddutdekrddvhedtpdhrvghtuhhrnhdqphgrthhhpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqpdhmrghilhhfrhhomhepjhhurhhisehlihhnkhhovhdrnhgvthdpnhhrtghpthhtohepfeefleehtddqughonhgvseguvggssghughhsrdhgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptd X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 33950-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > Following https://lists.gnu.org/archive/html/emacs-devel/2018-12/msg00446.html > here's the patch that implement this feature: Today a coworker asked me how she can view all changes on her branch so she could revert one of them. I showed her how easy is just to type 'C-x v M D' (vc-diff-mergebase) and enter two revisions: master and the name of her branch, that quickly solved her problem. So now I installed this feature that demonstrated its easy use. From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 01 19:29:24 2019 Received: (at 33950) by debbugs.gnu.org; 1 Apr 2019 23:29:24 +0000 Received: from localhost ([127.0.0.1]:40046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hB6Mj-0001EA-IC for submit@debbugs.gnu.org; Mon, 01 Apr 2019 19:29:24 -0400 Received: from mail-lj1-f178.google.com ([209.85.208.178]:40400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hB6Mi-0001Dw-4Z for 33950@debbugs.gnu.org; Mon, 01 Apr 2019 19:29:20 -0400 Received: by mail-lj1-f178.google.com with SMTP id q66so9810513ljq.7 for <33950@debbugs.gnu.org>; Mon, 01 Apr 2019 16:29:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=HPjjerbxvzoxWGblcL0FyapSTA9WJr1zSp74bBobAfw=; b=DXBYVe3ZLTwnxoHq2TBwssTfjfO3DsFVmsWECxVdmTkzob67xL8tPfLrE4wALZ522H q/q0qg3lbDWldGqe7FWNtM/9mftD5XXVOq2BKe0stUThvNRK26dUeeD3Go8uZqk57i5W yJLRUFUrNFBd3dG9RlMDLXivEK0PTI911rtWhuO0HMMY49q/UcGDylMCEmRY+9frAAjv JiQ2RXTOeDR3jd/NDhOVh4E2LJK02kXdYZPYdULYwtlayT5xRKVt2fRcooJvlbaOQXzE P9ouMHulTcXZC5weovmGL58f8HRzW4yAQ4TEZsmbML/cT3Fxen2poFhiNYJpzUMsdpr1 YCow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=HPjjerbxvzoxWGblcL0FyapSTA9WJr1zSp74bBobAfw=; b=TKchdNuBPLsvXXD71vGLASDzozrBif+HfM2GDQDxvoajdNvjmO0NdWdhlIq2hA+b8i 7XrAwekixGwaJ/rGY8FOghtLOySfmUknfzW2N5ljqeJY55lB2rQp/6LFb63rHP4xpyZD H2WH2tLK0HE3oOtMifHZAGllXNph44WjXGShULeY7j49kC6j0EBNjw/Op4Z9clXdQIaQ Z+KJ2Ye6dnGkhx1TLDa4gjXo6qdpuvykn/TjL+wQLarR3jVSk0dfj45pjEkarDLmIjPm TUmrbCIrJ0sXyOMo3EsJG+wYv9U4JZqA3LduI6GqVRbu7vAigsZGFXM/oljdmMXsOrps FReQ== X-Gm-Message-State: APjAAAUPl+eg4Vq6s0RdRkB4fQeThmbiE51rQOk9Aep5lqMsrppysnFk OrzsFW5qgJjsO+u3hZur5BU= X-Google-Smtp-Source: APXvYqyiVgzhoagTWFHJaZpC0OtJSwonUhHH254zeRqQUVGLwdvpkOHno16IZMuEb03z0dDvncvWbg== X-Received: by 2002:a2e:90c9:: with SMTP id o9mr38617091ljg.102.1554161354214; Mon, 01 Apr 2019 16:29:14 -0700 (PDT) Received: from [192.168.1.3] ([185.105.174.23]) by smtp.googlemail.com with ESMTPSA id o27sm2178782lfi.25.2019.04.01.16.29.12 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 16:29:13 -0700 (PDT) Subject: Re: bug#33950: 27.0.50; Merge-base alias for git vc-diff To: 33950@debbugs.gnu.org, juri@linkov.net References: <87r2dvapga.fsf@mail.linkov.net> <877ecmocft.fsf@mail.linkov.net> From: Dmitry Gutov Message-ID: Date: Tue, 2 Apr 2019 02:29:11 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:66.0) Gecko/20100101 Thunderbird/66.0 MIME-Version: 1.0 In-Reply-To: <877ecmocft.fsf@mail.linkov.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 33950 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On 25.03.2019 23:45, Juri Linkov wrote: >> Following https://lists.gnu.org/archive/html/emacs-devel/2018-12/msg00446.html >> here's the patch that implement this feature: > > Today a coworker asked me how she can view all changes on her branch > so she could revert one of them. I showed her how easy is just to > type 'C-x v M D' (vc-diff-mergebase) and enter two revisions: master > and the name of her branch, that quickly solved her problem. > > So now I installed this feature that demonstrated its easy use. Thank you, and good job! From unknown Mon Aug 18 21:20:28 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 30 Apr 2019 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator