From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#55039: [PATCH] Use VC-relative file names in ChangeLog entries Date: Tue, 06 Sep 2022 20:10:41 +0000 Message-ID: <87fsh4e01q.fsf@posteo.net> References: <8735i7zvk4.fsf@posteo.net> <83v8v3sq0n.fsf@gnu.org> <87czc8u56q.fsf@gnus.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35634"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , 55039@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Sep 06 22:11:13 2022 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 1oVeud-00095u-UF for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 06 Sep 2022 22:11:12 +0200 Original-Received: from localhost ([::1]:54842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVeud-00061G-0Z for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 06 Sep 2022 16:11:11 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVeuU-00060n-RQ for bug-gnu-emacs@gnu.org; Tue, 06 Sep 2022 16:11:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:35849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oVeuU-0003kX-Il for bug-gnu-emacs@gnu.org; Tue, 06 Sep 2022 16:11:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oVeuU-0000Eb-9D for bug-gnu-emacs@gnu.org; Tue, 06 Sep 2022 16:11:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 06 Sep 2022 20:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55039 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo patch Original-Received: via spool by 55039-submit@debbugs.gnu.org id=B55039.1662495054882 (code B ref 55039); Tue, 06 Sep 2022 20:11:02 +0000 Original-Received: (at 55039) by debbugs.gnu.org; 6 Sep 2022 20:10:54 +0000 Original-Received: from localhost ([127.0.0.1]:52781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVeuM-0000E9-3r for submit@debbugs.gnu.org; Tue, 06 Sep 2022 16:10:54 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:52565) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVeuH-0000Dp-Hu for 55039@debbugs.gnu.org; Tue, 06 Sep 2022 16:10:52 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id B6B6E240101 for <55039@debbugs.gnu.org>; Tue, 6 Sep 2022 22:10:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1662495043; bh=F2xiGWErMZ2+mYLeWvrndeXUCYd02yiLPizMpW9xqGI=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=b56GysutQWblkUM/iqHtJYnzKaWxw+p1YlAb5pDYEnOGSWLhZvOcDJh/vO5WTrz+y k/pZBmNZN7dtdGgBJc3LL4O6fSbizsj4N7htXRliL3wCE7QsFQ5278E5t4x/LnnfQZ UaSmibaeyrECUc5QxjqnrrGivhECcIdQ7WCtMQavRknLUumvahKvVISfE8yPVARtQW NbFLheMvq3lHAjaiwWuRvaLziivOiBtsX8pAc03q5yxHMUAGxXLbvJb9uJGTzpRLLR bECgXuNaQUh64O1sl440yx/8znYprGKdwR8+XcFeNZdF0mU1qvZ4lH0+U8y3fgfS8t Y3h7N6sokIvbQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MMc2V6821z9rxV; Tue, 6 Sep 2022 22:10:42 +0200 (CEST) In-Reply-To: <87czc8u56q.fsf@gnus.org> (Lars Ingebrigtsen's message of "Tue, 06 Sep 2022 13:13:01 +0200") Autocrypt: addr=philipk@posteo.net; prefer-encrypt=nopreference; keydata= mDMEYHHqUhYJKwYBBAHaRw8BAQdAp3GdmYJ6tm5McweY6dEvIYIiry+Oz9rU4MH6NHWK0Ee0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiQBBMWCAA4FiEEDM2H44ZoPt9Ms0eHtVrAHPRh1FwFAmBx6lICGwMFCwkIBwIGFQoJ CAsCBBYCAwECHgECF4AACgkQtVrAHPRh1FyTkgEAjlbGPxFchvMbxzAES3r8QLuZgCxeAXunM9gh io0ePtUBALVhh9G6wIoZhl0gUCbQpoN/UJHI08Gm1qDob5zDxnIHuDgEYHHqUhIKKwYBBAGXVQEF AQEHQNcRB+MUimTMqoxxMMUERpOR+Q4b1KgncDZkhrO2ql1tAwEIB4h4BBgWCAAgFiEEDM2H44Zo Pt9Ms0eHtVrAHPRh1FwFAmBx6lICGwwACgkQtVrAHPRh1Fw1JwD/Qo7kvtib8jy7puyWrSv0MeTS g8qIxgoRWJE/KKdkCLEA/jb9b9/g8nnX+UcwHf/4VfKsjExlnND3FrBviXUW6NcB 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" Xref: news.gmane.io gmane.emacs.bugs:241700 Archived-At: --=-=-= Content-Type: text/plain Here is an updated patch: --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Add-new-user-option-diff-add-log-relative-names.patch >From f8e4b14198e8a9ccd5e4cbdbe044eb468697c2b8 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Tue, 6 Sep 2022 22:06:29 +0200 Subject: [PATCH] Add new user option 'diff-add-log-relative-names' * .dir-locals.el: Set 'diff-add-log-relative-names' to t * doc/emacs/maintaining.texi (Log Buffer): Mention 'diff-add-log-relative-names' * etc/NEWS: Mention 'diff-add-log-relative-names' * lisp/vc/diff-mode.el (diff-add-log-relative-names): Add new option. (diff-add-log-current-defuns): Use new option. --- .dir-locals.el | 3 ++- doc/emacs/maintaining.texi | 5 ++++- etc/NEWS | 5 +++++ lisp/vc/diff-mode.el | 17 +++++++++++++++-- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index 7812beb001..3312021920 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -5,7 +5,8 @@ (sentence-end-double-space . t) (fill-column . 70) (emacs-lisp-docstring-fill-column . 65) - (bug-reference-url-format . "https://debbugs.gnu.org/%s"))) + (bug-reference-url-format . "https://debbugs.gnu.org/%s") + (diff-add-log-relative-names . t))) (c-mode . ((c-file-style . "GNU") (c-noise-macro-names . ("INLINE" "ATTRIBUTE_NO_SANITIZE_UNDEFINED" "UNINIT" "CALLBACK" "ALIGN_STACK")) (electric-quote-comment . nil) diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 60169d8d8c..0f1dc18f1a 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -694,7 +694,10 @@ Log Buffer (@code{log-edit-generate-changelog-from-diff}), to generate skeleton ChangeLog entries, listing all changed file and function names based on the diff of the VC fileset. Consecutive entries left empty will be -combined by @kbd{C-q} (@code{fill-paragraph}). +combined by @kbd{C-q} (@code{fill-paragraph}). By default the +inserted file names will just be the files without a path. If +@code{diff-add-log-relative-names} is non-nil, a partial path relative +to the VC root directory will be inserted instead. @kindex C-c C-a @r{(Log Edit mode)} @findex log-edit-insert-changelog diff --git a/etc/NEWS b/etc/NEWS index 1317cd0128..0547796b6c 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1288,6 +1288,11 @@ Sets the value of the buffer-local variable 'whitespace-style' in 'diff-mode' buffers. By default, this variable is '(face trailing)', which preserves behavior from previous Emacs versions. ++++ +*** New user option 'diff-relative-names-in-changelog'. +If non-nil insert file names in ChangeLog skeletons relative to the +VC root directory. + ** Ispell --- diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 6b30de3cb3..7cafb43334 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -2336,10 +2336,18 @@ diff-undo (let ((inhibit-read-only t)) (undo arg))) +(defcustom diff-add-log-relative-names nil + "Use relative file names when generating ChangeLog messages." + :type 'boolean + :safe #'booleanp + :version "29.1") + (defun diff-add-log-current-defuns () "Return an alist of defun names for the current diff. The elements of the alist are of the form (FILE . (DEFUN...)), -where DEFUN... is a list of function names found in FILE." +where DEFUN... is a list of function names found in FILE. If +`diff-add-log-relative-names' is non-nil, insert file names +relative to the VC root directory." (save-excursion (goto-char (point-min)) (let* ((defuns nil) @@ -2373,7 +2381,12 @@ diff-add-log-current-defuns ;; hunks (e.g., "diff --git ..." etc). (re-search-forward diff-hunk-header-re nil t) (setq hunk-end (save-excursion (diff-end-of-hunk))) - (pcase-let* ((filename (substring-no-properties (diff-find-file-name))) + (pcase-let* ((filename (substring-no-properties + (if diff-add-log-relative-names + (file-relative-name + (diff-find-file-name) + (vc-root-dir)) + (diff-find-file-name)))) (=lines 0) (+lines 0) (-lines 0) -- 2.30.2 --=-=-=--