From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#62940: 29.0.60; vc: no easy way to get diff of all outgoing changes Date: Wed, 16 Aug 2023 10:48:18 +0300 Organization: LINKOV.NET Message-ID: <86il9fbf7h.fsf@mail.linkov.net> References: <640746f7-fa1c-dfb9-aaab-f9d8effdf64f@gutov.dev> <86y1mo5pur.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="21394"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: Dmitry Gutov , 62940@debbugs.gnu.org, Filipp Gunbin To: Spencer Baugh Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Aug 16 09:53:21 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qWBLE-0005Jc-3A for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 16 Aug 2023 09:53:20 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWBKz-0003B5-7q; Wed, 16 Aug 2023 03:53:05 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qWBKx-0003AQ-0v for bug-gnu-emacs@gnu.org; Wed, 16 Aug 2023 03:53:03 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qWBKw-0006AV-O8 for bug-gnu-emacs@gnu.org; Wed, 16 Aug 2023 03:53:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWBKw-0003YP-8x for bug-gnu-emacs@gnu.org; Wed, 16 Aug 2023 03:53:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 16 Aug 2023 07:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62940 X-GNU-PR-Package: emacs Original-Received: via spool by 62940-submit@debbugs.gnu.org id=B62940.169217236813639 (code B ref 62940); Wed, 16 Aug 2023 07:53:02 +0000 Original-Received: (at 62940) by debbugs.gnu.org; 16 Aug 2023 07:52:48 +0000 Original-Received: from localhost ([127.0.0.1]:38746 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWBKi-0003Xu-7E for submit@debbugs.gnu.org; Wed, 16 Aug 2023 03:52:48 -0400 Original-Received: from relay9-d.mail.gandi.net ([217.70.183.199]:53289) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWBKe-0003Xe-A9 for 62940@debbugs.gnu.org; Wed, 16 Aug 2023 03:52:46 -0400 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id 3D6BCFF808; Wed, 16 Aug 2023 07:52:35 +0000 (UTC) In-Reply-To: (Spencer Baugh's message of "Mon, 14 Aug 2023 15:42:31 -0400") X-GND-Sasl: juri@linkov.net X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:267556 Archived-At: >>> C-x v O C-x h = >>> >>> Which would be D. in the original message. It doesn't support uncommitted >>> changes, but I would be surprised if it did. >> >> It's supported only for vc that inserts a text header in logs like RCS. >> I proposed to insert extra line that represents uncommitted git changes, >> and I'm using this feature all the time. > > Is your patch for this available somewhere? I find myself wanting the > same thing for hg. Searching the right version in the archives would take much time, so it's easier just to send the version that I use every day. Here it is, just 3 new lines: diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index a7763360795..37dc619da5e 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1419,6 +1419,9 @@ vc-git-print-log ;; read-only. (let ((inhibit-read-only t)) (with-current-buffer buffer + (when (memq vc-log-view-type '(long short)) + (insert (propertize "(Type 'd' here to show diffs with working version)\n" + 'font-lock-face 'shadow))) (apply #'vc-git-command buffer 'async files (append >> But the problem is that it's inserted even when 'C-x v b l' lists >> another branch where such line makes no sense. > > Maybe we could only insert this line if there are actually uncommitted > changes? Good idea. Also this line should not be shown in the output of 'vc-print-branch-log'. PS: Sorry that answering your other requests about the project features will take a little more time.