GNU logs - #64055, boring messages

Message sent to bug-gnu-emacs@HIDDEN:

Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Morgan Smith <Morgan.J.Smith@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Tue, 13 Jun 2023 23:05:02 +0000
Resent-Message-ID: <handler.64055.B.16866974842385 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 64055 <at> debbugs.gnu.org
From: Morgan Smith <Morgan.J.Smith@HIDDEN>
Date: Tue, 13 Jun 2023 18:59:24 -0400
Message-ID: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
Content-Type: multipart/mixed; boundary="=-=-="
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DM5PR03MB3163:EE_|PH7PR03MB7338:EE_
X-MS-Office365-Filtering-Correlation-Id: 9ac522d1-36ec-4750-427f-08db6c61d7ea
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: IIMBKzrS3TggR51pda9yMrucS6Lgjq+eTKgMnMYbBLZMhugw5vi+6BabSJSyzy+x9VjKNfFzlmkjWXMXIsVHwRipc8hVe0rpzP2tcfhP17NRdwBybG9wKNfSr1oqvuv8W4rWkhq7gaB4SfmrUsQy5j0J7u3LJC8lzGQER1uMEav7wgflEZbdkY1ukLGYYOvs8Tq/Q+xxNn+IAUAa0XZsYxO0fkqdT6pvlJXx2AJ22KszNg3UUnskG+izJDNbj2D0nTq/xGk4XsDa25Uog5krpMOGZYQH0xUmH0OBsEo5TzR31XVyfQRsgsuo5uAMbZCR
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: scnczk9JdRp2kAQyAQEFHeRem8GbLkyo2OkJwyTNpvmIwUPLnHnhhXgsdts3/gVhiTmEQF/bJ05XZgmwkbfWf8x/NxUHz3FbrAzSjk8Q26H6JhAcZxDbErR/qM5jJIKL13PhVYFuTZFNDAYpg0yPF451lkRr545EAWxhH0K2Bop7yfepLOCH+CeqrRJ7/3aca6BCgEmrSH8uZQBJ0sMc4bc24FzF853lXQqBQ1Wrjjp3JA6q3JA+wioyHSr4654Of5db7F9A0Q2Sa9urmTOCiUxYpplIpaDSDEzl/NxE0X8OFdH1z5TLEYFC4fqlNpg6lUV4cCSmXRbxz9qQrjw3cLKjXa57FtVrxtw4ND0Ha04TQxiGHMOVQoYldLrVbkzAdUL+p9NniVAXE6ou+Bm3etwISRSQQl2REpvGPV+y+frLOX/6Sg9JdFB4+YfXisvM+K+wWGIYOaiRGr/ePgnVN698UuhPkeWBWjKHUWkU99SUvCRjTiRbjF8OjVml6w6yKVaAhtF6666LJ7SmGOcwAxjxRgaaTx8xf72BS47lfckO78DHlK11PCmiXVZcV7qfigaJtmha0if0fr/4NiKFS988P3uaFJINLbQfknuMfhIitQ2xg8rpzrCikXL4tXzfN4t0rw59Y5k0wmQQkGa5AwFjKeCARb2SzacKJv0gjwZmylVWT3j+ZNKcpoI6vop4Ap6XkDm211FnqD6jbNj/6jQyWNdpY/bp3N/ZLgT+s18yJbGtxx+byxP8e3KLORxJAtTApT4TyfnJ/o9tNuIiL/gg/m/l4udOXyUAgezGRxxCNsSlqcRJEIsj3vqZJcHpjrz7uQ/uMtWH1SZmh8haX+Bj0u7J9OrxcxCg3dOJ6ODKbCxeZMBChDP4GKM30DYcBwFMu3Y6X8kPRett+hnqop76B1eZbdnnWpf+yImn3EA50TEuupZFvAfA9lQTThG75QiHblr3OmgxlowYNNPhR60eWoDINwAoi+yzpkPHKSGOdZenDtTAMlcfCn3Hkb21YLKbDyt+jkAkiNpEbM0WeARtU7b8n3U6mnHkXO/KyXlzp2DFNNvtzYt8G2ZUfmaryqdypBuaFZBDPINHKHT1GS8dWeV8Zl1Y0yx6HFVp43VskpPFEyjtxOHJSwBnxp9+vzkouhOeZ1px1iaYDdJfa/zD8/JcZ371MCNNPeGgP2l2HE7q1WYUXOn2NpwY1P7Bw5n9V7EXjPmYGmCHGyauFzneK67LFc99COs/4Cwq2ME=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9ac522d1-36ec-4750-427f-08db6c61d7ea
X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2023 22:59:29.8404 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR03MB7338
Received-SPF: pass client-ip=2a01:111:f400:7eaa::819;
 envelope-from=Morgan.J.Smith@HIDDEN;
 helo=NAM11-DM6-obe.outbound.protection.outlook.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,
 SPF_HELO_PASS=-0.001, SPF_PASS=-0.001,
 T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)

--=-=-=
Content-Type: text/plain

Hello!


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment;
 filename=0001-enable-editing-log-comments.patch

From dfff1a074dbcc244a1d6b40694b559c12c331a8f Mon Sep 17 00:00:00 2001
From: Morgan Smith <Morgan.J.Smith@HIDDEN>
Date: Tue, 13 Jun 2023 18:33:56 -0400
Subject: [PATCH] enable editing log comments

---
 lisp/vc/log-view.el      | 11 ++++++++---
 lisp/vc/vc-dispatcher.el |  4 +++-
 lisp/vc/vc-git.el        | 26 +++++++++++++++++++++++++-
 lisp/vc/vc.el            | 10 ----------
 4 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index e6eb6a5b973..86911eeb02c 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -522,9 +522,11 @@ log-view-find-revision
 (defun log-view-extract-comment ()
   "Parse comment from around the current point in the log."
   (save-excursion
-    (let (st en (backend (vc-backend (log-view-current-file))))
+    (let (st en (backend log-view-vc-backend))
+      (unless (get-text-property (car (log-view-current-entry)) 'log-view-entry-expanded)
+        (log-view-toggle-entry-display))
       (log-view-end-of-defun)
-      (cond ((eq backend 'SVN)
+      (cond ((memq backend '(SVN Git))
 	     (forward-line -1)))
       (setq en (point))
       (or (log-view-current-entry nil t)
@@ -533,7 +535,10 @@ log-view-extract-comment
 	     (forward-line 2))
 	    ((eq backend 'Hg)
 	     (forward-line 4)
-	     (re-search-forward "summary: *" nil t)))
+	     (re-search-forward "summary: *" nil t))
+            ((eq backend 'Git)
+             (re-search-forward "^$" nil t)
+             (forward-line 1)))
       (setq st (point))
       (buffer-substring st en))))
 
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index fd5f655a0f6..4351a71977e 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -827,7 +827,9 @@ vc-dispatcher-browsing
   "Are we in a directory browser buffer?"
   (or (derived-mode-p 'vc-dir-mode)
       (derived-mode-p 'dired-mode)
-      (derived-mode-p 'diff-mode)))
+      (derived-mode-p 'diff-mode)
+      (derived-mode-p 'log-view-mode)
+      ))
 
 ;; These are unused.
 ;; (defun vc-dispatcher-in-fileset-p (fileset)
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index a3469b71386..18d6f1f47dc 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1384,6 +1384,24 @@ vc-git-clone
     (vc-git--out-ok "clone" remote directory))
   directory)
 
+(defun vc-git-modify-change-comment (_files rev comment)
+  "Modify the change comments on REV to COMMENT."
+  ;; This is very similar to using to "git commit --fixup=amend"
+  ;; command but it is more precise as it does the rebase matching
+  ;; with the hash instead of the subject line.  Also we can't use
+  ;; --fixup non-interactively (it doesn't support -m or -F) so this
+  ;; is much easier.
+  (vc-git-command nil 0 nil "commit"
+                  "--allow-empty"
+                  "-m" (concat "amend! " rev "\n\n" comment))
+  ;; We should really be able to do this "non-interactively" but we
+  ;; can't so we set GIT_SEQUENCE_EDITOR
+  (let ((process-environment
+         (cons
+          "GIT_SEQUENCE_EDITOR=:"
+          process-environment)))
+    (vc-git-command nil 0 nil "rebase" "--autosquash" "-i" (concat rev "~1"))))
+
 ;;; HISTORY FUNCTIONS
 
 (autoload 'vc-setup-buffer "vc-dispatcher")
@@ -1576,7 +1594,13 @@ vc-git-expanded-log-entry
     (apply #'vc-git-command t nil nil
            `("log"
              ,revision
-             "-1"  "--no-color" ,@(ensure-list vc-git-log-switches)
+             "-1"  "--no-color"
+             ;; The same as the default "medium" format but it doesn't
+             ;; put spaces at the beginning of the body.  This is so
+             ;; we can grab this as the initial value when calling
+             ;; log-view-modify-change-comment
+             "--pretty=format:commit %H%nAuthor: %an %ae%nDate:   %ad%n%n%B"
+             ,@(ensure-list vc-git-log-switches)
              "--"))
     (goto-char (point-min))
     (unless (eobp)
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index a93d85caedb..92a0ef74d56 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -699,16 +699,6 @@
 ;; - The git backend supports amending, but in a different
 ;;   way (press `C-c C-e' in log-edit buffer, when making a new commit).
 ;;
-;; - Second, `log-view-modify-change-comment' doesn't seem to support
-;;   modern backends at all because `log-view-extract-comment'
-;;   unconditionally calls `log-view-current-file'.  This should be easy to
-;;   fix.
-;;
-;; - Third, doing message editing in log-view might be a natural way to go
-;;   about it, but editing any but the last commit (and even it, if it's
-;;   been pushed) is a dangerous operation in Git, which we shouldn't make
-;;   too easy for users to perform.
-;;
 ;;   There should be a check that the given comment is not reachable
 ;;   from any of the "remote" refs?
 ;;
-- 
2.40.1


--=-=-=
Content-Type: text/plain


Please look at this patch.  Ignore the bad commit message for now, I'm
trying to figure out how to edit that :P.

I've spent far too long looking at git documentation and source code.  I
think this is the best way to enable this feature.  In fact I really
don't think there is another way to implement this feature that doesn't
rely on the "autosquash" git feature.

I found the hack located in vc-git-modify-change-comment' of setting
"GIT_SEQUENCE_EDITOR=:" on the internet and I don't understand how it
works.

Also I'm not really sure what the 'vc-dispatcher-browsing' function is
supposed to do but it's getting in my way.  Like are 'diff-mode' buffers
a "directory browser buffer"?  I don't understand the intent here.

Also you'll noticed I deleted some comments in vc.el.  That's mainly to
highlight them so we can talk about them now.  Is there a good way to
stop users from editing remote commits?


I feel like I should probably just keep working on this and get it more
polished and answer some of my own questions before posting here but I'm
getting kind of frustrated with this.  I am many hours deep into this
problem.

Thanks,

Morgan

--=-=-=--

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Morgan Smith <Morgan.J.Smith@HIDDEN>
Subject: bug#64055: Acknowledgement ([WIP Patch] Enable editing commit
 messages - vc-git-modify-change-comment)
Message-ID: <handler.64055.B.16866974842385.ack <at> debbugs.gnu.org>
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
X-Gnu-PR-Message: ack 64055
X-Gnu-PR-Package: emacs
X-Gnu-PR-Keywords: patch
Reply-To: 64055 <at> debbugs.gnu.org
Date: Tue, 13 Jun 2023 23:05:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 bug-gnu-emacs@HIDDEN

If you wish to submit further information on this problem, please
send it to 64055 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
64055: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D64055
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to bug-gnu-emacs@HIDDEN:

Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Robert Pluim <rpluim@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Wed, 14 Jun 2023 08:01:02 +0000
Resent-Message-ID: <handler.64055.B64055.168672964327401 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Morgan Smith <Morgan.J.Smith@HIDDEN>
Cc: 64055 <at> debbugs.gnu.org
From: Robert Pluim <rpluim@HIDDEN>
In-Reply-To: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 (Morgan Smith's message of "Tue, 13 Jun 2023 18:59:24 -0400")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
Date: Wed, 14 Jun 2023 10:00:32 +0200
Message-ID: <87pm5yo4m7.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

>>>>> On Tue, 13 Jun 2023 18:59:24 -0400, Morgan Smith <Morgan.J.Smith@outl=
ook.com> said:

    Morgan> Please look at this patch.  Ignore the bad commit message for n=
ow, I'm
    Morgan> trying to figure out how to edit that :P.

    Morgan> I've spent far too long looking at git documentation and source=
 code.  I
    Morgan> think this is the best way to enable this feature.  In fact I r=
eally
    Morgan> don't think there is another way to implement this feature that=
 doesn't
    Morgan> rely on the "autosquash" git feature.

Does 'git commit --amend -m' not work?

    Morgan> I found the hack located in vc-git-modify-change-comment' of se=
tting
    Morgan> "GIT_SEQUENCE_EDITOR=3D:" on the internet and I don't understan=
d how it
    Morgan> works.

    Morgan> Also I'm not really sure what the 'vc-dispatcher-browsing' func=
tion is
    Morgan> supposed to do but it's getting in my way.  Like are 'diff-mode=
' buffers
    Morgan> a "directory browser buffer"?  I don't understand the intent he=
re.

    Morgan> Also you'll noticed I deleted some comments in vc.el.  That's m=
ainly to
    Morgan> highlight them so we can talk about them now.  Is there a good =
way to
    Morgan> stop users from editing remote commits?

You can=CA=BCt stop anyone from doing anything on their local system, but I
guess you could check if 'git merge-base' is upstream.

    Morgan> I feel like I should probably just keep working on this and get=
 it more
    Morgan> polished and answer some of my own questions before posting her=
e but I'm
    Morgan> getting kind of frustrated with this.  I am many hours deep int=
o this
    Morgan> problem.

We can be your rubber duck :-)

Robert
--=20

Message sent to bug-gnu-emacs@HIDDEN:

Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Morgan Smith <Morgan.J.Smith@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Wed, 14 Jun 2023 11:42:02 +0000
Resent-Message-ID: <handler.64055.B64055.16867428934777 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Robert Pluim <rpluim@HIDDEN>
Cc: 64055 <at> debbugs.gnu.org
From: Morgan Smith <Morgan.J.Smith@HIDDEN>
In-Reply-To: <87pm5yo4m7.fsf@HIDDEN> (Robert Pluim's message of "Wed, 14
 Jun 2023 10:00:32 +0200")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
Date: Wed, 14 Jun 2023 07:41:18 -0400
Message-ID: <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DM5PR03MB3163:EE_|BY1PR03MB7238:EE_
X-MS-Office365-Filtering-Correlation-Id: aa14b4db-7628-4707-1590-08db6ccc47ac
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: VZdxi6ndfBswY7iAda8jlLHuGYqkhUV9meysB+/IuZR+zAYAHfXlyZgtGfQ7XYk4SBPOPxzrhaowEoveSJimk+VPpciRMlIAsnpe0hnQF9LHKS75oR0ksOl+LkdagSJDN5vlF9NaXfQpEeHbnQxcjOTgnI9MC07PBKdnbSLVBMdLfl4FQnENB9yu7DTXBBZo5z/6S9/ctFwJSjOE+33mknuWq3VLAWIqR4ctqi4c/Mra6GXI38UY25OgAIl7/S75ZONR68G3o1ghYcCfXt8Kvr+6MC5i6HAY2eir7PJud9NNKjuUxazQcbDacodwINRY2/n/uTE0Rk/YTHwd97WesoG+/htr5eob0zLOzGDzMmtR9nElJyDvQrP1dKxi/fEAln0gUlOx/KGVlSctAOdaFp8MFvleYURM1nmHsOY0jEALgF2ez+X9a6AGGBQYOkv9sXWof1GWwTYvi9gqwzR6YX27NQpXK180oMHadfOS5qmrkFt7ZW6Tj+C3TjX5ALjhGSPgVX1DIAoOFCAdre0eayNduPhSymWx6+uw8m0bS9TmwsW9JXEXYvl57kSt1i1GamoflW2G0duo6NCgLsiAFp3iWCIsJpDy3ga/srNVZeEg41D6W79fkZ5o3N1Nky0B
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: ih7fODa6/PJTVrZnU/hoHJQwiboKjI8LLUPuNR7LDBTkDBXSwMbSYdz7Z0vacOOlK+laGSX+JZr5uR43y2E8OaY9g/VL2aipXS+K84WBUCBs9lforzY1Zrol0u+iIYZeL+iiVS8EFX0zAT8RY9BkeIO7qFf7DA5iFiEk3xFqX9hlrSSuuL3Ir5L0SdZq3fIpPWNY9E3nMBlvdyahaA2uG4nvaFVG1JLDeJfOBewsNMVn9upoYJpPNdn1wceSt3smHa2MFlouWEzdtSlw/hzDpRI39cfiGVRz3c8ndYo9rX5tJ4PpJ1RjKDN7G1KKYjSgCcd47Z3mBJzUM10g6AmVLXUc2dr0l32Oie3zGV3/Tr3fqVpOOYXmdASypvbaDrOqpQRBrRoepIH47RMvbDaCE67kNGcwDDJku8CXtRRAGsS5KnRp80TnJTy/qVEHDWTpC3/FkkdxRAN8aicaRBRJPrPrCN3CfaO6GH3deL+ZK988G6RFKBV1Dq7Fq2qEhv46jMJjChpdAs8EfOjNSaxPHa13VMcMiLeoNC5Kn02x5Dl7j99lzYoFYvnFRwY82GDF4aYK3SKotXfYQL2iBm1OANuVVK77cGVejwSkeeaTSE9s5dmSLkHa4F1rIn6X1OqDWLhCdI96bB+aXPf9KV9co8YSyfSpnOAkoazABPqWtgnoai3SbuhzhvErfUIPuuXKUl3lS5mkYzPhS3h3r/goqdnX9cVe5LJhTVj1iyAznfLlbMqCg6aYHaRyNgOYnZ2zrztttIE+GutgTf4YLPAnyaDy/d4kfe0tIIpMx5BN+b9fmUCrBVGD6m4qlAAxk/161Q5AeJ2A3nYc5oJIn0D/Q/JW9N7PHFK2Pn7qZ5QuaxYfrkApAxUKZNuOalpoFLBgdeOl9gmX5N66abyggC+M9FB+E+FJqD53HsBRTLqvDCiHxUeDo2ZiiUHprGYdJJSdbnp2ep/cXH6IAKUUWPHW3eS6mKlYKViOLflI7zBtsR6M3zlYelPs4neEx7y5fsK7Xj45KtdHBXjthRMwgDVYe3xVtOqyutB6k7nJdpeu1Waze1Ylw4odfTO+qivZ9iSCmEnoCrfN8KEsV4AfpZfMiwFaMggR4XggNfxb2CUq9Oakvfo4f9oEgNFnse1HczsPfu3BrCdxf0jwh+1Ic7ooAe4G0DB82Jw9TNlN8XEhMOn+xeq+U9e4QX+1NGhGpN/vCRNh8gYBq6o88TD/VKeNE0eaCVgPvFv9ywDkoamUhQ0=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: aa14b4db-7628-4707-1590-08db6ccc47ac
X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2023 11:41:23.9156 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB7238
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Robert Pluim <rpluim@HIDDEN> writes:

> Does 'git commit --amend -m' not work?

This only works if you want to amend the latest commit.  If you want to
edit commit messages of older commits generally one would use the reword
feature during an interactive rebase.  To do everything from the
commandline I think we need to use the autosquash feature.

'git commit --amend' is actually already built into the Emacs vc system
and works great.  I don't think you can use it without a diff though.

> Robert

Morgan

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Robert Pluim <rpluim@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Wed, 14 Jun 2023 13:14:01 +0000
Resent-Message-ID: <handler.64055.B64055.168674842114518 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Morgan Smith <Morgan.J.Smith@HIDDEN>
Cc: 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.168674842114518
          (code B ref 64055); Wed, 14 Jun 2023 13:14:01 +0000
Received: (at 64055) by debbugs.gnu.org; 14 Jun 2023 13:13:41 +0000
Received: from localhost ([127.0.0.1]:44106 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1q9QJg-0003m6-K6
	for submit <at> debbugs.gnu.org; Wed, 14 Jun 2023 09:13:40 -0400
Received: from mail-wr1-f48.google.com ([209.85.221.48]:55323)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <rpluim@HIDDEN>) id 1q9QJe-0003lq-OK
 for 64055 <at> debbugs.gnu.org; Wed, 14 Jun 2023 09:13:39 -0400
Received: by mail-wr1-f48.google.com with SMTP id
 ffacd0b85a97d-310e6e6a8d4so623104f8f.2
 for <64055 <at> debbugs.gnu.org>; Wed, 14 Jun 2023 06:13:38 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20221208; t=1686748412; x=1689340412;
 h=content-transfer-encoding:mime-version:message-id:date:references
 :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id
 :reply-to; bh=go7rdKoMG0lzCQm0QgJ0Ehu7+0tWoV2pcyrjvPu6Yl4=;
 b=XjuwoggeKCSxs8EBfQKvKiuX/tZ+U6xHY4bVkuiP8sy0aubAyC4CGsuSvwwakhc7Op
 QPy7ud5wsRJWea0dcJ2Uk1dHwDzhN5rW6G0NOkgj3Nkw/3Q+hqL8m4xJcgciEnLENVL3
 ZrR0dYn+wNuyVF7ntEvgQiNpfxySudsOCbVmwmn0iIdV4OrULKjYMpd9g+Kxu5zDAV+Q
 Tvx+bC+xgZZ3KAWVtnMS8JbUdbdCMEkH/MuTFythGXonfxKBzUbvbvqj6EjD0tBVt31i
 nhzDZOFwFy5b1SqDRn+hR+fG5raCk4tz7JQO/gPuGGnFayZLSwB6hVemAqnzUv6sKpVT
 RoCA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20221208; t=1686748412; x=1689340412;
 h=content-transfer-encoding:mime-version:message-id:date:references
 :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=go7rdKoMG0lzCQm0QgJ0Ehu7+0tWoV2pcyrjvPu6Yl4=;
 b=FPsVJiNzWW4sDQhc+GdZQa67yJhmWVclpW25JGDY7ny3r/M+9Jdr3XC+YYXlh0qosE
 +fSwXRaUwhgwMPY6Xb/5ehSGwXj+1ih2Wu6VQjwwDbtMks4nCNwFqSo2N2uSSHwSkmno
 xVhO4uUfMwYKtd8s4XQstdHcKL891nKHMFr8gXBOjQzoVqiL6HD/SYJx7E8EQAHRmOVp
 Za6S3gc+gHTlVSwKOW0OwtmL1n81yenKrt4tSSqFsSKHguxxSzkZB8ALGgW6ox5fp40Y
 r2f3j1U4H5GqqKJYuGjpLAYUxueROVRHeqS7tpOTVi/Bmab8M1DfK7JSPqDFYo/dSRAr
 emfw==
X-Gm-Message-State: AC+VfDxDk9/E0LMSIWNVaPApEkIuUFqFotwy+zYuI/lJMirh6zBoucrC
 2adlgKMtA1WAN0qOwnc9Cg0pus7rG6I=
X-Google-Smtp-Source: ACHHUZ6Jw0PJ5akMfCipbtLpf+9tvaMwcISvrpvYUF5LMA7uzmApis6bXX+KF/ED/H4kGSBBWrjIWg==
X-Received: by 2002:a05:6000:89:b0:306:3e96:6c5f with SMTP id
 m9-20020a056000008900b003063e966c5fmr8068309wrx.15.1686748412209; 
 Wed, 14 Jun 2023 06:13:32 -0700 (PDT)
Received: from rltb ([82.66.8.55]) by smtp.gmail.com with ESMTPSA id
 f26-20020a1c6a1a000000b003f7ea771b5dsm17671343wmc.1.2023.06.14.06.13.31
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Wed, 14 Jun 2023 06:13:31 -0700 (PDT)
From: Robert Pluim <rpluim@HIDDEN>
In-Reply-To: <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 (Morgan Smith's message of "Wed, 14 Jun 2023 07:41:18 -0400")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
Date: Wed, 14 Jun 2023 15:13:30 +0200
Message-ID: <87legmnq4l.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

>>>>> On Wed, 14 Jun 2023 07:41:18 -0400, Morgan Smith <Morgan.J.Smith@outl=
ook.com> said:

    Morgan> Robert Pluim <rpluim@HIDDEN> writes:
    >> Does 'git commit --amend -m' not work?

    Morgan> This only works if you want to amend the latest commit.  If you=
 want to
    Morgan> edit commit messages of older commits generally one would use t=
he reword
    Morgan> feature during an interactive rebase.  To do everything from the
    Morgan> commandline I think we need to use the autosquash feature.

Yes, eg magit=CA=BCs interactive rebase is great for that kind of stuff. I =
don=CA=BCt
know offhand if it uses autosquash.

    Morgan> 'git commit --amend' is actually already built into the Emacs v=
c system
    Morgan> and works great.  I don't think you can use it without a diff t=
hough.

Fixing that would fit 99.99% of the cases where I want to reword a
commit message, and I suspect I=CA=BCm not alone.

Robert
--=20

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Morgan Smith <Morgan.J.Smith@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Wed, 14 Jun 2023 13:55:02 +0000
Resent-Message-ID: <handler.64055.B64055.168675087418651 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Robert Pluim <rpluim@HIDDEN>
Cc: 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.168675087418651
          (code B ref 64055); Wed, 14 Jun 2023 13:55:02 +0000
Received: (at 64055) by debbugs.gnu.org; 14 Jun 2023 13:54:34 +0000
Received: from localhost ([127.0.0.1]:44132 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1q9QxG-0004qk-3e
	for submit <at> debbugs.gnu.org; Wed, 14 Jun 2023 09:54:34 -0400
Received: from mail-mw2nam10olkn2107.outbound.protection.outlook.com
 ([40.92.42.107]:13677 helo=NAM10-MW2-obe.outbound.protection.outlook.com)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <Morgan.J.Smith@HIDDEN>) id 1q9QxD-0004qW-Ks
 for 64055 <at> debbugs.gnu.org; Wed, 14 Jun 2023 09:54:32 -0400
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=ZbL8/bWY/aB1ucQkOcMo8tvFZJM0BTjc24Kdf6DFJl7r5XFSrlOPu4QACQj4aRpx32HW0/Drhk56JvdUj5/GGmPqml0hM3VvWIxFZudc6N0UZ34RKge8dGpj1hURhnFDXw/mzLDfD5J/qcbU7L62uUzSRqxkwL2yLyfgn71nxoU4WVR5q8y7AKYR9ifDJOxrrx6j+N7XWIGGa5Eex3TzJ/Aoqb9tSL5DOJULh3ZX1lbT4hcRSN+3J8hSxm0fiH7lKSyImz2J/REuy7v2hGRaAbrFBqGZe58vwQ1MEIfyl+SN4NhyR4hiRXnRVftT4YF8M4LFFnTNfqCWXqumSYCUTA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; 
 s=arcselector9901;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
 bh=xnMCGz4KelGTsxqrjRlzVw+dmiYeafkUWQ5I2yrq8SQ=;
 b=DJupWXrz6/BCWe3e4TS6I87QNRPpsDIdRyw/BzfyJ/Enm0ZMdkiafeEEsunwXfllUH328ZDhvXBvJB9shYNsZ57E9QbBD15xvsFklTCI01cJU+U4PWid2BLkagZq9MM/2ieF5cXvEOIhR6H3HKy9NK5+AiLC2qieNy6S6y0h93F2A1dXTuvSZBtbYtNt+C3mtwdTAoMCaDetGPFpnea869RedFskcynXz1NusBnKRf7/MVqk2YFIxtEPWF2FvBycCvGI3FSfcvq6jBQvMXBWqfAeaksgdiuW3AxvPn1gi8wZltylEu7MVFSVnCJjqwCvoGhRbT0o9ZbyE+BXc5QB5Q==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none;
 dkim=none; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com;
 s=selector1;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=xnMCGz4KelGTsxqrjRlzVw+dmiYeafkUWQ5I2yrq8SQ=;
 b=u4P2o4SLSFKNeZZVU0fLvtonhVbN2IQguOEIhf1X5DQtStT2pg9iVQpYA2rEDWgZjsd92p22cNne/yMTwNsCoILApOiUAjkJimCXPiIihkEhdvuwPy0XyAXl8zIH7mKLxAD1d88tSE1ZQTIY+BHGpleTEf2QEDBnAhP8dioOhSCRfIQak7T3ewbm99/LgUKcjCl6fAuTCk746FTmPwJlDQbWfo8tCTlIdX9USlNGum+xsD2SUjuxID3Xy0y3ljTvKoHbBeoHvJKzqofBy3ASSbe5k2wgcAVzs4oTWiRlbvKrSZ8+ngQDykknjgbE5qG48KzFOJrWlvIXU/t7WSCmJA==
Received: from DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) by
 SJ0PR03MB5567.namprd03.prod.outlook.com (2603:10b6:a03:28d::6) with
 Microsoft
 SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 15.20.6477.37; Wed, 14 Jun 2023 13:54:23 +0000
Received: from DM5PR03MB3163.namprd03.prod.outlook.com
 ([fe80::d561:bdf5:3af9:b03e]) by DM5PR03MB3163.namprd03.prod.outlook.com
 ([fe80::d561:bdf5:3af9:b03e%4]) with mapi id 15.20.6477.037; Wed, 14 Jun 2023
 13:54:23 +0000
From: Morgan Smith <Morgan.J.Smith@HIDDEN>
In-Reply-To: <87legmnq4l.fsf@HIDDEN> (Robert Pluim's message of "Wed, 14
 Jun 2023 15:13:30 +0200")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN>
X-Hashcash: 1:20:230614:rpluim@HIDDEN::Oc6vv7zyxIQujXur:0oQH
X-Hashcash: 1:20:230614:64055 <at> debbugs.gnu.org::G0WErIhkSX45fSeG:79Mt
Date: Wed, 14 Jun 2023 09:54:20 -0400
Message-ID: <DM5PR03MB31638BF676A8EBE02E55755AC55AA@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-TMN: [PDdstHNnJnghkvmNKS68ukEFHI08pj+E]
X-ClientProxiedBy: YQBPR01CA0157.CANPRD01.PROD.OUTLOOK.COM
 (2603:10b6:c01:7e::26) To DM5PR03MB3163.namprd03.prod.outlook.com
 (2603:10b6:4:40::24)
X-Microsoft-Original-Message-ID: <87r0qecfoz.fsf@HIDDEN>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DM5PR03MB3163:EE_|SJ0PR03MB5567:EE_
X-MS-Office365-Filtering-Correlation-Id: 5088bed8-3c6a-489e-a8ee-08db6cdedbac
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 1MEJ7no4/V09xvZm4Sj+P4IZCcLUqbD+c02DRZSHFAT97bVWJPlwaapl5E42ZR5T/tja3xTpVrwywIFtKOhgaJb0PhGyfvdCswcFEyLzzjaajD/SXquA/vvzRVe0FhhlUI8tP8puyZS0Qayiv6smwDog1WycJXELXzA8cs57qr4ycmJACVaOEMjxOewPivsnZ+xscS7PlaFT5DycOtHAawLHFInCcSbJaKBsRUxLTxxQtY28NqEGMa+TGhm9c5N83xIFYut8wSfbqGLuUR+SgCK4HwhVflKUw5vEW7NemLLOgSeoN8ewQTzjc90YVnwD3n4v4c74LGl7MNxQ6vgPhpm3dTWrW6by8GlOOnkzELsqvz2HOBRVaVuG9XhP+Tl/jbJyY/YYDjXusaLxH0LhXYUVbu2yAumPifTmIlIGhn3KnH9PBf80sU6O47e9yjzrMie8N6vMEE4uKUYifeKBzmRiqcKO9Pd20n1HgBsONpCaSNGHONz5RkWocxGAJV2dUW50mjmxXcw8qiSaXMtdB+qmKu8mjjf1glYPKwlUbT7YHvyCgNarmrQqExOREQctGkhXtD1PfQHaCULb84Si0EyRNOTAC4mnPZ1PgsJBjR4/1605Hr2CBXE1faQZ/Rbs
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: DH7bMFGo97+d15e2TICeiVBDd11N6VT0RsUf+Itq5edkeS8VHxMRn2djD4fE7wCZkJ1acb59P9gPDr+kmCTdXmwcvgycm1IcaXhTiD5je0bMUW574SLJuDhnTYIdHgdaxMESksQ4y9V+tv1dEdbbvqM+J2ppcX7CaGAcNuj2V6Uah+WedkdyC2sZb+Lfq0U7s6p5BZtEw2Gz26IaKRraFwTpMIErJKz9T+JP9OzKojjz9YjMI/sd4IC8uNZ9Je4qQeVQZ0WhAQMqOcfINHVj5xBAD1pJFaSC9qzmyc4YVAzjyEtWoXXsJnkd5n0VBvhOnP1An2R8t/iKGs5iN4ej0sEoWeOLXrZPJ34V481qm0S4xz8M4cZm8iJxB6nTIH9suPYBxsGuwq41PQwvG4tx2WQI2e9TBmuN7MTj+GTkE8PJenv+ScOj915Cs9EV6YMPu09nrniUmyawu5Uwannczuq763uI5iERG20wWVXK12ZUZ9H5Fo5pHC5U6Z4/vpob21n2bOyDOVBAXa2yXi2n7vmDzHvKtfmMi+THvgJAAMvhOsF99LLHyTkDmzePdZUC7KcxHsvCVCYO2DVxYLtwAE13HmaZIYb2EhGh+RChwA7RuVdq4GHJNPRKUiYMPmH7O7K3Hoiwu9m++hJB4q9fLo8DbpY/NZtK0VQlwRHJHds0Marj/B/+H58JKXnBwnMouEMgYJjQPcoMZRpZAMRtbMGA1HvFl3RbJR2J6nn/VaUWYNDXhBWLXkun9MpSzBUOFIwWxV4X1YFDVxpQ3CunbgG+EmS97rjTK+eEVyJdmp9E/hNASMR7FZhUCees81Vme8bdMQdyZ8Eb81VetlckoPjCDYgmyQbh4meHPN1PbE8S2XjJo7U3KZfxa3VOiT8Vfrf3QZX8cwGuIoeWrgaRnHUDKJb0aLhOXoOIL/WORqto0LW2e/RyI5s5VNoxvGu774PaBsWL/YD0YbFA9VPtt9vafIIArgQCjSbShs2q1YJy9olqx5hpd3GpcY2oG2porknodVTxopSaujaPraqDQGfl/K+gfCeGYrajKse7qdBBDmDjXs9poBvwz4hDrPVwY6seZRUlnCyIdzNQoYdAp+A5JEiixgC6mVY9G4W58xEGKQFAPkNMR38IYTp+w4huRUbKTcFd+FZdk99VaRVy/3iscKVsRNn2YVvGnXF7k9cCy/DDxfA01FscD4gUclpFCHp+hy9LxeB8c5bk11Gb+0W1/KJ0DS7CSNlRv8VW61o=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5088bed8-3c6a-489e-a8ee-08db6cdedbac
X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2023 13:54:23.0423 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR03MB5567
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Robert Pluim <rpluim@HIDDEN> writes:

> Yes, eg magit=CA=BCs interactive rebase is great for that kind of stuff. =
I don=CA=BCt
> know offhand if it uses autosquash.

I look briefly at their code and they use a perl wrapper around the
interactive rebase.  I suppose that's another way of doing it.  I don't
think it's any better or worse then my approach though.

>
>     Morgan> 'git commit --amend' is actually already built into the Emacs=
 vc system
>     Morgan> and works great.  I don't think you can use it without a diff=
 though.
>
> Fixing that would fit 99.99% of the cases where I want to reword a
> commit message, and I suspect I=CA=BCm not alone.

Strange.  I'm usually working on at least a couple commits at a time.
For example, if I'm working on a change and I notice a typo in a
docstring unrelated to my change then I'll stick that into a commit.
Then I'll fix up all my commit messages at the end of my session.

Regardless, the current amend logic is great if you need to amend code
changes.  For the case without a diff, you could simply use the feature
I'm adding here.

Morgan

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Robert Pluim <rpluim@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Wed, 14 Jun 2023 15:31:02 +0000
Resent-Message-ID: <handler.64055.B64055.168675662229090 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Morgan Smith <Morgan.J.Smith@HIDDEN>
Cc: 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.168675662229090
          (code B ref 64055); Wed, 14 Jun 2023 15:31:02 +0000
Received: (at 64055) by debbugs.gnu.org; 14 Jun 2023 15:30:22 +0000
Received: from localhost ([127.0.0.1]:45188 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1q9SRx-0007Z7-OI
	for submit <at> debbugs.gnu.org; Wed, 14 Jun 2023 11:30:22 -0400
Received: from mail-wm1-f52.google.com ([209.85.128.52]:59470)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <rpluim@HIDDEN>) id 1q9SRw-0007Ys-Ed
 for 64055 <at> debbugs.gnu.org; Wed, 14 Jun 2023 11:30:21 -0400
Received: by mail-wm1-f52.google.com with SMTP id
 5b1f17b1804b1-3f736e0c9a8so6798765e9.2
 for <64055 <at> debbugs.gnu.org>; Wed, 14 Jun 2023 08:30:20 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20221208; t=1686756614; x=1689348614;
 h=content-transfer-encoding:mime-version:message-id:date:references
 :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id
 :reply-to; bh=hba/NyCw8uh57mRTzvTtUZ6JtZ/E9oLW1/UWVIZktlA=;
 b=kHn/DbA3ofnCRd5KMbQ1JzXg7IUM11qxJwzxlljs0erMinqibW1v78QbMq48Cha1+A
 BZlZSYQ4ZsMmNhznWBGdCEZqzwX2ICxRvTTKx5CIw7yr94sdoSSAlv3p72nhRbxARSYs
 dpBPnPdTYPtmslMRPPyzc6kF4lNQXFGM8/xr8G5cCzWryWrn8XXLGSc1KHZCEGezuHQU
 V56tzS/Csm7HHMHdTkkzM64dwfGwy/GR4CyuRT7YmxtdjR7zck98IPYv/lN30UzvxPad
 Kdbzqh4+krJRf9sceHd2c3vrUDCHWluV8JR3/hrdOiaUA5oFxUul8yNmmECx+NRzkZJm
 7gjw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20221208; t=1686756614; x=1689348614;
 h=content-transfer-encoding:mime-version:message-id:date:references
 :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=hba/NyCw8uh57mRTzvTtUZ6JtZ/E9oLW1/UWVIZktlA=;
 b=kC1zLwJ+kR3Wa4+aaxpjlHjJq3JwhyGZOrvenK0q1EZMJksOE2dgBKhpDAVp5HSY14
 eYtbkVMkRwsYY7LwtRPnnI9+2WSWMnAGI84YEemoEl7CfFhyiqidBrNyOIOe/QeQlXJh
 etZZK357XMReCukXq7pxfXdIsJNYrrfTPLKtclfXPJyg0YUqed4keTfC2nnNhymnUYDi
 /xQGq5xlVs9tcBmftj+z0Jk3zE+A0xhfEVvX13L+1y38GTeVtgCD+sa8qNZbxAYtJpu9
 JeAFYdDj7/kh7EtIoS+7CG2/vRBw0KJJsTBdv+aOUhir8L3IU78RhBsGQqe1u43qa1Wg
 ztpQ==
X-Gm-Message-State: AC+VfDy19q3tfgeKSYuePfwZsGJTKnfyMl+T4PO45eX9C9feaSCe5mJI
 NG9jZHOM/b6DWj/uDFU9FBwNFUZccWg=
X-Google-Smtp-Source: ACHHUZ4WSZNi9a/5G0PZ6N4gX4X1fSTd0TT7TFxCDCaSWVGbBFXtPiT+tAYu32FORWx3jGdKYg6pog==
X-Received: by 2002:a7b:c38b:0:b0:3f6:7e6:44ea with SMTP id
 s11-20020a7bc38b000000b003f607e644eamr9791337wmj.18.1686756613909; 
 Wed, 14 Jun 2023 08:30:13 -0700 (PDT)
Received: from rltb ([82.66.8.55]) by smtp.gmail.com with ESMTPSA id
 l19-20020a7bc453000000b003f42328b5d9sm17805967wmi.39.2023.06.14.08.30.13
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Wed, 14 Jun 2023 08:30:13 -0700 (PDT)
From: Robert Pluim <rpluim@HIDDEN>
In-Reply-To: <DM5PR03MB31638BF676A8EBE02E55755AC55AA@HIDDEN>
 (Morgan Smith's message of "Wed, 14 Jun 2023 09:54:20 -0400")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN>
 <DM5PR03MB31638BF676A8EBE02E55755AC55AA@HIDDEN>
Date: Wed, 14 Jun 2023 17:30:12 +0200
Message-ID: <87h6ranjsr.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

>>>>> On Wed, 14 Jun 2023 09:54:20 -0400, Morgan Smith <Morgan.J.Smith@outl=
ook.com> said:

    Morgan> Robert Pluim <rpluim@HIDDEN> writes:
    >> Yes, eg magit=CA=BCs interactive rebase is great for that kind of st=
uff. I don=CA=BCt
    >> know offhand if it uses autosquash.

    Morgan> I look briefly at their code and they use a perl wrapper around=
 the
    Morgan> interactive rebase.  I suppose that's another way of doing it. =
 I don't
    Morgan> think it's any better or worse then my approach though.

OK

    >>=20
    Morgan> 'git commit --amend' is actually already built into the Emacs v=
c system
    Morgan> and works great.  I don't think you can use it without a diff t=
hough.
    >>=20
    >> Fixing that would fit 99.99% of the cases where I want to reword a
    >> commit message, and I suspect I=CA=BCm not alone.

    Morgan> Strange.  I'm usually working on at least a couple commits at a=
 time.
    Morgan> For example, if I'm working on a change and I notice a typo in a
    Morgan> docstring unrelated to my change then I'll stick that into a co=
mmit.
    Morgan> Then I'll fix up all my commit messages at the end of my sessio=
n.

That kind of thing I just leave in, and if it gets in the way I=CA=BCll
stash it, and then commit it afterwards.  But then again, for Emacs I
try not to have too many commits in flight at the same time. To each
their own.

    Morgan> Regardless, the current amend logic is great if you need to ame=
nd code
    Morgan> changes.  For the case without a diff, you could simply use the=
 feature
    Morgan> I'm adding here.

Right

Robert
--=20

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Dmitry Gutov <dmitry@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sat, 17 Jun 2023 02:41:02 +0000
Resent-Message-ID: <handler.64055.B64055.168696962317756 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Morgan Smith <Morgan.J.Smith@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.168696962317756
          (code B ref 64055); Sat, 17 Jun 2023 02:41:02 +0000
Received: (at 64055) by debbugs.gnu.org; 17 Jun 2023 02:40:23 +0000
Received: from localhost ([127.0.0.1]:50646 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1qALrT-0004cJ-5F
	for submit <at> debbugs.gnu.org; Fri, 16 Jun 2023 22:40:23 -0400
Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:59219)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dmitry@HIDDEN>) id 1qALrQ-0004c3-Oo
 for 64055 <at> debbugs.gnu.org; Fri, 16 Jun 2023 22:40:22 -0400
Received: from compute6.internal (compute6.nyi.internal [10.202.2.47])
 by mailout.west.internal (Postfix) with ESMTP id D45AD3200923;
 Fri, 16 Jun 2023 22:40:12 -0400 (EDT)
Received: from mailfrontend2 ([10.202.2.163])
 by compute6.internal (MEProxy); Fri, 16 Jun 2023 22:40:13 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc
 :content-transfer-encoding:content-type:content-type:date:date
 :from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:sender:subject:subject:to:to; s=fm3; t=
 1686969612; x=1687056012; bh=6+VgdQdJvTLvXo3f2AEMea4YDAQZnjXUodd
 pI0ZjK1w=; b=0nNygG8OV/VqrcxbxtszltKC5CV/EKihQP1inaLUwcyLBYX3Oui
 SazJnT9fIGYfndTDGfPeqUzJZ9M5FeNYZpsbPFX59eRChSq1TP9zFTCJ8QZAmP4o
 JnxUAPtJsmxR7XwPJFNevw/OFHuek6dtDgyn2ILaHtsk9ncas7T7WgnLYghqfBh9
 puhvDR9SyfpPJtS4Y17giLV9bxP437Aw92T6q7rCgboXzGF87mT3UfiatODCaji5
 VDlJTRcuXBtVuJ93+Vsii1y29FgCHu/i/6vNfDeBE0VyIh2DYuunb25pMTqtFysj
 BFBCbjgHv8llHC5Pjw/xAD/bkA5nGqLK2mQ==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=cc:content-transfer-encoding:content-type
 :content-type:date:date:feedback-id:feedback-id:from:from
 :in-reply-to:in-reply-to:message-id:mime-version:references
 :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy
 :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1686969612; x=
 1687056012; bh=6+VgdQdJvTLvXo3f2AEMea4YDAQZnjXUoddpI0ZjK1w=; b=H
 p8Xz9YCWvnhJkCBV5JwEwGqDiIKCweGkOQXbzBEK+VXo5JjLt1i3IHGchszHqfnI
 dAxLU3jm+rjbEMvxG8qo3aRldqmxvxXLRtd59fztuT/OWeHh1vdXPcPOKlDp79gc
 1hVziw7bQdoOrSrVSDxXyyv3c61wkTgB8YQ7BL5gcKds9NOvas/xCUNrURI/YNzV
 +2BoUygZ3DbGMcHmKYIjBKRvmjlms0ArxfEb7sL8t9US76VEBklMPxUP0vNZQoIx
 fKU/SZiVAxOHEI48/EMK+Sv+lYhvLQWXkK7YhzWRIXPA78dIeo+0WkGx03Qiacb8
 SVRnAgQzsb3xRwZOL0bxA==
X-ME-Sender: <xms:DB2NZKk4uNAPSH0s7PlDNuImvye0DAXaOmNyDh2r04r2UmhMS91gzg>
 <xme:DB2NZB0SGnMdgI-xgOf8KEH6omDzW8LEHZjLPv_PpF9PgWBMMGnlbYBYxVJHa-y8K
 zQSrd1SgKdl5O5Zwq0>
X-ME-Received: <xmr:DB2NZIocfD7B8W9LR2EmRo2E7aelPgGPn6xyUopyNo_5b7k8M8Itp_sA5LzLnP4>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrgedviedgvddvucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
 uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
 cujfgurhepkfffgggfuffvfhfhjggtgfesthejredttdefjeenucfhrhhomhepffhmihht
 rhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvghvqeenucggtffrrghtth
 gvrhhnpeehfeefgfejieffhedtgfeuudefleekveekhedvieegvefggfeviefftddtjeej
 feenucffohhmrghinhepshhtrggtkhhovhgvrhhflhhofidrtghomhenucevlhhushhtvg
 hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegumhhithhrhiesghhuthho
 vhdruggvvh
X-ME-Proxy: <xmx:DB2NZOmOl1y0_ksyXx4b62P_orsaaGY16YyefkT3LfRnUNa2MQtt1A>
 <xmx:DB2NZI3z_J8Cq25gT-K2cb6NtPIPDtkEJFdfWkDeMLQ3azoAGmZePQ>
 <xmx:DB2NZFv9Zq4yz78aw9UAyPUwYrOL9qgw9qEasqy5yVwbakFL6G6jfA>
 <xmx:DB2NZN-A-CEAjJ1LrFetgDdc1xLYO9c4G_vTZdrRHaQWEYqGGefOrQ>
Feedback-ID: i0e71465a:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri,
 16 Jun 2023 22:40:11 -0400 (EDT)
Message-ID: <0e2fda3f-7952-66d3-1b13-19ee31dbad7a@HIDDEN>
Date: Sat, 17 Jun 2023 05:40:09 +0300
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.11.0
Content-Language: en-US
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
From: Dmitry Gutov <dmitry@HIDDEN>
In-Reply-To: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: -1.9 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.9 (--)

Hi!

This is a welcome addition, thanks for your efforts.

On 14/06/2023 01:59, Morgan Smith wrote:
> -             "-1"  "--no-color" ,@(ensure-list vc-git-log-switches)
> +             "-1"  "--no-color"
> +             ;; The same as the default "medium" format but it doesn't
> +             ;; put spaces at the beginning of the body.  This is so
> +             ;; we can grab this as the initial value when calling
> +             ;; log-view-modify-change-comment
> +             "--pretty=format:commit %H%nAuthor: %an %ae%nDate:   %ad%n%n%B"
> +             ,@(ensure-list vc-git-log-switches)

Does this improve the overall look of the log? Otherwise, we could 
remove the extra spaces when grabbing the log message (as long as we 
know how many were added), just like we do in log-edit-insert-changelog.

But an even better solution, perhaps, would be to delegate to 
(vc-call-backend backend 'expanded-log-entry revision).

Here's how it looked in my old, unfinished version of this feature:

(defun log-view-modify-change-comment ()
   "Edit the change comment displayed at point."
   (interactive)
   (let* ((file (and log-view-per-file-logs
                     (log-view-current-file)))
          (revision (log-view-current-tag))
          (backend (vc-responsible-backend (or file (car 
log-view-vc-fileset)))))
     (vc-modify-change-comment (list file)
                               revision
                               (vc-call-backend backend 
'expanded-log-entry revision))))

It will need to fall back to log-view-extract-comment for backends that 
don't have this method defined, though. Such as CVS/RCS/SVN/SCCS.

> -;; - Third, doing message editing in log-view might be a natural way to go
> -;;   about it, but editing any but the last commit (and even it, if it's
> -;;   been pushed) is a dangerous operation in Git, which we shouldn't make
> -;;   too easy for users to perform.

...

> I found the hack located in vc-git-modify-change-comment' of setting
> "GIT_SEQUENCE_EDITOR=:" on the internet and I don't understand how it
> works.

Apparently ":' is a shell built-in which "does nothing and then 
succeeds" (https://stackoverflow.com/a/29094904). "true" should also work.

> Also I'm not really sure what the 'vc-dispatcher-browsing' function is
> supposed to do but it's getting in my way.  Like are 'diff-mode' buffers
> a "directory browser buffer"?

The docstring is 15 years old and never updated. If we can find a better 
wording, that would be great.

 >  I don't understand the intent here.

Check out the two places where it is called.

> Also you'll noticed I deleted some comments in vc.el.  That's mainly to
> highlight them so we can talk about them now.  Is there a good way to
> stop users from editing remote commits?

We could do something like this: take the remote branch associated with 
the current branch, and its top commit. And then, somehow, see if the 
commit to be edited is reachable by traversing up history.

There likely are some known Git snippets out there on SO or general 
Internet that do these steps, but I haven't looked yet.

Anyway, we could do this check first thing inside 
vc-git-modify-change-comment and, when the operation is dangerous, 
doubly prompt the user whether they want to proceed.

Or, a more involved approach: add a new backend function which would do 
the check. Then log-view-modify-change-comment could abort earlier.

> I feel like I should probably just keep working on this and get it more
> polished and answer some of my own questions before posting here but I'm
> getting kind of frustrated with this.  I am many hours deep into this
> problem.

Please feel free to ask questions.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Dmitry Gutov <dmitry@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Tue, 01 Oct 2024 13:53:02 +0000
Resent-Message-ID: <handler.64055.B64055.17277907243124 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>, Morgan Smith <Morgan.J.Smith@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17277907243124
          (code B ref 64055); Tue, 01 Oct 2024 13:53:02 +0000
Received: (at 64055) by debbugs.gnu.org; 1 Oct 2024 13:52:04 +0000
Received: from localhost ([127.0.0.1]:51435 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1svdIK-0000oK-Fy
	for submit <at> debbugs.gnu.org; Tue, 01 Oct 2024 09:52:04 -0400
Received: from fout-a4-smtp.messagingengine.com ([103.168.172.147]:40705)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dmitry@HIDDEN>) id 1svdIH-0000no-S7
 for 64055 <at> debbugs.gnu.org; Tue, 01 Oct 2024 09:52:03 -0400
Received: from phl-compute-10.internal (phl-compute-10.phl.internal
 [10.202.2.50])
 by mailfout.phl.internal (Postfix) with ESMTP id 9DF641381897;
 Tue,  1 Oct 2024 09:35:27 -0400 (EDT)
Received: from phl-mailfrontend-02 ([10.202.2.163])
 by phl-compute-10.internal (MEProxy); Tue, 01 Oct 2024 09:35:27 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc
 :content-transfer-encoding:content-type:content-type:date:date
 :from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to; s=fm1; t=1727789727;
 x=1727876127; bh=yaqVosHlwvvNrkGk6Fy+XpwAMiMqKRSmw27wEnQtEJ0=; b=
 KkqX8IatxbXWdntBUGIVZPcAz/7F3lSMHVEaR0Os57gvsa330wLoNTDeDOB7AGFL
 MnjqGndaL0Tdka46FfBIwTb3kEyLFcOUUv1rXaVoflvToKzKhILOtPu/BraPuGDe
 68PJmwWQSDY6VjFMoMNvtnWLc8qASNcsFYuX82bjh1UE9JchzS6oGXz5liLXOS7/
 HgPUf9aAbdLdr05Ay02IBqiccNjUc7FOBeNHiGr5e3wPE7+YjAbT5/J9SmCmwQx9
 DEuy4F2Z4QXjvLi5gMvIqzgMTilbMoDVOsy6XHlrYYVGgcM+p/rAB0UZSvijlKIi
 tklDbWMggmXB73vN0WqzJg==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=cc:content-transfer-encoding:content-type
 :content-type:date:date:feedback-id:feedback-id:from:from
 :in-reply-to:in-reply-to:message-id:mime-version:references
 :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy
 :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727789727; x=
 1727876127; bh=yaqVosHlwvvNrkGk6Fy+XpwAMiMqKRSmw27wEnQtEJ0=; b=b
 nFtSFwAFR1NfXud9N+jcEwxkStDYI4YDEHhPvi+YFJS8ttUg87ArZ096KJSt44eZ
 EEYKcvGDAFg1To4ajTQkmdjudcg6COren95oobwTlaWWiHk//cGW4vpVA8Zau2cS
 S3j8xaNUm9S7VqM+S9itPhnb3W7mTDs/WlYEz/hsxWD0XaHRzzF9b3fBYc2QKVPW
 ILVlmZMbULynRGA/JmOSNS6wElpWTOR1h2efSgFtLWDi865WMX1dbFFkKR+2qjhx
 4nEn75NEaDbe8iYghUQM0jhZwx1w7xyUpLbuxBw1egcZ3w8vvdUVCo+XL6tHI4Ws
 urD644BFBTGvd9tcf5uRw==
X-ME-Sender: <xms:n_r7Zi-UHZ57FCXQuNKt1V_IAZzAD07Mzj5bOqxXBcqKlHpoPzWL_Q>
 <xme:n_r7ZituBIsOf9g-zTAFsjuQjenoYWI7ewDKJPPj9LaguFcK_wdONrrGqfnRn9r1t
 1BKr6U1Q1920E7Wiw8>
X-ME-Received: <xmr:n_r7ZoDi4fyFI7W6-sjLhUG5Z_pnFgvHYAgqRTx4q-wV5DWY9JTARFlkjPKLL_5NAtaN>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvddujedgieehucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu
 rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh
 htshculddquddttddmnecujfgurhepkfffgggfuffvfhfhjggtgfesthejredttddvjeen
 ucfhrhhomhepffhmihhtrhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvg
 hvqeenucggtffrrghtthgvrhhnpedthfeuvddtveelgeeuleevvdejveehffevveehvdeu
 ffdtfefhvdeugefgtefgtdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh
 grihhlfhhrohhmpegumhhithhrhiesghhuthhovhdruggvvhdpnhgspghrtghpthhtohep
 fedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepshhpfihhihhtthhonhesshhpfi
 hhihhtthhonhdrnhgrmhgvpdhrtghpthhtohepmhhorhhgrghnrdhjrdhsmhhithhhseho
 uhhtlhhoohhkrdgtohhmpdhrtghpthhtohepieegtdehheesuggvsggsuhhgshdrghhnuh
 drohhrgh
X-ME-Proxy: <xmx:n_r7Zqfcj7DbJIWneimXO8Sizrd9JDem3kGCLJ9JEbItpujN9YIXbA>
 <xmx:n_r7ZnPBtuWetFT1krTsHJrChNNfYSgVcUDOPmBMtD7YNMzCUE_YNQ>
 <xmx:n_r7ZklMiJH3cvCu4Gt6I48DMpH7-VwOb9ClDWqMuOW28M7QK2jONw>
 <xmx:n_r7Zpuie381j4L6og8rU-3-o0s0IoL-CXNa2H6hlvhZtGylpAfAgw>
 <xmx:n_r7ZgqSKK0A3dTOYYG4oHWlLkNTa-fpixlJ_ggZdrhbCfFxlqKhtOK7>
Feedback-ID: i07de48aa:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue,
 1 Oct 2024 09:35:25 -0400 (EDT)
Message-ID: <0e54dd2a-b9da-4a4a-99c4-66f97b922be4@HIDDEN>
Date: Tue, 1 Oct 2024 16:35:21 +0300
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <0e2fda3f-7952-66d3-1b13-19ee31dbad7a@HIDDEN>
 <87v7yco8fg.fsf@HIDDEN>
Content-Language: en-US
From: Dmitry Gutov <dmitry@HIDDEN>
In-Reply-To: <87v7yco8fg.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

On 01/10/2024 05:37, Sean Whitton wrote:
> The difficulty of prompting is that the prompt has to be short to fit in
> the echo area.  But something like
> 
>    This commit is published; are you sure you want to rewrite history?
> 
> is only explanatory to someone who already has a lot of git-specific
> knowledge.  So, by default, we I think we should refuse to rewrite any
> commit that does not appear in*vc-outgoing*.

Yep! That sounds good to me.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Tue, 01 Oct 2024 15:24:02 +0000
Resent-Message-ID: <handler.64055.B64055.172779620219410 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Robert Pluim <rpluim@HIDDEN>
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172779620219410
          (code B ref 64055); Tue, 01 Oct 2024 15:24:02 +0000
Received: (at 64055) by debbugs.gnu.org; 1 Oct 2024 15:23:22 +0000
Received: from localhost ([127.0.0.1]:52047 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sveig-000530-6A
	for submit <at> debbugs.gnu.org; Tue, 01 Oct 2024 11:23:22 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:41278)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1sveie-00052s-KF
 for 64055 <at> debbugs.gnu.org; Tue, 01 Oct 2024 11:23:21 -0400
DKIM-Signature: a=rsa-sha256;
 b=Yun8kWzb+VnwXVupbgbnMHZDXiWIxsHACx7UW9Acx40EHInsHtXLK7MfKKx0gzCNfxI4Gmz6KIdRNBRtyOBR9RX0u6BB1Ci3J5S8fyBLtmWY8bH+WsFc/NLpKvnd6eEbPTbrbbTtNVPk4tV6H+A3SO7mAJ8HlLmigz6C1cC712QgeEz5mwRyTSj+vXUonn6AKNw9ujuNzmJW2Ablb6GSr3dPIDDgkx28gcjYgt6IxtkBkdApufoOCJlNpKCpN7p/iZQSJLKb3AGY0xkYVmF+w/MagJkuT0kx+ZrmAuXNzPXe2yP2sCA0LbqZSC+J5vjUxhyuXd9OrG0/8zfZ3OyFdQ==;
 s=purelymail2; d=spwhitton.name; v=1;
 bh=Ghl+UVrEBZKWHnffxeopWZIru/fG/RlOS05YCEveyGQ=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=NCxc2UOe5xYbYMVi2QhTRKVicwG2JQh6wkSXLGrqVq15Sluao6o1/XpWwkeZSSKj7KMNusEahfG+AAE+JfC/AQ/DKThtgG8YgbCA+dVRv9O3/wKBUH11f9fae6buIxqKsyL/HFrmAHEudEjsho/zuE9dsVEH893o6eaVtZKno/eo+16qp8SWeOQGfMhSDrTUdX82r2MlcvLEGtuIF39K6ru7Cp1wTimI0flYuGhYt6JU37lqDF0epb/+/Uk/HclTWgmDlFAXnUm5FPSeqmlHkd9MmdWDdyeGSPFLvxZYFDsfYJRDVEgfSqqBZOuBbyhhjO2GEltz763EviCBLx+fgg==;
 s=purelymail2; d=purelymail.com; v=1;
 bh=Ghl+UVrEBZKWHnffxeopWZIru/fG/RlOS05YCEveyGQ=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -526779777
 for <64055 <at> debbugs.gnu.org>
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Tue, 01 Oct 2024 15:23:12 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 7F8907E38CF; Tue,  1 Oct 2024 16:23:09 +0100 (BST)
Resent-To: 64055 <at> debbugs.gnu.org
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Resent-Date: Tue, 01 Oct 2024 23:23:09 +0800
Resent-Message-ID: <87cykjn8yq.fsf@HIDDEN>
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <87legmnq4l.fsf@HIDDEN> (Robert Pluim's message of "Wed, 14
 Jun 2023 15:13:30 +0200")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN>
Date: Tue, 01 Oct 2024 10:38:50 +0800
Message-ID: <87r090o8cl.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Wed 14 Jun 2023 at 03:13pm +02, Robert Pluim wrote:

>     Morgan> 'git commit --amend' is actually already built into the Emacs=
 vc system
>     Morgan> and works great.  I don't think you can use it without a diff=
 though.
>
> Fixing that would fit 99.99% of the cases where I want to reword a
> commit message, and I suspect I=CA=BCm not alone.

Like Morgan, I regularly rebase solely to edit commit messages other
than that of the most recent commit.

Morgan, Dmitry, you have both posted WIP on this.  Have you made any
progress?  Are you interested in looking at it again?

--=20
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Tue, 01 Oct 2024 15:25:01 +0000
Resent-Message-ID: <handler.64055.B64055.172779626419461 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Dmitry Gutov <dmitry@HIDDEN>, Morgan Smith <Morgan.J.Smith@HIDDEN>,  64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172779626419461
          (code B ref 64055); Tue, 01 Oct 2024 15:25:01 +0000
Received: (at 64055) by debbugs.gnu.org; 1 Oct 2024 15:24:24 +0000
Received: from localhost ([127.0.0.1]:52057 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1svejf-00053p-If
	for submit <at> debbugs.gnu.org; Tue, 01 Oct 2024 11:24:23 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:41760)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1svejd-00053j-9X
 for 64055 <at> debbugs.gnu.org; Tue, 01 Oct 2024 11:24:21 -0400
DKIM-Signature: a=rsa-sha256;
 b=BxfqB8Wq9AgLilqOD+P2hf7EoA3H9xEZhpl95yl0s1bnRlBCK1sFkTiyCGTnT7EPDznTqr0UmZA4D7q0MX5qK4AazLs8P3QpEreE6//TDtr/xg5tLjuN0IbSMb3jEESvrsp5q2IT8jby53lf16JyxPcsLWJFYhE9xkJKvNf330Qd5k5JTYgygN6eplAj440JG8GdYfQB7a9t5jXUHpjMGlVpxWcYr7C2jfIzRL4AD+1mFWgmMIfP7L6H4zMYCjiBA6HiZsT6WfFBXn8sJ+ag/U8QrlnhiLNrcNub7WpKB06J8B2lpGzuLO5omUUAP7jKOKqHyaaBGwTaDTViKmA+hw==;
 s=purelymail2; d=spwhitton.name; v=1;
 bh=/5YghpOWhCljhRghKiZaFLj4sXQUccJ4M8mNE6bo8Fs=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=iPqo1I6UYkdGREm1gtHB+MCjlFzR2bokjEgDTUoVVlpJInkeidsSN/+M6/vwYBUPCffaS1zVx4qGvWrMfY4uZIWRNmAlBPlOAdBZjCPlKoK/6Ri+YZvc3Wz3Nywty8ewd2tfrrXE5LfIGDMr/tOB71/Pk0RG8JKVbTVSEVjprcy3dajgBpozuTRZGDV+Rsiup484h2dB3yKhowaUqK6kTJUK/IZEC0JHNdhn9SE/p6/jzTCPZJQygi4oR9/VudDZztSCk1Wr7h/P+TtBlSkL/GMQleSO2056e5JnPZv6tiHnzu8L/E0ilIMc/1VLXIhyfNa+awjohfCUdcv1N/cp4w==;
 s=purelymail2; d=purelymail.com; v=1;
 bh=/5YghpOWhCljhRghKiZaFLj4sXQUccJ4M8mNE6bo8Fs=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 791778498; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Tue, 01 Oct 2024 15:24:16 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 9BE987E38CF; Tue,  1 Oct 2024 16:24:13 +0100 (BST)
Resent-To: Morgan Smith <Morgan.J.Smith@HIDDEN>,  64055 <at> debbugs.gnu.org
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Resent-Date: Tue, 01 Oct 2024 23:24:13 +0800
Resent-Message-ID: <874j5vn8wy.fsf@HIDDEN>
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <0e2fda3f-7952-66d3-1b13-19ee31dbad7a@HIDDEN> (Dmitry Gutov's
 message of "Sat, 17 Jun 2023 05:40:09 +0300")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <0e2fda3f-7952-66d3-1b13-19ee31dbad7a@HIDDEN>
Date: Tue, 01 Oct 2024 10:37:07 +0800
Message-ID: <87v7yco8fg.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Sat 17 Jun 2023 at 05:40am +03, Dmitry Gutov wrote:

> We could do something like this: take the remote branch associated with the
> current branch, and its top commit. And then, somehow, see if the commit to be
> edited is reachable by traversing up history.
>
> There likely are some known Git snippets out there on SO or general Internet
> that do these steps, but I haven't looked yet.
>
> Anyway, we could do this check first thing inside vc-git-modify-change-comment
> and, when the operation is dangerous, doubly prompt the user whether they want
> to proceed.

I think that we refuse to proceed, or at least ask for confirmation,
in the case that the commit the user wants to edit does not appear in
*vc-outgoing* (C-x v O).

The difficulty of prompting is that the prompt has to be short to fit in
the echo area.  But something like

  This commit is published; are you sure you want to rewrite history?

is only explanatory to someone who already has a lot of git-specific
knowledge.  So, by default, we I think we should refuse to rewrite any
commit that does not appear in *vc-outgoing*.

Then there could be a defcustom to enable a yes/no prompt (or to enable
unconditionally rewriting).  In the docstring for the defcustom we could
provide a reference to the relevant git documentation, so the user can
find out what this notion of "rewriting history" is all about.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Dmitry Gutov <dmitry@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Tue, 01 Oct 2024 19:33:02 +0000
Resent-Message-ID: <handler.64055.B64055.172781117825762 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>, Robert Pluim <rpluim@HIDDEN>
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172781117825762
          (code B ref 64055); Tue, 01 Oct 2024 19:33:02 +0000
Received: (at 64055) by debbugs.gnu.org; 1 Oct 2024 19:32:58 +0000
Received: from localhost ([127.0.0.1]:53190 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1svicE-0006hS-2R
	for submit <at> debbugs.gnu.org; Tue, 01 Oct 2024 15:32:58 -0400
Received: from fout-a7-smtp.messagingengine.com ([103.168.172.150]:51449)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dmitry@HIDDEN>) id 1svicB-0006hG-Cg
 for 64055 <at> debbugs.gnu.org; Tue, 01 Oct 2024 15:32:56 -0400
Received: from phl-compute-10.internal (phl-compute-10.phl.internal
 [10.202.2.50])
 by mailfout.phl.internal (Postfix) with ESMTP id E9D491381008;
 Tue,  1 Oct 2024 15:32:49 -0400 (EDT)
Received: from phl-mailfrontend-02 ([10.202.2.163])
 by phl-compute-10.internal (MEProxy); Tue, 01 Oct 2024 15:32:49 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc
 :cc:content-transfer-encoding:content-type:content-type:date
 :date:from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to; s=fm1; t=1727811169;
 x=1727897569; bh=OjspDE9GiwCc9PXuTRfwLisIjWU1wMPqDP+CPjVFQgc=; b=
 LL2vQeqIdVAsjD2AYteXcYC9W/MMW4ewZBUULA+H05Gn/huAEiOH4kChYkfWKbFr
 YaIKwSFPcq0fdg85wq17PyYQchNugS2+bF6m5OTjqlTfbioXGs4NrZp9X8s2nzfK
 CBr++r1vh/HgCJfeGMSeUU2Xj+5WCNIAuSilObgsAWOs/YDGhQKN1r+ro2PlI0nn
 PhJcINO3fvKssadZrSVing0QhPO7ba8SacosP1JART1McJyiforfNJBTOnASnJNb
 XI0QWwnM2R1lvpPIKm8qyojHYfmMdXsVXB8SLc6b81MbxwP41D4wbGAanJHGuTjQ
 UIELBMFhs8rSiLZkwfdqMA==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=cc:cc:content-transfer-encoding
 :content-type:content-type:date:date:feedback-id:feedback-id
 :from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy
 :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727811169; x=
 1727897569; bh=OjspDE9GiwCc9PXuTRfwLisIjWU1wMPqDP+CPjVFQgc=; b=m
 N3y5Nw3XEjaJvEV3yBEHBNkpydaOi6uGKCO+ktr0FrlttfXaFho1SCOrGQdIA3xb
 JsooIjEsRIXU4mARZSqCPpyTcZQutuohWHLhEzW93e9ZEMyePonDkrdB3w6U8+OF
 2g0IX//ONdINhaAtRcudoj+XroFEhkTwF0Lw0Ydu6KreMWzyD2JA7xGRJvmw0/Di
 RBmyA0EGHFUsAcWsc92Q/wiPljBPnuxvjTyFBYRs5GgSWJrdDXf4BhekTpiw9M9F
 liNszfiln3Cr8BjTkag7GKcyjwsrkWSZlYbvGimfcLYskKmUTSOmxCLGTOwiTkc3
 x9KeJoDjDUL9aJ54LIKJw==
X-ME-Sender: <xms:YU78ZscrUwC0onXIvaKiaUtF7al06HprwGLpkyoMQJ7RvUCcGRGYMg>
 <xme:YU78ZuOJKBJNl_9HhZnJgdosMYPxdt_feZwFKNadmEqKfCkG4Nedd9CWndmO_FfmG
 wSBpWyS0eaHiAMRtIY>
X-ME-Received: <xmr:YU78Ztj_yBWtDv51OzR_Lsn5eQ8X9d2ALcwpb8wXqN6kza4g7OrR4PqJdxXIzqdp2NE>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvddujedgudefiecutefuodetggdotefrod
 ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp
 uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg
 hnthhsucdlqddutddtmdenucfjughrpefkffggfgfuvfevfhfhjggtgfesthejredttddv
 jeenucfhrhhomhepffhmihhtrhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrd
 guvghvqeenucggtffrrghtthgvrhhnpeetudeljeegheetgfehgeejkeeuhedvveeikeeu
 fedtvddtveefhfdvveegudejheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh
 epmhgrihhlfhhrohhmpegumhhithhrhiesghhuthhovhdruggvvhdpnhgspghrtghpthht
 ohepgedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepshhpfihhihhtthhonhessh
 hpfihhihhtthhonhdrnhgrmhgvpdhrtghpthhtoheprhhplhhuihhmsehgmhgrihhlrdgt
 ohhmpdhrtghpthhtohepmhhorhhgrghnrdhjrdhsmhhithhhsehouhhtlhhoohhkrdgtoh
 hmpdhrtghpthhtohepieegtdehheesuggvsggsuhhgshdrghhnuhdrohhrgh
X-ME-Proxy: <xmx:YU78Zh9rdEw16wpEfwQ7W8jPk3YiVYVc4lVM1b5EfaA4Qvd6uXUmng>
 <xmx:YU78Zos6pwRFmMxlWeBytt3mv3nGOkxS6csPClij8agckA_8oD7duw>
 <xmx:YU78ZoFr1zwdYr-oBpRAH2ZawwB36FRs8cFqkfZNvkgnPC8hTzrNhw>
 <xmx:YU78ZnM92N0odqfg5GG7kkDk-VYQ8A1Xmky7lVbN_bh9zD0vlZLHhQ>
 <xmx:YU78ZqLnmorO5FxW8SI68RA67pDjC0nMS6zwUKjqyTN0dfJiJ0nFUDg7>
Feedback-ID: i07de48aa:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue,
 1 Oct 2024 15:32:47 -0400 (EDT)
Message-ID: <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
Date: Tue, 1 Oct 2024 22:32:45 +0300
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
Content-Language: en-US
From: Dmitry Gutov <dmitry@HIDDEN>
In-Reply-To: <87r090o8cl.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

On 01/10/2024 05:38, Sean Whitton wrote:
> Morgan, Dmitry, you have both posted WIP on this.  Have you made any
> progress?  Are you interested in looking at it again?

I haven't worked on it, sorry.

If my old WIP looks useful, you're quite welcome to use it as a starting 
point. No need for attribution or anything like that.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Wed, 02 Oct 2024 00:02:02 +0000
Resent-Message-ID: <handler.64055.B64055.17278272895702 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Dmitry Gutov <dmitry@HIDDEN>
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>, Robert Pluim <rpluim@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17278272895702
          (code B ref 64055); Wed, 02 Oct 2024 00:02:02 +0000
Received: (at 64055) by debbugs.gnu.org; 2 Oct 2024 00:01:29 +0000
Received: from localhost ([127.0.0.1]:54481 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1svmo5-0001Tu-7X
	for submit <at> debbugs.gnu.org; Tue, 01 Oct 2024 20:01:29 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:37430)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1svmo3-0001Tk-1I
 for 64055 <at> debbugs.gnu.org; Tue, 01 Oct 2024 20:01:28 -0400
DKIM-Signature: a=rsa-sha256;
 b=r42fXmX60kYfhMc1lV7f25d7vgVszKZqEip+LWeRTPimWUIumCbNsy4Sl61Yfp5/nbsGKmuFeTwbvNhgoif23Bey2aq8surWAcKCpSt3YfbwaTVAU+Iib+i31HYmAcT2N6FPSfpT6mItp3DY5+6tf/Bk31uyPV63ZUvlx7xLeE3Ryd2780Za730qsrKFPpo6vLrgT+0H5lTWO2VrbzTNZuAheDCoiAm5D1+GmAQuTHEQXdXOfkTXE32orMeseHH7nYHLZCfew3Zr053+DxD5hiHkcsXNf4k8g2W7z+HHzQREoikJYsoD4Sp8DURDtwExCVs77aHDzEvgpQVlzsIKjQ==;
 s=purelymail2; d=spwhitton.name; v=1;
 bh=uqXu3QcSwI9B/IKk0XJmGfJfuHU6NO89sLaFcf0UDGQ=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=qpYdP4DeyMrOoxDW+niJ5YUVZXAf5TstdPiKWHceHmZfdpNNzR/O5HaFdWMPTibyaZxJBq/WRIRmU/OGoQnbLQimI0bNWFgfKPrZn1QDtHBBu0CNbM5ygDUrFD6kbHggFuxomnaUSc1R6j/qOla8KKLLxmxMKkfCW4tcZsIbvEDgj3Xvg/a68dEImkepqLpkeAtqOK58kW6d/Bvkxof8edAitQq86Z894wfjkLF2rsj6TxrbeElMKfOnj+OwShKha+2AsozysqbqzU/vmApm8iH1KVuYXyjdYZ/TLL8pzr1sprEhZ+EcO3ZmcVkastg6GVJgjYbWW+Yw0mkJ+DUq+A==;
 s=purelymail2; d=purelymail.com; v=1;
 bh=uqXu3QcSwI9B/IKk0XJmGfJfuHU6NO89sLaFcf0UDGQ=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1808192329; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Wed, 02 Oct 2024 00:01:18 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 9A2347E1FAB; Wed,  2 Oct 2024 01:01:16 +0100 (BST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN> (Dmitry Gutov's
 message of "Tue, 1 Oct 2024 22:32:45 +0300")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
Date: Wed, 02 Oct 2024 08:01:16 +0800
Message-ID: <874j5vgypf.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Tue 01 Oct 2024 at 10:32pm +03, Dmitry Gutov wrote:

> On 01/10/2024 05:38, Sean Whitton wrote:
>> Morgan, Dmitry, you have both posted WIP on this.  Have you made any
>> progress?  Are you interested in looking at it again?
>
> I haven't worked on it, sorry.
>
> If my old WIP looks useful, you're quite welcome to use it as a starting
> point. No need for attribution or anything like that.

Could you point me at that WIP, please?  It's not posted to this bug and
I couldn't find it in my mail archives.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Dmitry Gutov <dmitry@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Wed, 02 Oct 2024 23:22:02 +0000
Resent-Message-ID: <handler.64055.B64055.1727911271315 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>, Robert Pluim <rpluim@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.1727911271315
          (code B ref 64055); Wed, 02 Oct 2024 23:22:02 +0000
Received: (at 64055) by debbugs.gnu.org; 2 Oct 2024 23:21:11 +0000
Received: from localhost ([127.0.0.1]:59493 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sw8ec-000050-Oq
	for submit <at> debbugs.gnu.org; Wed, 02 Oct 2024 19:21:11 -0400
Received: from fout-a8-smtp.messagingengine.com ([103.168.172.151]:60765)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dmitry@HIDDEN>) id 1sw8ea-0008WF-RM
 for 64055 <at> debbugs.gnu.org; Wed, 02 Oct 2024 19:21:10 -0400
Received: from phl-compute-09.internal (phl-compute-09.phl.internal
 [10.202.2.49])
 by mailfout.phl.internal (Postfix) with ESMTP id 579C113800BE;
 Wed,  2 Oct 2024 19:21:02 -0400 (EDT)
Received: from phl-mailfrontend-02 ([10.202.2.163])
 by phl-compute-09.internal (MEProxy); Wed, 02 Oct 2024 19:21:02 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc
 :cc:content-type:content-type:date:date:from:from:in-reply-to
 :in-reply-to:message-id:mime-version:references:reply-to:subject
 :subject:to:to; s=fm1; t=1727911262; x=1727997662; bh=QlSYnmpIoL
 lLy1Gw0k462/vS9PiWrIjPBIgoFwWH4LE=; b=SfqGZU0nqBODYStmiHlX/y0JdC
 O4BV5I1wSPWD8wG8WJdzZ5xODGasZ/qPNgKkc3nYIfHoNLMZqRWh0xbTUkC0RG1e
 qhHu6s4XKSUIzlux4oG4JR1CbVcMvEhm+a5004gKBaRGYzQo+pCyJt/XHfUGtMWC
 D0XOJzZadZqXFY+0i292nte42xVjxLXw8gGfuAnQKEtHoyAvTtd8srLt2JJCiCif
 6HxcCyM9iRrIIIn+4DGK+P9ZvU/WO5mAcAGuKJK8ez3vRFXsrnSdeb7DrHKMM8uh
 qSnQyMN/kNwyl0TU1IgESBzsC3wLcPl5cI8bc5Gs4P9x3F91H80LYpl+9E5g==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=cc:cc:content-type:content-type:date:date
 :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to
 :message-id:mime-version:references:reply-to:subject:subject:to
 :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=
 fm2; t=1727911262; x=1727997662; bh=QlSYnmpIoLlLy1Gw0k462/vS9PiW
 rIjPBIgoFwWH4LE=; b=anjfe8YxbcGH+q7f8wK8w50+t6Y76kK/tFxSRbFGXVsE
 9FyeJIx5wfAD2mo0fePIFUx9hQOnEuzT+juWd9sCeiu+l902qnQFMNYIip0URgUa
 WlgIFJyv7oJldGlrW6zoCKVHypawB+qh5QFQLiat5+LnVxrH+YLDCgTJH0fZ+lSQ
 AtU2gNfmW8EqVfrAEmOGRSiEAA5MFOGBR7OTexj4j872BytgFnAYzzZkGHvwluQM
 QfW/cMcaHcAq2XSI0Ml02n/OGvJfXzpsp9AOBWwfhBwZHqJGrgA7a1SRBWZrc2Gg
 R4zjMbOqT3pljObLfGN0Eu5qDEtCkaI/vGzQNQsU1g==
X-ME-Sender: <xms:XdX9ZmOgwm2oKDdDJjt5eqgNuGs3wkog_o_t4XTQsus4wpw8CnGTHw>
 <xme:XdX9Zk9YMZWrMTktY5vJVgqqPpodBHB-A6nyxrve6DelPPxdTUwxhV37dHKAR9djw
 hh-Oj2MmcWH8jLmPRI>
X-ME-Received: <xmr:XdX9ZtTrjb0Zie7Wpa5c7HdVWEV6RHXRYIX8HEWb6JeNxIIvPxakO29KqnHhElcb-lY>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvddvtddgvddvucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu
 rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh
 htshculddquddttddmnecujfgurheptgfkffggfgfuvfevfhfhjgesmhdtreertddvjeen
 ucfhrhhomhepffhmihhtrhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvg
 hvqeenucggtffrrghtthgvrhhnpeehleefudekudduveekieelgfeiffdvkefhkeeljeeu
 jeegueekveffkeejjeevheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh
 grihhlfhhrohhmpegumhhithhrhiesghhuthhovhdruggvvhdpnhgspghrtghpthhtohep
 gedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepshhpfihhihhtthhonhesshhpfi
 hhihhtthhonhdrnhgrmhgvpdhrtghpthhtoheprhhplhhuihhmsehgmhgrihhlrdgtohhm
 pdhrtghpthhtohepmhhorhhgrghnrdhjrdhsmhhithhhsehouhhtlhhoohhkrdgtohhmpd
 hrtghpthhtohepieegtdehheesuggvsggsuhhgshdrghhnuhdrohhrgh
X-ME-Proxy: <xmx:XdX9ZmtNobu5oHItpD66o3iu_XIPOq1z1IXnuX_Gdi1ulp-ZoHb54g>
 <xmx:XdX9ZufcIzQl9RUJqnlmypf8HO3LoKmEbdr0bgQpvYYcOh6PnC2-YQ>
 <xmx:XdX9Zq00l-PJj6GC__LKhJmQLJ57db3tSDy104KqDJQE5f2Qsa_C_Q>
 <xmx:XdX9Zi9tzsi-kk9PO93l-FO_aSAs4HW7yyDJXqI45R2hbQMCbDk9Og>
 <xmx:XtX9Zt7SKGZW843w9KqXqKzAjv-XDP97PfpaSjnKAEsdYia57u9cjp7U>
Feedback-ID: i07de48aa:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed,
 2 Oct 2024 19:20:59 -0400 (EDT)
Content-Type: multipart/mixed; boundary="------------TUY6IpFcxjgBq2zjdcWMEEwP"
Message-ID: <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
Date: Thu, 3 Oct 2024 02:20:56 +0300
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
Content-Language: en-US
From: Dmitry Gutov <dmitry@HIDDEN>
In-Reply-To: <874j5vgypf.fsf@HIDDEN>
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

This is a multi-part message in MIME format.
--------------TUY6IpFcxjgBq2zjdcWMEEwP
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit

On 02/10/2024 03:01, Sean Whitton wrote:
> On Tue 01 Oct 2024 at 10:32pm +03, Dmitry Gutov wrote:
> 
>> On 01/10/2024 05:38, Sean Whitton wrote:
>>> Morgan, Dmitry, you have both posted WIP on this.  Have you made any
>>> progress?  Are you interested in looking at it again?
>> I haven't worked on it, sorry.
>>
>> If my old WIP looks useful, you're quite welcome to use it as a starting
>> point. No need for attribution or anything like that.
> Could you point me at that WIP, please?  It's not posted to this bug and
> I couldn't find it in my mail archives.

Yeah, sorry about that.

Here's the diff I have lying around from back then. Not sure how much it 
will help - the changes in log-view.el seems like an improvement (more 
generic approach), whereas the vc-git-modify-change-comment definition 
might be better in Morgan's patch (it /would/ be nice to be able to edit 
older commits, not just the most recent one).
--------------TUY6IpFcxjgBq2zjdcWMEEwP
Content-Type: text/x-patch; charset=UTF-8;
 name="log-view-modify-change-comment.diff"
Content-Disposition: attachment;
 filename="log-view-modify-change-comment.diff"
Content-Transfer-Encoding: base64

ZGlmZiAtLWdpdCBhL2xpc3AvdmMvbG9nLXZpZXcuZWwgYi9saXNwL3ZjL2xvZy12aWV3LmVs
CmluZGV4IDA1NGMyYjkxMzQuLjg3OTRjZTVkMzEgMTAwNjQ0Ci0tLSBhL2xpc3AvdmMvbG9n
LXZpZXcuZWwKKysrIGIvbGlzcC92Yy9sb2ctdmlldy5lbApAQCAtNTI5LDM0ICs1MjksMTgg
QEAgbG9nLXZpZXctZmluZC1yZXZpc2lvbgogCQkJCQkobG9nLXZpZXctY3VycmVudC10YWcp
KSkpKQogCiAKLShkZWZ1biBsb2ctdmlldy1leHRyYWN0LWNvbW1lbnQgKCkKLSAgIlBhcnNl
IGNvbW1lbnQgZnJvbSBhcm91bmQgdGhlIGN1cnJlbnQgcG9pbnQgaW4gdGhlIGxvZy4iCi0g
IChzYXZlLWV4Y3Vyc2lvbgotICAgIChsZXQgKHN0IGVuIChiYWNrZW5kICh2Yy1iYWNrZW5k
IChsb2ctdmlldy1jdXJyZW50LWZpbGUpKSkpCi0gICAgICAobG9nLXZpZXctZW5kLW9mLWRl
ZnVuKQotICAgICAgKGNvbmQgKChlcSBiYWNrZW5kICdTVk4pCi0JICAgICAoZm9yd2FyZC1s
aW5lIC0xKSkpCi0gICAgICAoc2V0cSBlbiAocG9pbnQpKQotICAgICAgKG9yIChsb2ctdmll
dy1jdXJyZW50LWVudHJ5IG5pbCB0KQotICAgICAgICAgICh0aHJvdyAnYmVnaW5uaW5nLW9m
LWJ1ZmZlciBuaWwpKQotICAgICAgKGNvbmQgKChtZW1xIGJhY2tlbmQgJyhTQ0NTIFJDUyBD
VlMgU1ZOKSkKLQkgICAgIChmb3J3YXJkLWxpbmUgMikpCi0JICAgICgoZXEgYmFja2VuZCAn
SGcpCi0JICAgICAoZm9yd2FyZC1saW5lIDQpCi0JICAgICAocmUtc2VhcmNoLWZvcndhcmQg
InN1bW1hcnk6ICoiIG5pbCB0KSkpCi0gICAgICAoc2V0cSBzdCAocG9pbnQpKQotICAgICAg
KGJ1ZmZlci1zdWJzdHJpbmcgc3QgZW4pKSkpCi0KIChkZWNsYXJlLWZ1bmN0aW9uIHZjLW1v
ZGlmeS1jaGFuZ2UtY29tbWVudCAidmMiIChmaWxlcyByZXYgb2xkY29tbWVudCkpCiAKIChk
ZWZ1biBsb2ctdmlldy1tb2RpZnktY2hhbmdlLWNvbW1lbnQgKCkKICAgIkVkaXQgdGhlIGNo
YW5nZSBjb21tZW50IGRpc3BsYXllZCBhdCBwb2ludC4iCiAgIChpbnRlcmFjdGl2ZSkKLSAg
KHZjLW1vZGlmeS1jaGFuZ2UtY29tbWVudCAobGlzdCAoaWYgbG9nLXZpZXctcGVyLWZpbGUt
bG9ncwotCQkJCSAgICAgIChsb2ctdmlldy1jdXJyZW50LWZpbGUpCi0JCQkJICAgIChjYXIg
bG9nLXZpZXctdmMtZmlsZXNldCkpKQotCQkJICAgIChsb2ctdmlldy1jdXJyZW50LXRhZykK
LQkJCSAgICAobG9nLXZpZXctZXh0cmFjdC1jb21tZW50KSkpCisgIChsZXQqICgoZmlsZSAo
YW5kIGxvZy12aWV3LXBlci1maWxlLWxvZ3MKKyAgICAgICAgICAgICAgICAgICAgKGxvZy12
aWV3LWN1cnJlbnQtZmlsZSkpKQorICAgICAgICAgKHJldmlzaW9uIChsb2ctdmlldy1jdXJy
ZW50LXRhZykpCisgICAgICAgICAoYmFja2VuZCAodmMtcmVzcG9uc2libGUtYmFja2VuZCAo
b3IgZmlsZSAoY2FyIGxvZy12aWV3LXZjLWZpbGVzZXQpKSkpKQorICAgICh2Yy1tb2RpZnkt
Y2hhbmdlLWNvbW1lbnQgKGxpc3QgZmlsZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgIHJldmlzaW9uCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAodmMtY2FsbC1i
YWNrZW5kIGJhY2tlbmQgJ2V4cGFuZGVkLWxvZy1lbnRyeSkpKSkKIAogKGRlZnVuIGxvZy12
aWV3LWFubm90YXRlLXZlcnNpb24gKHBvcykKICAgIkFubm90YXRlIHRoZSB2ZXJzaW9uIGF0
IFBPUy4KZGlmZiAtLWdpdCBhL2xpc3AvdmMvdmMtZ2l0LmVsIGIvbGlzcC92Yy92Yy1naXQu
ZWwKaW5kZXggY2E0YzY2YTA2ZC4uZDc5MmVlYjQyOSAxMDA2NDQKLS0tIGEvbGlzcC92Yy92
Yy1naXQuZWwKKysrIGIvbGlzcC92Yy92Yy1naXQuZWwKQEAgLTk1MCw2ICs5NTAsNDkgQEAg
dmMtZ2l0LWNoZWNraW4KIAkJICAgIChpZiBvbmx5IChsaXN0ICItLW9ubHkiICItLSIpICco
Ii1hIikpKSkpCiAgICAgKGlmIChhbmQgbXNnLWZpbGUgKGZpbGUtZXhpc3RzLXAgbXNnLWZp
bGUpKSAoZGVsZXRlLWZpbGUgbXNnLWZpbGUpKSkpCiAKKyhkZWZ1biB2Yy1naXQtbW9kaWZ5
LWNoYW5nZS1jb21tZW50IChmaWxlcyByZXYgY29tbWVudCkKKyAgKGxldCogKChmaWxlMSAo
b3IgKGNhciBmaWxlcykgZGVmYXVsdC1kaXJlY3RvcnkpKQorICAgICAgICAgKHJvb3QgKHZj
LWdpdC1yb290IGZpbGUxKSkKKyAgICAgICAgIChkZWZhdWx0LWRpcmVjdG9yeSAoZXhwYW5k
LWZpbGUtbmFtZSByb290KSkKKyAgICAgICAgIChwY3N3IGNvZGluZy1zeXN0ZW0tZm9yLXdy
aXRlKQorICAgICAgICAgKGNvZGluZy1zeXN0ZW0tZm9yLXdyaXRlCisgICAgICAgICAgOzsg
T24gTVMtV2luZG93cywgd2UgbXVzdCBlbmNvZGUgY29tbWFuZC1saW5lIGFyZ3VtZW50cyBp
bgorICAgICAgICAgIDs7IHRoZSBzeXN0ZW0gY29kZXBhZ2UuCisgICAgICAgICAgKGlmIChl
cSBzeXN0ZW0tdHlwZSAnd2luZG93cy1udCkKKyAgICAgICAgICAgICAgbG9jYWxlLWNvZGlu
Zy1zeXN0ZW0KKyAgICAgICAgICAgIChvciBjb2Rpbmctc3lzdGVtLWZvci13cml0ZSB2Yy1n
aXQtY29tbWl0cy1jb2Rpbmctc3lzdGVtKSkpCisgICAgICAgICAobXNnLWZpbGUKKyAgICAg
ICAgICA7OyBPbiBNUy1XaW5kb3dzLCBwYXNzIHRoZSBjb21taXQgbG9nIG1lc3NhZ2UgdGhy
b3VnaCBhCisgICAgICAgICAgOzsgZmlsZSwgdG8gd29yayBhcm91bmQgdGhlIGxpbWl0YXRp
b24gdGhhdCBjb21tYW5kLWxpbmUKKyAgICAgICAgICA7OyBhcmd1bWVudHMgbXVzdCBiZSBp
biB0aGUgc3lzdGVtIGNvZGVwYWdlLCBhbmQgdGhlcmVmb3JlCisgICAgICAgICAgOzsgbWln
aHQgbm90IHN1cHBvcnQgdGhlIG5vbi1BU0NJSSBjaGFyYWN0ZXJzIGluIHRoZSBsb2cKKyAg
ICAgICAgICA7OyBtZXNzYWdlLiAgSGFuZGxlIGFsc28gcmVtb3RlIGZpbGVzLgorICAgICAg
ICAgIChpZiAoZXEgc3lzdGVtLXR5cGUgJ3dpbmRvd3MtbnQpCisgICAgICAgICAgICAgIChs
ZXQgKChkZWZhdWx0LWRpcmVjdG9yeSAoZmlsZS1uYW1lLWRpcmVjdG9yeSBmaWxlMSkpKQor
ICAgICAgICAgICAgICAgIChtYWtlLW5lYXJieS10ZW1wLWZpbGUgImdpdC1tc2ciKSkpKSkK
KyAgICAoY2wtZmxldCAoKGJvb2xlYW4tYXJnLWZuCisgICAgICAgICAgICAgICAoYXJndW1l
bnQpCisgICAgICAgICAgICAgICAobGFtYmRhICh2YWx1ZSkgKHdoZW4gKGVxdWFsIHZhbHVl
ICJ5ZXMiKSAobGlzdCBhcmd1bWVudCkpKSkpCisgICAgICA7OyBXaGVuIG9wZXJhdGluZyBv
biB0aGUgd2hvbGUgdHJlZSwgYmV0dGVyIHBhc3MgIi1hIiB0aGFuICIuIiwgc2luY2UgIi4i
CisgICAgICA7OyBmYWlscyB3aGVuIHdlJ3JlIGNvbW1pdHRpbmcgYSBtZXJnZS4KKyAgICAg
IChhcHBseSAndmMtZ2l0LWNvbW1hbmQgbmlsIDAgbmlsCisgICAgICAgICAgICAgKG5jb25j
IChpZiBtc2ctZmlsZSAobGlzdCAiY29tbWl0IiAiLUYiCisgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAoZmlsZS1sb2NhbC1uYW1lIG1zZy1maWxlKSkKKyAgICAg
ICAgICAgICAgICAgICAgICAobGlzdCAiY29tbWl0IiAiLW0iKSkKKyAgICAgICAgICAgICAg
ICAgICAgKGxldCAoKGFyZ3MKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIChsb2ctZWRp
dC1leHRyYWN0LWhlYWRlcnMKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBgKCgiQXV0
aG9yIiAuICItLWF1dGhvciIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoIk5v
LVZlcmlmeSIgLiAsKGJvb2xlYW4tYXJnLWZuICItLW5vLXZlcmlmeSIpKQorICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgKCJTaWduLU9mZiIgLiAsKGJvb2xlYW4tYXJnLWZuICIt
LXNpZ25vZmYiKSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29tbWVudCkpKQor
ICAgICAgICAgICAgICAgICAgICAgICh3aGVuIG1zZy1maWxlCisgICAgICAgICAgICAgICAg
ICAgICAgICAobGV0ICgoY29kaW5nLXN5c3RlbS1mb3Itd3JpdGUKKyAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAob3IgcGNzdyB2Yy1naXQtY29tbWl0cy1jb2Rpbmctc3lzdGVt
KSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICh3cml0ZS1yZWdpb24gKGNhciBhcmdz
KSBuaWwgbXNnLWZpbGUpKQorICAgICAgICAgICAgICAgICAgICAgICAgKHNldHEgYXJncyAo
Y2RyIGFyZ3MpKSkKKyAgICAgICAgICAgICAgICAgICAgICBhcmdzKSkpKQorICAgIChpZiAo
YW5kIG1zZy1maWxlIChmaWxlLWV4aXN0cy1wIG1zZy1maWxlKSkgKGRlbGV0ZS1maWxlIG1z
Zy1maWxlKSkpKQorCiAoZGVmdW4gdmMtZ2l0LWZpbmQtcmV2aXNpb24gKGZpbGUgcmV2IGJ1
ZmZlcikKICAgKGxldCogKHByb2Nlc3MtZmlsZS1zaWRlLWVmZmVjdHMKIAkgKGNvZGluZy1z
eXN0ZW0tZm9yLXJlYWQgJ2JpbmFyeSkK

--------------TUY6IpFcxjgBq2zjdcWMEEwP--

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Thu, 10 Oct 2024 02:40:02 +0000
Resent-Message-ID: <handler.64055.B64055.17285279784061 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Dmitry Gutov <dmitry@HIDDEN>, Robert Pluim <rpluim@HIDDEN>, Morgan Smith <Morgan.J.Smith@HIDDEN>,  64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17285279784061
          (code B ref 64055); Thu, 10 Oct 2024 02:40:02 +0000
Received: (at 64055) by debbugs.gnu.org; 10 Oct 2024 02:39:38 +0000
Received: from localhost ([127.0.0.1]:58152 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1syj5V-00013R-Ca
	for submit <at> debbugs.gnu.org; Wed, 09 Oct 2024 22:39:37 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:57682)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1syj5T-000139-J1
 for 64055 <at> debbugs.gnu.org; Wed, 09 Oct 2024 22:39:36 -0400
DKIM-Signature: a=rsa-sha256;
 b=okxbch9AwlZTbOmWvfos58LMZGOtiCjMJSlg630+Od1dlGqTDGn7KyvdoWVLP7rP6uf5R7KYKXwiv9TbAjjXk4qNI9FqDuYlGiVkib940PQNFZ0eg8GUK2mCKcHuon70acXAAnYmoW5c14TI5Wyo+3Z9dD+Iakig+oxXuNBpesEGO42dJX7rW1zwjG1lZg/5EyTmal7gbkfBb++oLziuYo8GRFhDTJXwOl1n9qwFBaNMNgvCndh9D4zow7Y32pL4m/f3FDJv/fHwez+X1A2rNxd4VSwE2G068KAE4h0oareAfp8VFHV+2U9AO2T6QaCgB5c+5PWJDZiff/kZ6aLIGA==;
 s=purelymail3; d=spwhitton.name; v=1;
 bh=D/ttVFPiGc6eNSsujKESe1+jDnMSfc++lwaC5rBFM9w=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=Jwd3MDfXQISgNbXk1Xb/jNNxTZMOdh/DiOt9FL6/5GEkFsbVwHtXH3zKzWJD8FB2rWVn2bFncrDZ7/j0/Si36H7SaQZjpvgp5YB8tIX2zpbVyYZLQF65D9BJw5/cvCQxcHXDuQzoB6VrsnZaFlvh47H+3rEAX8JgHvTdfnpilEL3Db9tkzoL+0LWG7cZzsqFJi8o0MpQJPH/69nfpSZnP8qOnMPQoNC07aw/Uwl4ATSOafa6ZaLZQHCtHsFe0H+X7FAzv/lrhNcWyl3xWioqk2aV46kzn0O10Ylv9S/1ZEE/ax9JTaURNeaHoLzp7TE6M7jHtnvBXsARr9HG4sUBHw==;
 s=purelymail3; d=purelymail.com; v=1;
 bh=D/ttVFPiGc6eNSsujKESe1+jDnMSfc++lwaC5rBFM9w=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -1568615792; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Thu, 10 Oct 2024 02:39:15 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id CBAA87E7EB2; Thu, 10 Oct 2024 10:39:12 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN> (Dmitry Gutov's
 message of "Thu, 3 Oct 2024 02:20:56 +0300")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
Date: Thu, 10 Oct 2024 10:39:12 +0800
Message-ID: <87ed4obs1b.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

In Dmitry's patch he takes the approach of calling the
expanded-log-entry backend function to get the message to edit.
This is not a real VC backend function -- in fact it's a log-view
feature, log-view-expanded-log-entry-function.

So one thing we could do is add a VC backend action which returns just
the message text that a human might want to edit.
Probably a backend action called `get-change-comment'.

I think, though, that there might be subtle complexities there.  For
example, should there be a FILES argument, or just a REVISION argument?
For Git and Hg it's just REVISION, but we wouldn't want to bake that in.

I think, therefore, that the approach of parsing text out of the
log-view buffer is more future-proof, even though it's complex.
So please see the following WIP patch.
-- >8 --

---
 lisp/vc/log-view.el | 48 +++++++++++++++++++++++++++++++--------------
 lisp/vc/vc-git.el   |  9 +++++++++
 lisp/vc/vc-hg.el    |  8 ++++++++
 3 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index e9e6602e414..f2bfe642390 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -520,23 +520,41 @@ log-view-find-revision
                                         log-view-vc-backend))))

+(defun log-view--default-extract-comment-function ()
+  (when (memq log-view-vc-backend '(SCCS RCS CVS SVN))
+    (delete-region (pos-bol) (pos-bol 3)))
+  (goto-char (point-max))
+  (when (eq log-view-vc-backend 'SVN)
+    (delete-region (pos-bol 0) (point)))
+  (buffer-string))
+
+;; We want the possibility of something backend-specific here because
+;; there are all sorts of possibilities for how the comment needs to be
+;; extracted.  For example, if the user has customized a variable like
+;; `vc-git-log-switches' then that could change how to parse out the
+;; message in `vc-git-log-view-mode'.
+(defvar log-view-extract-comment-function
+  #'log-view--default-extract-comment-function
+  "Function to return the free text part of a Log View entry.
+`log-view-extract-comment' calls this with no arguments in a
+temporary buffer containing the full text of the Log View entry.
+The default value works for the SCCS, RCS, CVS and SVN backends.")
+
 (defun log-view-extract-comment ()
   "Parse comment from around the current point in the log."
-  (save-excursion
-    (let (st en (backend (vc-backend (log-view-current-file))))
-      (log-view-end-of-defun)
-      (cond ((eq backend 'SVN)
-	     (forward-line -1)))
-      (setq en (point))
-      (or (log-view-current-entry nil t)
-          (throw 'beginning-of-buffer nil))
-      (cond ((memq backend '(SCCS RCS CVS SVN))
-	     (forward-line 2))
-	    ((eq backend 'Hg)
-	     (forward-line 4)
-	     (re-search-forward "summary: *" nil t)))
-      (setq st (point))
-      (buffer-substring st en))))
+  (let* ((entry (or (log-view-current-entry)
+                    (throw 'beginning-of-buffer nil)))
+         (text (if log-view-expanded-log-entry-function
+                   (funcall log-view-expanded-log-entry-function
+                            (cadr entry))
+                 (save-excursion
+                   (goto-char (car entry))
+                   (log-view-end-of-defun)
+                   (buffer-substring (car entry) (point))))))
+    (with-temp-buffer
+      (insert text)
+      (goto-char (point-min))
+      (funcall log-view-extract-comment-function))))

 (declare-function vc-modify-change-comment "vc" (files rev oldcomment))

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 05400523048..0af4e4e4600 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1577,6 +1577,7 @@ log-view-file-re
 (defvar log-view-font-lock-keywords)
 (defvar log-view-per-file-logs)
 (defvar log-view-expanded-log-entry-function)
+(defvar log-view-extract-comment-function)

 (define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View"
   (require 'add-log) ;; We need the faces add-log.
@@ -1592,6 +1593,8 @@ vc-git-log-view-mode
     (setq truncate-lines t)
     (setq-local log-view-expanded-log-entry-function
                 'vc-git-expanded-log-entry))
+  (setq-local log-view-extract-comment-function
+              #'vc-git--extract-comment)
   (setq-local log-view-font-lock-keywords
        (if (not (memq vc-log-view-type '(long log-search with-diff)))
 	   (list (cons (nth 1 vc-git-root-log-format)
@@ -1650,6 +1653,12 @@ vc-git-expanded-log-entry
         (forward-line))
       (buffer-string))))

+(defun vc-git--extract-comment ()
+  (re-search-forward "^    " nil t)
+  (delete-region (point-min) (point))
+  ;; now deindent
+)
+
 (defun vc-git-region-history (file buffer lfrom lto)
   "Insert into BUFFER the history of FILE for lines LFROM to LTO.
 This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"."
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 876d86dc24f..9a9c9c41997 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -425,6 +425,7 @@ log-view-file-re
 (defvar log-view-font-lock-keywords)
 (defvar log-view-per-file-logs)
 (defvar log-view-expanded-log-entry-function)
+(defvar log-view-extract-comment-function)

 (define-derived-mode vc-hg-log-view-mode log-view-mode "Hg-Log-View"
   (require 'add-log) ;; we need the add-log faces
@@ -440,6 +441,8 @@ vc-hg-log-view-mode
     (setq truncate-lines t)
     (setq-local log-view-expanded-log-entry-function
                 'vc-hg-expanded-log-entry))
+  (setq-local log-view-extract-comment-function
+              #'vc-hg--extract-comment)
   (setq-local log-view-font-lock-keywords
        (if (eq vc-log-view-type 'short)
 	   (list (cons (nth 1 vc-hg-root-log-format)
@@ -541,6 +544,11 @@ vc-hg-expanded-log-entry
       (goto-char (point-max))
       (buffer-string))))

+(defun vc-hg--extract-comment ()
+  (forward-line 4)
+  (re-search-forward "summary: *" nil t)
+  (buffer-substring (point) (point-max)))
+
 (defun vc-hg-revision-table (files)
   (let ((default-directory (file-name-directory (car files))))
     (with-temp-buffer

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Thu, 10 Oct 2024 02:46:02 +0000
Resent-Message-ID: <handler.64055.B64055.17285283605719 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Morgan Smith <Morgan.J.Smith@HIDDEN>, 64055 <at> debbugs.gnu.org, Dmitry Gutov <dgutov@HIDDEN>, Robert Pluim <rpluim@HIDDEN>
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17285283605719
          (code B ref 64055); Thu, 10 Oct 2024 02:46:02 +0000
Received: (at 64055) by debbugs.gnu.org; 10 Oct 2024 02:46:00 +0000
Received: from localhost ([127.0.0.1]:58173 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1syjBf-0001UB-HQ
	for submit <at> debbugs.gnu.org; Wed, 09 Oct 2024 22:45:59 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:35524)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1syjBd-0001Tv-Fh
 for 64055 <at> debbugs.gnu.org; Wed, 09 Oct 2024 22:45:58 -0400
DKIM-Signature: a=rsa-sha256;
 b=e9obipm1vaiwTdwF8/KrlZHVFiqjWN2mjRlWzf2ZtGNU/F9/3vmKtW1io7kxUi124jcbUyAjCVnYnj3zMlQ5rGw2eA3xhnDbRKh6Apwj9Ldd6H87W8zs+VS2yYMcj4gshw6nNA/5tvTufiiZz64d8087IbDLZpC/uPe9+Qu6Jbun3+7oPOf5/vEiH/4M8U35VCwfCAX4Cwi8UlhLPVFJavFqQRnI2fgn3xG/L5XLBV3843mq2+sgir9Toz+xale/gSRcf2AArrujaAvcmYAEAhbpkfEqko7I1S1AgENwk3xu7EPhqcHnX8pgQIyNlrA31qzPSuEHdWe4V4LMXjJ4FQ==;
 s=purelymail3; d=spwhitton.name; v=1;
 bh=RnStifhSGYRpG7X7uTMzczvUuqJHXqQ+Zk2mU6EgA3I=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=T2A8NxhBreOshV/hc98ls+MRz1vdXPVUfGMH9TZNrBnOCfkDQ8y07pG3eox5nEfu2wI37FErKDN5rT2rYbKii1KaYqYPGGg8z1lRJslxTOgTx27H6m3wNKCVs7V3ONCtzC7NRn5qXB2Y3EkeNdnMAqMaFxrQZrR1T61JYwKZOq0B97mSxR+3DoU+zCL7Qg0xNZCwLV8feqKhF7/6t0MsiOaj846eUj63xrTIYxpoJoxxCgba6r/l6l8CVG0naX4KGz1q/p0QuFvVkdRlncXe9tnPu7v1wsSr5uqudL3+j/L5t9pUYKrLMGXftl5M6cGVDySxwLWrlfFekdu8SNb+Zw==;
 s=purelymail3; d=purelymail.com; v=1;
 bh=RnStifhSGYRpG7X7uTMzczvUuqJHXqQ+Zk2mU6EgA3I=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1884983643; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Thu, 10 Oct 2024 02:45:32 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id D2B8F7E7EB4; Thu, 10 Oct 2024 10:45:27 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 (Morgan Smith's message of "Tue, 13 Jun 2023 18:59:24 -0400")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
Date: Thu, 10 Oct 2024 10:45:27 +0800
Message-ID: <871q0obrqw.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Tue 13 Jun 2023 at 06:59pm -04, Morgan Smith wrote:

> diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
> index a3469b71386..18d6f1f47dc 100644
> --- a/lisp/vc/vc-git.el
> +++ b/lisp/vc/vc-git.el
> @@ -1384,6 +1384,24 @@ vc-git-clone
>      (vc-git--out-ok "clone" remote directory))
>    directory)
>
> +(defun vc-git-modify-change-comment (_files rev comment)
> +  "Modify the change comments on REV to COMMENT."
> +  ;; This is very similar to using to "git commit --fixup=amend"
> +  ;; command but it is more precise as it does the rebase matching
> +  ;; with the hash instead of the subject line.  Also we can't use
> +  ;; --fixup non-interactively (it doesn't support -m or -F) so this
> +  ;; is much easier.
> +  (vc-git-command nil 0 nil "commit"
> +                  "--allow-empty"
> +                  "-m" (concat "amend! " rev "\n\n" comment))
> +  ;; We should really be able to do this "non-interactively" but we
> +  ;; can't so we set GIT_SEQUENCE_EDITOR
> +  (let ((process-environment
> +         (cons
> +          "GIT_SEQUENCE_EDITOR=:"
> +          process-environment)))
> +    (vc-git-command nil 0 nil "rebase" "--autosquash" "-i" (concat rev "~1"))))
> +
>  ;;; HISTORY FUNCTIONS

A few notes here:

- We will need to ensure that the commit is actually empty, not just
  allow it to be empty.

  We have vc-git--stash-staged-changes we could use, but on my machine
  git-commit has --fixup=reword:... which is for amending only the
  commit message.  So probably use that.

- We will probably want to pass --autostash to git-rebase, too.

- It is probably best to set GIT_SEQUENCE_EDITOR=true so that we're not
  relying on the shell -- there is no /bin/:, but there is /bin/true.
  This is minor.

> @@ -1576,7 +1594,13 @@ vc-git-expanded-log-entry
>      (apply #'vc-git-command t nil nil
>             `("log"
>               ,revision
> -             "-1"  "--no-color" ,@(ensure-list vc-git-log-switches)
> +             "-1"  "--no-color"
> +             ;; The same as the default "medium" format but it doesn't
> +             ;; put spaces at the beginning of the body.  This is so
> +             ;; we can grab this as the initial value when calling
> +             ;; log-view-modify-change-comment
> +             "--pretty=format:commit %H%nAuthor: %an %ae%nDate:   %ad%n%n%B"
> +             ,@(ensure-list vc-git-log-switches)
>               "--"))
>      (goto-char (point-min))
>      (unless (eobp)

I think it's preferable to use a vc-git--extract-comment as in the patch
I just posted.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Thu, 10 Oct 2024 02:49:01 +0000
Resent-Message-ID: <handler.64055.B64055.17285285075979 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Dmitry Gutov <dmitry@HIDDEN>
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>, Robert Pluim <rpluim@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17285285075979
          (code B ref 64055); Thu, 10 Oct 2024 02:49:01 +0000
Received: (at 64055) by debbugs.gnu.org; 10 Oct 2024 02:48:27 +0000
Received: from localhost ([127.0.0.1]:58179 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1syjE3-0001YM-8Y
	for submit <at> debbugs.gnu.org; Wed, 09 Oct 2024 22:48:27 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:53982)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1syjE1-0001Y7-3Q
 for 64055 <at> debbugs.gnu.org; Wed, 09 Oct 2024 22:48:25 -0400
DKIM-Signature: a=rsa-sha256;
 b=pK3lEHUUrnILa7BHEoEs8v/pHL/0ab4Ii14k4W7SN1rP3TyJ4aNYn0FEYBCoyUe5Gj949PS5kHgNlFIvdnoMICZmCJMYxP0qJGbvkh8wx2futkj8sR+e9/SfvYCXJO7cDLs0aHw4N2RFVoCEwbr+4Xd8MkLSxhCU7nUOaIiOJ1LbmCRKpcnjD1vz2yqrtuh/ggw/UsvJ2F2qXV2Z2zMQqCFmU07ZXvmNxvGz9jhNCzBWMzA9HMprUqoIIbBY7i5sO7+fZdr8MV5d/ovHLjTw6VnTu3PKWQqAk2Ing6LKjNf/4pgmoKOz8WXs40k2rIVGU8WyrL4EhNAqtwZh5AKusQ==;
 s=purelymail3; d=spwhitton.name; v=1;
 bh=2WcB86jFCQ7BZxlHDwWrLc/Rv1X/5tRvo2zvFue2/kQ=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=QQmbO4Ld5TsyIDP6j9XnekG11Z6z/lYcxuaf2Z4WYTDBW4qUdgt21BPhr2uGtCeo4JHN7AyG5gdSgOxzAYVPMb1OBZklq3pHr7o6HpUmzDGGNl2VeOTLaFvFBfrCWMHHeMz7846weNYN6379Y/XLYCIhsTMSgXyGX+DKc1NiFjQ6qWJ81VtsF/0aeOIOARuXD04tzcgtXF0y8c/Na1bIPbbmlIWnnPGCQKNdvQzQ2/zDs0TS/vkyYYov2a2dtnRF4E6tnR9VTp6ql86mllq+8vUKnNrvpMb2/wz09+Bd5WCoNCDpt81m1GSzNjuiiN1PND61zHRk6tXfXcfB1bY/BA==;
 s=purelymail3; d=purelymail.com; v=1;
 bh=2WcB86jFCQ7BZxlHDwWrLc/Rv1X/5tRvo2zvFue2/kQ=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -779989545; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Thu, 10 Oct 2024 02:48:07 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 4DB247E195D; Thu, 10 Oct 2024 10:48:03 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <87ed4obs1b.fsf@HIDDEN> (Sean Whitton's message
 of "Thu, 10 Oct 2024 10:39:12 +0800")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
Date: Thu, 10 Oct 2024 10:48:03 +0800
Message-ID: <87o73sad24.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Thu 10 Oct 2024 at 10:39am +08, Sean Whitton wrote:

> So one thing we could do is add a VC backend action which returns just
> the message text that a human might want to edit.
> Probably a backend action called `get-change-comment'.
>
> I think, though, that there might be subtle complexities there.  For
> example, should there be a FILES argument, or just a REVISION argument?
> For Git and Hg it's just REVISION, but we wouldn't want to bake that in.
>
> I think, therefore, that the approach of parsing text out of the
> log-view buffer is more future-proof, even though it's complex.

Hmm.  We could just include all arguments that might be wanted and then
backend functions can ignore them.

I would appreciate opinions comparing adding a new get-change-comment VC
backend function with something like the WIP I posted.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Thu, 10 Oct 2024 06:13:01 +0000
Resent-Message-ID: <handler.64055.B64055.172854077816142 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172854077816142
          (code B ref 64055); Thu, 10 Oct 2024 06:13:01 +0000
Received: (at 64055) by debbugs.gnu.org; 10 Oct 2024 06:12:58 +0000
Received: from localhost ([127.0.0.1]:58416 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1symPy-0004CH-2R
	for submit <at> debbugs.gnu.org; Thu, 10 Oct 2024 02:12:58 -0400
Received: from eggs.gnu.org ([209.51.188.92]:55706)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1symPw-0004C5-Fy
 for 64055 <at> debbugs.gnu.org; Thu, 10 Oct 2024 02:12:57 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1symPf-0008Ao-DC; Thu, 10 Oct 2024 02:12:39 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=nL+VfQzDbmZ5W2uBwGWLkY3amZaEGYVn/mdsL/LebAg=; b=WIltpcN9JGVV
 4vKauGxWEOtEpH7Ey2fb8k6GDKX9ziyWKTcyCgp3CaVYEfbfHGsWOCVqyPMGlH/GvgoE/B3pUoWNi
 FeF3FVQsu2jkxxbF/9QATYrcJMig9san0aSdA1wKMVO9nKZ7OnxEPX90xaTCFpIlvGaO+6Fh1RnB1
 keBl8yQx5oaXzMd23KKPLy1XpL1jcuABlY/TvhsIaLTdAMXFIFaGRVVCAZQafnY8lMyFdK2RmqBGR
 j5VQXFoC89mv5VIEEFIqMxrTEf2hIQaZ5QX32oSOEA3M90P5yLHodUmH1kshU2qE36rmGVI9lXQHU
 d560z1iT14ANPPslMt5cQQ==;
Date: Thu, 10 Oct 2024 09:12:37 +0300
Message-Id: <86h69k32qy.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <871q0obrqw.fsf@HIDDEN> (message from Sean
 Whitton on Thu, 10 Oct 2024 10:45:27 +0800)
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <871q0obrqw.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Date: Thu, 10 Oct 2024 10:45:27 +0800
> 
> - It is probably best to set GIT_SEQUENCE_EDITOR=true so that we're not
>   relying on the shell -- there is no /bin/:, but there is /bin/true.

Does any of this work on MS-Windows?

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Thu, 10 Oct 2024 06:24:01 +0000
Resent-Message-ID: <handler.64055.B64055.172854141618209 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172854141618209
          (code B ref 64055); Thu, 10 Oct 2024 06:24:01 +0000
Received: (at 64055) by debbugs.gnu.org; 10 Oct 2024 06:23:36 +0000
Received: from localhost ([127.0.0.1]:58439 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1symaG-0004jc-6x
	for submit <at> debbugs.gnu.org; Thu, 10 Oct 2024 02:23:36 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:33944)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1symaD-0004jM-Lw
 for 64055 <at> debbugs.gnu.org; Thu, 10 Oct 2024 02:23:35 -0400
DKIM-Signature: a=rsa-sha256;
 b=SKuWIdeOK4wsWYWvaWJIBOWJFk0nX9O7mVynXtXBkDT0ui+hS+oyj6LvOUodoQo7BNNxoyhK5C8QaT6AkvJDBNplTq+vPvW8QpoaQ1nPLTPew1FMGVPKrMuvviCQJStj9DQh7thL76OfD/2FYM+kY3+1+7bK7J1Iaa2WJn5c51Nv9UIr+IbCzH9cBQ6mywKUCSUZe9an4HkQPXAwnz4Fm9GQ0mySjm7G1juobzM5wjVGqq7VjkJ2sH9esjX2GoM+JELbLIaqF0MR1S2gjpzsIt4VfdCfWKdkgBeWXXInGex/FbjL1PRW2NWpTqjl3/QwHio6ItWmrutZ1w1pt7PQIg==;
 s=purelymail3; d=spwhitton.name; v=1;
 bh=zThIYRQOURxi4NwlqMqgl1JTLkrbuSJm1easio3NC4I=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=olt1QZv54+2IJaOM+f5OkXskcYvaE9pQcxWQKT20zW1Vnf1Zg3B1XnwcbO49n0l6gJPpuMf8xEE4kCRnnsZzdSIOnnQKF4ZlJGnOCTJfk/mKEUW/V7TuB4AjYM1uaZPaRrwwGPLRCy0dYzBV19EB6pV/IfITZBm/8lx2+lXwEAxJvPAz4d8cLjyjE/QhhIpyfzuDS67Us+p84q2ngiukNXI8lncnsvFfhwvYd6M3Lm9E0k5rRb6a69EPx1Ii2kH+xBoAURKTbzxDVUbMYVp5IVRRppOt+Das7dWH4tKxd5XKveLWgSi5ze87IzT/RzB0ASBju4ai6lQ977cLVmJ3SQ==;
 s=purelymail3; d=purelymail.com; v=1;
 bh=zThIYRQOURxi4NwlqMqgl1JTLkrbuSJm1easio3NC4I=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 103699119; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Thu, 10 Oct 2024 06:23:13 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id E3E347E1864; Thu, 10 Oct 2024 14:23:09 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <86h69k32qy.fsf@HIDDEN> (Eli Zaretskii's message of "Thu, 10 Oct
 2024 09:12:37 +0300")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <871q0obrqw.fsf@HIDDEN> <86h69k32qy.fsf@HIDDEN>
Date: Thu, 10 Oct 2024 14:23:09 +0800
Message-ID: <87msjc8oj6.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Thu 10 Oct 2024 at 09:12am +03, Eli Zaretskii wrote:

>> From: Sean Whitton <spwhitton@HIDDEN>
>> Date: Thu, 10 Oct 2024 10:45:27 +0800
>>
>> - It is probably best to set GIT_SEQUENCE_EDITOR=true so that we're not
>>   relying on the shell -- there is no /bin/:, but there is /bin/true.
>
> Does any of this work on MS-Windows?

I think git on Windows always comes with a POSIX shell, right?

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Thu, 10 Oct 2024 07:40:01 +0000
Resent-Message-ID: <handler.64055.B64055.1728545968837 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.1728545968837
          (code B ref 64055); Thu, 10 Oct 2024 07:40:01 +0000
Received: (at 64055) by debbugs.gnu.org; 10 Oct 2024 07:39:28 +0000
Received: from localhost ([127.0.0.1]:58551 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1synlf-0000DQ-Qa
	for submit <at> debbugs.gnu.org; Thu, 10 Oct 2024 03:39:28 -0400
Received: from eggs.gnu.org ([209.51.188.92]:52344)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1synle-0000DB-2l
 for 64055 <at> debbugs.gnu.org; Thu, 10 Oct 2024 03:39:26 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1synjF-0000XU-CJ; Thu, 10 Oct 2024 03:36:57 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=G69xj/HYfVmMr7yMuxJTwqHbgcmuZaotpSQXAwsFbjg=; b=arxPDyVBHQW8
 VAOR4wbLmoMR7a4JFzHmrthbCjKbO6jZML0+hbwwMXJ6ZE5hqkCGITCkBitIOC/SV4KDCb/oMBYAz
 9VINkF39scMwAh1ddvZMj/CiqAgo/VsTPbhligd437O7+M7d+/w3KrUBbDlQQPzGCjEzDMZREJM0c
 t8+dopWDkBMjxIHRTQiljfdf/Ki6ZkrB20vB92hMZsDlf4IPYdUEh6UotbUB7w7Zq2wcCBCzvBKI1
 pgpdS2agJv16DLGPNg4SC9VmNqouQh8vfOGMRiIKbGpsX6cTJ9V+iZjTMufgeIFewwUUDt6+MWsvm
 Ogfph66QH/6cQ9i3r6sQOg==;
Date: Thu, 10 Oct 2024 10:36:55 +0300
Message-Id: <865xq02yug.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <87msjc8oj6.fsf@HIDDEN> (message from Sean
 Whitton on Thu, 10 Oct 2024 14:23:09 +0800)
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <871q0obrqw.fsf@HIDDEN> <86h69k32qy.fsf@HIDDEN>
 <87msjc8oj6.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: Morgan.J.Smith@HIDDEN,  64055 <at> debbugs.gnu.org,  dgutov@HIDDEN,
>   rpluim@HIDDEN
> Date: Thu, 10 Oct 2024 14:23:09 +0800
> 
> Hello,
> 
> On Thu 10 Oct 2024 at 09:12am +03, Eli Zaretskii wrote:
> 
> >> From: Sean Whitton <spwhitton@HIDDEN>
> >> Date: Thu, 10 Oct 2024 10:45:27 +0800
> >>
> >> - It is probably best to set GIT_SEQUENCE_EDITOR=true so that we're not
> >>   relying on the shell -- there is no /bin/:, but there is /bin/true.
> >
> > Does any of this work on MS-Windows?
> 
> I think git on Windows always comes with a POSIX shell, right?

It does, but that doesn't mean it invokes the editor specified by
GIT_SEQUENCE_EDITOR via that shell.

Someone should actually test this to see if it works to use : or
/bin/true there.

Or maybe there's a safer value which will yield the same effect?
E.g., even using just "true", without the "/bin/" part is a step
towards a more portable command, because the user could have a port of
GNU Coreutils, which includes 'true', installed.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Thu, 10 Oct 2024 07:47:02 +0000
Resent-Message-ID: <handler.64055.B64055.17285464022613 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17285464022613
          (code B ref 64055); Thu, 10 Oct 2024 07:47:02 +0000
Received: (at 64055) by debbugs.gnu.org; 10 Oct 2024 07:46:42 +0000
Received: from localhost ([127.0.0.1]:58574 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1synsg-0000g5-G8
	for submit <at> debbugs.gnu.org; Thu, 10 Oct 2024 03:46:42 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:42196)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1synsd-0000fo-LQ
 for 64055 <at> debbugs.gnu.org; Thu, 10 Oct 2024 03:46:40 -0400
DKIM-Signature: a=rsa-sha256;
 b=CUuoSA0WY7o44woeyJMVbX9WK78SrTJJePTE/Oe9TzYnJzCb/DeZe7DAim6to3oyFqALvlJExHNqC1LjDEGNmm/I8qKbj+S8O9XYEFcoLcKcJpeWbetcgetIiW6Z7gOa+uw0z48WIv9qQ0VortGK2mFC79Z63SkJMaMHJmyQQB977OpMVBMslASrCihRFGcYWpaqOyUy4WdtPgJVBv52to9DyuL6chnnqtMFL9f4/4TI7UxfYu/quYSEM7LsdO/9kFATTlSPr+E/2F3GtJFrxYfLJnVARZr7AN1XZt4eAR2heuJ+tf+MiO9/JQPJ6HHwYyLlj+jglTbOXqZkjrxi4w==;
 s=purelymail3; d=spwhitton.name; v=1;
 bh=+cPYbpHv/LmOdYDG5m/2Pqonkjdq8L3D/dBojzT6+MI=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=RxZR9SbXQ8u170HhntxDpm3l78kF1Ams7r4GV1Yw7ftFZdapSGPTPkhxCEqqEqDuV1iBsxNUj3523zyMCEHeJSBqsjd9FdEeMyvSD+XvRUADxBQlcgq3Vo9YCI8UvhzeDqFgAv1Z75+cyQxcsbG2oTbxMuIkd983CWH3J2Dwfhy2c/yHNDcX2ME1ldkuKFpLagZ1fie6Guf/7y403xLsnrMZtOXg/GWueO5gyrfSDSToNjvZq3Y6prS9IeBUWD8Z0S3GhzLExRScQMcAGup1j5LXJ5u4xeTxS6tqZJUTcMMRV3Sr5wjPnNt8Bk8hNH49PZasttpS+xlCUr1yMOcCQg==;
 s=purelymail3; d=purelymail.com; v=1;
 bh=+cPYbpHv/LmOdYDG5m/2Pqonkjdq8L3D/dBojzT6+MI=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1991373609; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Thu, 10 Oct 2024 07:46:18 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 691227E1AA9; Thu, 10 Oct 2024 15:46:14 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <865xq02yug.fsf@HIDDEN> (Eli Zaretskii's message of "Thu, 10 Oct
 2024 10:36:55 +0300")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <871q0obrqw.fsf@HIDDEN> <86h69k32qy.fsf@HIDDEN>
 <87msjc8oj6.fsf@HIDDEN> <865xq02yug.fsf@HIDDEN>
Date: Thu, 10 Oct 2024 15:46:14 +0800
Message-ID: <875xq08kop.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Thu 10 Oct 2024 at 10:36am +03, Eli Zaretskii wrote:

>> From: Sean Whitton <spwhitton@HIDDEN>
>> Cc: Morgan.J.Smith@HIDDEN,  64055 <at> debbugs.gnu.org,  dgutov@HIDDEN,
>>   rpluim@HIDDEN
>> Date: Thu, 10 Oct 2024 14:23:09 +0800
>>
>> Hello,
>>
>> On Thu 10 Oct 2024 at 09:12am +03, Eli Zaretskii wrote:
>>
>> >> From: Sean Whitton <spwhitton@HIDDEN>
>> >> Date: Thu, 10 Oct 2024 10:45:27 +0800
>> >>
>> >> - It is probably best to set GIT_SEQUENCE_EDITOR=true so that we're not
>> >>   relying on the shell -- there is no /bin/:, but there is /bin/true.
>> >
>> > Does any of this work on MS-Windows?
>>
>> I think git on Windows always comes with a POSIX shell, right?
>
> It does, but that doesn't mean it invokes the editor specified by
> GIT_SEQUENCE_EDITOR via that shell.
>
> Someone should actually test this to see if it works to use : or
> /bin/true there.
>
> Or maybe there's a safer value which will yield the same effect?
> E.g., even using just "true", without the "/bin/" part is a step
> towards a more portable command, because the user could have a port of
> GNU Coreutils, which includes 'true', installed.

Yeah, I think 'true' is the most portable.

We should test this on MS-Windows later, indeed.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Thu, 17 Oct 2024 13:28:02 +0000
Resent-Message-ID: <handler.64055.B64055.172917166431230 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: 64055 <at> debbugs.gnu.org
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>, Robert Pluim <rpluim@HIDDEN>, Dmitry Gutov <dmitry@HIDDEN>
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172917166431230
          (code B ref 64055); Thu, 17 Oct 2024 13:28:02 +0000
Received: (at 64055) by debbugs.gnu.org; 17 Oct 2024 13:27:44 +0000
Received: from localhost ([127.0.0.1]:33777 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t1QXY-00087d-8o
	for submit <at> debbugs.gnu.org; Thu, 17 Oct 2024 09:27:44 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:39052)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t1QXV-00087N-6K
 for 64055 <at> debbugs.gnu.org; Thu, 17 Oct 2024 09:27:42 -0400
DKIM-Signature: a=rsa-sha256;
 b=Q6LvapzIZ0FTugqZ+yn28MMILx57PqVK3TUt4Y5a36o6c8lFxFkQkTD5hsqO4yeJS40sBDyFlADnFYEkcCa1Mt3gtk5niE60TUoY+GNnikB9L8cWmmuAExlSoZvPQAiqptIEVA5zWF4cO5JQi/vbhLP6xt8TeoxcPHmjVJ1QyB9E+LlvKZcU3maYvHJVQzNOQ7Z0aunbe65WP/REPmaL5p9mNmhEFRqafYcDjFNlp+D8N1fVk97g8bFPN58mp6sIIMSjkbYw3JuEu13okfSmm0S3nwI53S1GrWX361xDqIR4UYiHezm5OQmmD8f0uCrF8MbMF5PI9hECBT3Hg6s8cA==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=sii6Rjjcq07nmhXofWOQn21H3yiT/c67zqXqGUcBUgk=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=JdG5WxwKEjgC1levbUbqgaAHerK81PtvzsM97QDz2HxzApLlzsOcGBS87Gf6mKLnuOBmGmysfloiR3mZWy4AuILwGOgt+wIRIB03ORD/6jj2z0ucZP9XIEmvs/qI9b/TGRMVQJ0qDCVMDG30yaNKhIwNF4LOCUD9Y2KAO9bxEhYFhN4ifn4KyS6ErXiUQe7ZR5JU7awcpwY5gxPQlilVXia3dBPSckiUyagSTeRpjX1CMYz0P+22Cll1xLpp3QbVzr3MAOOCL3pudoac8vLvrcly3ImryjiYQhUTZKNzGkkq+SlALTqOh+unN4LopF44z5mbu9G6KOyVUd6+xcqpSQ==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=sii6Rjjcq07nmhXofWOQn21H3yiT/c67zqXqGUcBUgk=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -675313042; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Thu, 17 Oct 2024 13:27:13 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 7645F7E980F; Thu, 17 Oct 2024 21:27:10 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <87o73sad24.fsf@HIDDEN> (Sean Whitton's message
 of "Thu, 10 Oct 2024 10:48:03 +0800")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <87o73sad24.fsf@HIDDEN>
Date: Thu, 17 Oct 2024 21:27:10 +0800
Message-ID: <877ca63ln5.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Thu 10 Oct 2024 at 10:48am +08, Sean Whitton wrote:

> I would appreciate opinions comparing adding a new get-change-comment
> VC backend function with something like the WIP I posted.

I went with adding a backend function.  That's now on master.  With the
other changes I've made, I believe that all that remains for this bug is
implementing vc-git-modify-change-comment based on our discussion.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Dmitry Gutov <dmitry@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Fri, 18 Oct 2024 00:48:02 +0000
Resent-Message-ID: <handler.64055.B64055.172921242924493 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>, Robert Pluim <rpluim@HIDDEN>,  Morgan Smith <Morgan.J.Smith@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172921242924493
          (code B ref 64055); Fri, 18 Oct 2024 00:48:02 +0000
Received: (at 64055) by debbugs.gnu.org; 18 Oct 2024 00:47:09 +0000
Received: from localhost ([127.0.0.1]:36384 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t1b93-0006Mz-1j
	for submit <at> debbugs.gnu.org; Thu, 17 Oct 2024 20:47:09 -0400
Received: from fhigh-a4-smtp.messagingengine.com ([103.168.172.155]:57085)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dmitry@HIDDEN>) id 1t1b91-0006MY-2J
 for 64055 <at> debbugs.gnu.org; Thu, 17 Oct 2024 20:47:08 -0400
Received: from phl-compute-01.internal (phl-compute-01.phl.internal
 [10.202.2.41])
 by mailfhigh.phl.internal (Postfix) with ESMTP id 25E59114013B;
 Thu, 17 Oct 2024 20:46:40 -0400 (EDT)
Received: from phl-mailfrontend-02 ([10.202.2.163])
 by phl-compute-01.internal (MEProxy); Thu, 17 Oct 2024 20:46:40 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc
 :content-transfer-encoding:content-type:content-type:date:date
 :from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to; s=fm1; t=1729212400;
 x=1729298800; bh=tD0hs0yL13JHq4/y9UlIKNV6nRz+ypUVg8HEuJxP3zk=; b=
 WXUFY1gmGUdnTTUiyKTqvW+9+TrA/uwNsJZdttqa0La9lzsqQf3ftbA7PQPS6LX3
 pKXTmbfnt/bCGlgoTdq/VTifLFAqGd+ENycOJ4DukpM3V/TlDL18qA7FGW/QIlEg
 CoXGu+AUHYyZbCCmm75tzlevhThBrDhdRC5/JpLz0F7/HoKiHjgzClJnjKhlX+pf
 9j0fzSDVSJHRkNQg60N5u5KwRJvEz23CVLHAeQ2LLZKN/nXGYPiP7flbyN0nf/lo
 TuMGmz1dClHYibx8gkLSnSpw5TgXXRzajmn2iEV2bx3oOg3abQQRW4SB1m9R8aZQ
 AwvIoKVlWHM7prA3o996Wg==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=cc:content-transfer-encoding:content-type
 :content-type:date:date:feedback-id:feedback-id:from:from
 :in-reply-to:in-reply-to:message-id:mime-version:references
 :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy
 :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1729212400; x=
 1729298800; bh=tD0hs0yL13JHq4/y9UlIKNV6nRz+ypUVg8HEuJxP3zk=; b=G
 cvGRJjDEK78yxzFXezm8SgLemubv1j7Xurn3386tn9PB06Rm9l6yigMTgHoNspAr
 9hXZt4Ba5Ol9XSNnTO2I9nwKktX2qaiwmh54el8TwsoUs9uOf6uHFuV4BkXnZcD3
 O9q66xXlgR8Epc1HtvQUHkPkM2RVDlwgaQp9/X5CyTbkrEhKgXhPjQlnmTXHb4l5
 zP/2mKi8ICKrkbMyYmag13tUb4ky4Vrdi02ITaEBS5IIcBn/JZ/7aPpfjyNltW/O
 dyijo++gAOc630Aa7WDYzrQ1Brehy2BSRApEn9c+QjyMV1EduHuhb/TEwK8HKHDS
 RgL8QLWOnNFPv4+z1zMFQ==
X-ME-Sender: <xms:768RZ4fnFMqaRrOOX0P1LBR1dydF1pSp_i781WaSF6aExVgiyRmDOA>
 <xme:768RZ6P6U539Le_qea2TWCHTUbFT_umZtE6zc95yZvNxj01rMvKU_NpTAr-3RhwzE
 aKI7xb8uhmeQtbVEXY>
X-ME-Received: <xmr:768RZ5iBlM_tuT5zgtwZRN3qw23CQ0LlFwS-3Pip87-mRa43meKIR27hBkGSfBG4vBPm>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehvddgfeelucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu
 rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh
 htshculddquddttddmnecujfgurhepkfffgggfuffvfhfhjggtgfesthejredttddvjeen
 ucfhrhhomhepffhmihhtrhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvg
 hvqeenucggtffrrghtthgvrhhnpedthfeuvddtveelgeeuleevvdejveehffevveehvdeu
 ffdtfefhvdeugefgtefgtdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh
 grihhlfhhrohhmpegumhhithhrhiesghhuthhovhdruggvvhdpnhgspghrtghpthhtohep
 gedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepshhpfihhihhtthhonhesshhpfi
 hhihhtthhonhdrnhgrmhgvpdhrtghpthhtoheprhhplhhuihhmsehgmhgrihhlrdgtohhm
 pdhrtghpthhtohepmhhorhhgrghnrdhjrdhsmhhithhhsehouhhtlhhoohhkrdgtohhmpd
 hrtghpthhtohepieegtdehheesuggvsggsuhhgshdrghhnuhdrohhrgh
X-ME-Proxy: <xmx:768RZ98prVs68deg5ytIduDGgpQ2bHWs3RhxFolUSwTeCwi33skOsg>
 <xmx:768RZ0vyMNQK5VytSAivHNKlk4OpyXj9OR0vJ7imfMAxeN-F19ndlw>
 <xmx:768RZ0EokToI03c_oTSJi_U97Yp9t9GnOtgQQulRYuwQ1httEXUKIA>
 <xmx:768RZzMbgkbxkwrgD6oSvlKRH89AFLf87OO_xFhEsqP8beVYbVmsVQ>
 <xmx:8K8RZ2K9-tW5nm5xtphnoJceTCmcWxWZYuvNIL27Gtx8PPvn6dqbqIu4>
Feedback-ID: i07de48aa:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu,
 17 Oct 2024 20:46:38 -0400 (EDT)
Message-ID: <f65c997d-6f2b-44c6-9bb2-3e493fb73d69@HIDDEN>
Date: Fri, 18 Oct 2024 03:46:36 +0300
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
Content-Language: en-US
From: Dmitry Gutov <dmitry@HIDDEN>
In-Reply-To: <87ed4obs1b.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

Hi! Sorry for the late reply, I've been driving a lot the last week.

On 10/10/2024 05:39, Sean Whitton wrote:
> In Dmitry's patch he takes the approach of calling the
> expanded-log-entry backend function to get the message to edit.
> This is not a real VC backend function -- in fact it's a log-view
> feature, log-view-expanded-log-entry-function.

It is, but it is also basically a backend method, i.e. in vc-git.el:

     (setq-local log-view-expanded-log-entry-function
                 'vc-git-expanded-log-entry))

So if we determined that its output could be used for editing, perhaps 
after some massaging (e.g. reindenting and keeping only a subset of the 
headers), that could be a minor win -- fewer methods is better in 
general. I haven't tried to code it, so there could be pitfalls.

Also note that we have 'rfc822-goto-eoh' which can be used to skip to 
the end of the headers. 'log-edit-extract-headers' could be used as 
reference for extracting "Summary", even if it doesn't exactly give us 
the desired info now.

> So one thing we could do is add a VC backend action which returns just
> the message text that a human might want to edit.
> Probably a backend action called `get-change-comment'.

The new vc-git-get-change-comment seems good in terms of functionality. 
I was thinking that the headers such as Author, No-Verify and Sign-Off, 
might be good to show as well, but as long as their values are intact 
after the edit, that's optional.

> I think, though, that there might be subtle complexities there.  For
> example, should there be a FILES argument, or just a REVISION argument?
> For Git and Hg it's just REVISION, but we wouldn't want to bake that in.

Makes sense, e.g. if we end up supporting per-file backends later.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Fri, 18 Oct 2024 04:51:02 +0000
Resent-Message-ID: <handler.64055.B64055.17292270562331 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Dmitry Gutov <dmitry@HIDDEN>
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>, Robert Pluim <rpluim@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17292270562331
          (code B ref 64055); Fri, 18 Oct 2024 04:51:02 +0000
Received: (at 64055) by debbugs.gnu.org; 18 Oct 2024 04:50:56 +0000
Received: from localhost ([127.0.0.1]:36638 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t1ewy-0000bX-9L
	for submit <at> debbugs.gnu.org; Fri, 18 Oct 2024 00:50:56 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:33976)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t1ewv-0000bG-IJ
 for 64055 <at> debbugs.gnu.org; Fri, 18 Oct 2024 00:50:54 -0400
DKIM-Signature: a=rsa-sha256;
 b=GVlLGSq52diPyBCPbXry3l/c1sENGp/O4S/2hpE/H70DaVVHasOEQ4W+iEkXjmcn2ZlD9X9bC3VngPx329juZiQvLu1WUJ90JpZ86iAXB5AKJW2siepxvtEQdgUDGM1h+wNw4QBjk3ueVLKbRUZYKdhwzA4nVX7fkUqXe9U/R8pDYwbBAL9fWht5/yJXTjAaPHHTZ2AITIK+nTWsjKyjnK7bYx5oowR8HvPPq/bZazCileiI5BVxg5QUdAyMAJxtUA07yJzlKapxrmbuM3W04ppoe/7kGMRyYKx9n6hgJ9FH90BgUHSguEC3soceWF5MBreBlio2myv8qBX73g8IxA==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=1GVK7as1rgrSsZfQhubSu9dSKY9x6Qkk/GlFRafIlg4=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=X08QOWxWmipg2OfVhrSQ+altXyjZF2pT1Idts50tSDMZxa4TqQOzvsVn0h4YnsTqzhrlpcYlGynEjtIr5+4A827eqTAOGDEu1CKR2yjDs9zA8UVqLXtp4c7+mela4Q2tf4p5oNSotNRftakr1KFDbznP7hNM7u4J+sEOrkiHm9PtbwEoa2KFQt0i8VIq2pXJSTMGDtsQCM3EB5TQgd4SpI1c8iLd1MpMfTJEVLL8J5OPd8D0U4vsnwTy9dejMyV0z3ohnURRaIrTZoqQ6eBDOrCsKsMXi2XNtYMv7shpJA7+jBe+3kXNwpZc2NGJIL9LiGk571H8ihJnzytWt5p+Rg==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=1GVK7as1rgrSsZfQhubSu9dSKY9x6Qkk/GlFRafIlg4=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1895773447; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Fri, 18 Oct 2024 04:50:21 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id B0E527EAC38; Fri, 18 Oct 2024 12:50:18 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <f65c997d-6f2b-44c6-9bb2-3e493fb73d69@HIDDEN> (Dmitry Gutov's
 message of "Fri, 18 Oct 2024 03:46:36 +0300")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <f65c997d-6f2b-44c6-9bb2-3e493fb73d69@HIDDEN>
Date: Fri, 18 Oct 2024 12:50:18 +0800
Message-ID: <87jze6vwtx.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Fri 18 Oct 2024 at 03:46am +03, Dmitry Gutov wrote:

> Hi! Sorry for the late reply, I've been driving a lot the last week.

Oh, no problem.

> On 10/10/2024 05:39, Sean Whitton wrote:
>> In Dmitry's patch he takes the approach of calling the
>> expanded-log-entry backend function to get the message to edit.
>> This is not a real VC backend function -- in fact it's a log-view
>> feature, log-view-expanded-log-entry-function.
>
> It is, but it is also basically a backend method, i.e. in vc-git.el:
>
>     (setq-local log-view-expanded-log-entry-function
>                 'vc-git-expanded-log-entry))
>
> So if we determined that its output could be used for editing, perhaps after
> some massaging (e.g. reindenting and keeping only a subset of the headers),
> that could be a minor win -- fewer methods is better in general. I haven't
> tried to code it, so there could be pitfalls.

I thought about it and realised that, for the git case, variables like
vc-git-log-switches and vc-git-shortlog-switches can affect the output,
and could make us misparse it.  And ultimately the benefits of avoiding
a new backend method didn't seem to outweigh having parsing code that
could turn out to be fragile.

> Also note that we have 'rfc822-goto-eoh' which can be used to skip to the end
> of the headers. 'log-edit-extract-headers' could be used as reference for
> extracting "Summary", even if it doesn't exactly give us the desired info now.

Those aren't VC-specific, though, they're based on how Log Edit works
for all backends.  So although it's fiddly parsing, it can be done the
same way always, at least.

> The new vc-git-get-change-comment seems good in terms of functionality. I was
> thinking that the headers such as Author, No-Verify and Sign-Off, might be
> good to show as well, but as long as their values are intact after the edit,
> that's optional.

I thought that it would be nice to include Author, in particular, as you
might need to amend the value.  That would require adding additional
arguments to the modify-change-comment action, though, so I left it for
later if someone wants to implement it.

I'm not sure how No-Verify would interact with the --fixup=reword:
commits we are now planning to use.

Sign-Off would be useful for using the new feature to insert a missing
sign-off.

>> I think, though, that there might be subtle complexities there.  For
>> example, should there be a FILES argument, or just a REVISION argument?
>> For Git and Hg it's just REVISION, but we wouldn't want to bake that in.
>
> Makes sense, e.g. if we end up supporting per-file backends later.

Right.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Fri, 18 Oct 2024 05:27:01 +0000
Resent-Message-ID: <handler.64055.B64055.17292292049265 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, dmitry@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17292292049265
          (code B ref 64055); Fri, 18 Oct 2024 05:27:01 +0000
Received: (at 64055) by debbugs.gnu.org; 18 Oct 2024 05:26:44 +0000
Received: from localhost ([127.0.0.1]:36703 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t1fVc-0002PM-4Z
	for submit <at> debbugs.gnu.org; Fri, 18 Oct 2024 01:26:44 -0400
Received: from eggs.gnu.org ([209.51.188.92]:53664)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t1fVZ-0002P4-Pn
 for 64055 <at> debbugs.gnu.org; Fri, 18 Oct 2024 01:26:42 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t1fV6-0007Nk-3S; Fri, 18 Oct 2024 01:26:12 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=OMPbK0vx22hinsU+cOT1Bl0q0nCnKmPI+vi2MYG3Mco=; b=cPta4P/aufp+
 CF9uTZOm4PYc1pNW6sgzknryBEAFHjqB7sbtF4csCQWQRKoPPUNNjyvML+22Gv4dUgQuemLOrnwwF
 hJLvdKkQC1q/3Zkm2zK4fFzhpETAvxC99dZkeDn7LHinFG+UQtyIrXrOufYUrSlgnRGAqVUjr0J65
 nHehyfLecB3exFlXhvGmmPJu2Xyfv5hmhnRGE4W/RTUs5GsXAWdU/MrTOdvCm4PgIfgFlHnottgE0
 83/iEomYFkN01UKFdtfZRpYkAjlb8DfJQQ4+SKx3ZzTMdZ7H42nwcbFnsdALCpoTy6xlRCYa6loUk
 gO67ApwMhoDHReSqrAOS0g==;
Date: Fri, 18 Oct 2024 08:26:09 +0300
Message-Id: <86r08enfri.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <877ca63ln5.fsf@HIDDEN> (message from Sean
 Whitton on Thu, 17 Oct 2024 21:27:10 +0800)
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <87o73sad24.fsf@HIDDEN>
 <877ca63ln5.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>, Robert Pluim <rpluim@HIDDEN>,
>  Dmitry Gutov <dmitry@HIDDEN>
> From: Sean Whitton <spwhitton@HIDDEN>
> Date: Thu, 17 Oct 2024 21:27:10 +0800
> 
> Hello,
> 
> On Thu 10 Oct 2024 at 10:48am +08, Sean Whitton wrote:
> 
> > I would appreciate opinions comparing adding a new get-change-comment
> > VC backend function with something like the WIP I posted.
> 
> I went with adding a backend function.  That's now on master.  With the
> other changes I've made, I believe that all that remains for this bug is
> implementing vc-git-modify-change-comment based on our discussion.

Thanks.

The commit log message for the changes doesn't mention the bug number;
please always remember to do that in the future.  In this case, the
discussion leading to the change is long and significant, so including
a pointer to it is important for future forensics.

More importantly, why are we installing changes in VC that are
supported by a single backend?  This is against the VC design
principles.  Let's please install soon implementations for other
relevant backends.  I think this should be very simple, but if you
need help for some backends, feel free to ask for it.

Btw, since CVS has an existing command-line option to amend the log
message of a particular commit, I wonder whether the design that goes
through a separate backend function which extracts the comment first
is valid.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Fri, 18 Oct 2024 06:21:02 +0000
Resent-Message-ID: <handler.64055.B64055.172923246019329 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, dmitry@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172923246019329
          (code B ref 64055); Fri, 18 Oct 2024 06:21:02 +0000
Received: (at 64055) by debbugs.gnu.org; 18 Oct 2024 06:21:00 +0000
Received: from localhost ([127.0.0.1]:36791 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t1gM7-00051e-6o
	for submit <at> debbugs.gnu.org; Fri, 18 Oct 2024 02:21:00 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:45814)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t1gM4-00051M-3k
 for 64055 <at> debbugs.gnu.org; Fri, 18 Oct 2024 02:20:57 -0400
DKIM-Signature: a=rsa-sha256;
 b=exyAVbnkP7ZezgfI0A6biqPTW2SECNN0YADg3U6eszaP4KBq/3WM0DoOt2mJQrc2qrp0wMR04gfsDfR01OMHSh44smnbdTzfkly5DNnBf6XOZ0wywpVP21BoEA1hoYgn+Mu2fF35RL5wGOfuSWNOzlCT8LRqVbn4FS8ozVb4GFRieZ0At6T0F/Zg5yg5P0B66PEsHlSZPwH48cPXl1/zbPs0ywgeIOv9kU90mg+aYv3jxmDaRbUE4Ef8eJaPQHeiZ0sa2NejwS5w3hceCqw1GYNBlE4nA8Rvu3QNEQ/F9gr8RpdjfA49Kj6f7FGiblKX+KAYHbMU19f2Vi7UMsI+yQ==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=dbb0wxM0E84yKEKRjl8YW8TcEOcqs4mA0auBq7faopg=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=TkQtua90NoeayVoEkE1mUMA/57yLtcBvleX0v5vgTFlekQ2s+bsGpHMrK4JT4Vkx6ngYSN5chk1ZrW0s0Cq2nAjWigemOoAB/vscYdxYA3aEl/CNc6Nk/cZO6lEfRzFPQPqxDPKDFVuAUq1Ni2NWKR9m2rhWycjIsHIu5rjpIg8ME+/MXjEamwYosaDqv9wti+21GcwY81cUNRL+8/oXecVfy5/49EqEBJo88g75Q9KN8uuRag2+Fk7QlHJ9sBpOOVWzpG9MjCF1Dc7ycwkOdynHwMZmWYKf1A9pbRpChtVuyZtZO9fRu0//PZiIDQpbZx6NNWy3fwdPMXaFO5ArVw==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=dbb0wxM0E84yKEKRjl8YW8TcEOcqs4mA0auBq7faopg=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 48563301;
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Fri, 18 Oct 2024 06:20:27 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 863E67EAC38; Fri, 18 Oct 2024 14:20:23 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <86r08enfri.fsf@HIDDEN> (Eli Zaretskii's message of "Fri, 18 Oct
 2024 08:26:09 +0300")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <87o73sad24.fsf@HIDDEN>
 <877ca63ln5.fsf@HIDDEN> <86r08enfri.fsf@HIDDEN>
Date: Fri, 18 Oct 2024 14:20:23 +0800
Message-ID: <87cyjyvsns.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Fri 18 Oct 2024 at 08:26am +03, Eli Zaretskii wrote:

> The commit log message for the changes doesn't mention the bug number;
> please always remember to do that in the future.  In this case, the
> discussion leading to the change is long and significant, so including
> a pointer to it is important for future forensics.

In this case, my commits didn't add vc-git-modify-change-comment, and
most of the discussion in this bug has been about that.  So, I thought
that it would be best to include the bug number in the later commit
adding vc-git-modify-change-comment, and not in any commits I've made so
far.  Would you prefer that it had been included in all of them?

> More importantly, why are we installing changes in VC that are
> supported by a single backend?  This is against the VC design
> principles.  Let's please install soon implementations for other
> relevant backends.  I think this should be very simple, but if you
> need help for some backends, feel free to ask for it.

Actually, in this case, the functionality already exists for SCCS, RCS,
CVS, SVN and Hg in log-view-extract-comment, and I was just adding
support for Git.

> Btw, since CVS has an existing command-line option to amend the log
> message of a particular commit, I wonder whether the design that goes
> through a separate backend function which extracts the comment first
> is valid.

We still need to extract the comment first so that the user has some
text to edit.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Fri, 18 Oct 2024 09:17:01 +0000
Resent-Message-ID: <handler.64055.B64055.172924301417910 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, dmitry@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172924301417910
          (code B ref 64055); Fri, 18 Oct 2024 09:17:01 +0000
Received: (at 64055) by debbugs.gnu.org; 18 Oct 2024 09:16:54 +0000
Received: from localhost ([127.0.0.1]:37041 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t1j6L-0004eo-NK
	for submit <at> debbugs.gnu.org; Fri, 18 Oct 2024 05:16:54 -0400
Received: from eggs.gnu.org ([209.51.188.92]:48352)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t1j6J-0004ea-Tz
 for 64055 <at> debbugs.gnu.org; Fri, 18 Oct 2024 05:16:52 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t1j3m-0006Uy-0b; Fri, 18 Oct 2024 05:14:14 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=bRuL5IhQQWR4t9su+LaS7qxflzof7/mFX1LK1ynhFMM=; b=eqHOKS0ssanQ
 yy+5dMUTAwSN5vEZWsvxRhinnfZCor3gdrD72z5KTQpnlD6EgWObNlzbUNIwQnnF+bzb/Fkk2Ul0w
 dVBQ10Renn189TCFEUHDZgkX/m4LP2fVbxhHwq/uyQI4Sak9E55Q6cb7UuQQJ9XLgXxlvIqKhQi0F
 OEOYoxUfQ6L6782Lzi6ybU2QZLvp8if1ScdUFDOKchDeg8348EOnW4VqgdrT+Zg16skwc00oa6hGF
 WW52/2kzXWQTNnD1TgA6goPWKRGp+ocEZs/L5/noxQ7rb4UmpLla5vKsV/x1OTAEJMKUNkIUmKYJI
 BkziURDslHLEtFyKPjvtgw==;
Date: Fri, 18 Oct 2024 12:14:10 +0300
Message-Id: <868qulojrx.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <87cyjyvsns.fsf@HIDDEN> (message from Sean
 Whitton on Fri, 18 Oct 2024 14:20:23 +0800)
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <87o73sad24.fsf@HIDDEN>
 <877ca63ln5.fsf@HIDDEN> <86r08enfri.fsf@HIDDEN>
 <87cyjyvsns.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: 64055 <at> debbugs.gnu.org,  Morgan.J.Smith@HIDDEN,  rpluim@HIDDEN,
>   dmitry@HIDDEN
> Date: Fri, 18 Oct 2024 14:20:23 +0800
> 
> On Fri 18 Oct 2024 at 08:26am +03, Eli Zaretskii wrote:
> 
> > The commit log message for the changes doesn't mention the bug number;
> > please always remember to do that in the future.  In this case, the
> > discussion leading to the change is long and significant, so including
> > a pointer to it is important for future forensics.
> 
> In this case, my commits didn't add vc-git-modify-change-comment, and
> most of the discussion in this bug has been about that.  So, I thought
> that it would be best to include the bug number in the later commit
> adding vc-git-modify-change-comment, and not in any commits I've made so
> far.  Would you prefer that it had been included in all of them?

Definitely.  It is otherwise very hard to realize that the discussion
of these changes happened in this particular bug.

> > More importantly, why are we installing changes in VC that are
> > supported by a single backend?  This is against the VC design
> > principles.  Let's please install soon implementations for other
> > relevant backends.  I think this should be very simple, but if you
> > need help for some backends, feel free to ask for it.
> 
> Actually, in this case, the functionality already exists for SCCS, RCS,
> CVS, SVN and Hg in log-view-extract-comment, and I was just adding
> support for Git.

That's definitely not what the comments and the implementation convey.
And I then understand even less why the backend action was added for
Git in the first place.

> > Btw, since CVS has an existing command-line option to amend the log
> > message of a particular commit, I wonder whether the design that goes
> > through a separate backend function which extracts the comment first
> > is valid.
> 
> We still need to extract the comment first so that the user has some
> text to edit.

Are we envisioning the user invoking this from anything other than a
log buffer?  Why would someone want to do that?

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
In-Reply-To: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Fri, 18 Oct 2024 09:28:02 +0000
Resent-Message-ID: <handler.64055.B64055.172924362819844 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: 64055 <at> debbugs.gnu.org, Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>, Dmitry Gutov <dgutov@HIDDEN>
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172924362819844
          (code B ref 64055); Fri, 18 Oct 2024 09:28:02 +0000
Received: (at 64055) by debbugs.gnu.org; 18 Oct 2024 09:27:08 +0000
Received: from localhost ([127.0.0.1]:37091 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t1jGF-00059x-GP
	for submit <at> debbugs.gnu.org; Fri, 18 Oct 2024 05:27:08 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:49272)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t1jGD-00059Q-61
 for 64055 <at> debbugs.gnu.org; Fri, 18 Oct 2024 05:27:06 -0400
DKIM-Signature: a=rsa-sha256;
 b=JlNcIFUxbab7GTqLo06Xtx9fmPO+ZS2apqumDGzoxTeSsLRb65KW87yRDVQ32ifA2GKTv6gfuIsT0tuXm0JWOXAOKjqVyJxCjpt0D93sKzB7O9B4vv5tNAN40mTZ6gUiPfe2DIy0ErON7zjgcWjOoqCFvrt2/H2y3kE8IcFEzSHXtzLBL9BIrw6F1d/yLqkpZwlA9oy/xsLCSyTCnE9FAhzI/2w0L29eeO9EjiE1++f6vOxNai0GDqa9rw8LDeyJ8baNIj1hC4Iy0lo0l0+NE0f1GTuBQQevdviWQpL7v1mMECW2k4rVHrsQx3FkJkId5r7diCaq4FxwS2856HFzdA==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=5aZqCDODyTA26u6RMEI8F5gxYAVmRst5UTR0NMEjT7M=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=Z+0xAhTc9L06lo4c49+0KtGRTVsyQyFZuU7kTHl2nWQyZ/M6b5N/wTWyDWrEMzjL4AYR4Bq1eVE+1G/oaZRmIm4qpRXLKEjAobJcSbuCy0Ke+a9Y6qIkEMPL+36K8fLw6F+fGXFogVbsa4xFt+rDNfRJBLPfkFvBpBHqqV7NoB5VqJsdIo0wmnimTNpMu6/l3tSCAtLnqcQPPfiLoiG693hian0kG7iOhi4utBDOojzyS36ltMIVmKi0lzl8+FmBgLSH2SLOBtp1zqTBtEbldyfyqJlp05Bf/2Sg3xe6TOdqDzayY5gZ4msv5kO19vPdoPwRCxnmL853NQ2WObC8SQ==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=5aZqCDODyTA26u6RMEI8F5gxYAVmRst5UTR0NMEjT7M=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1624411188; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Fri, 18 Oct 2024 09:26:32 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id AD11E7EAA8E; Fri, 18 Oct 2024 17:26:28 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
Date: Fri, 18 Oct 2024 17:26:28 +0800
Message-ID: <874j59wym3.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--=-=-=
Content-Type: text/plain

Hello,

This patch is the rest of this feature.  Eli, would you kindly test on
MS-Windows, please?  Just try to edit the message for an unpushed git
commit and add some Unicode, and see if it works correctly.

-- 
Sean Whitton

--=-=-=
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment;
 filename=0001-Support-modifying-VC-change-comments-for-Git.patch
Content-Transfer-Encoding: quoted-printable

From 674f7b7c636a4e2ebcb4955b564f8c9c36bd3ddd Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@HIDDEN>
Date: Fri, 18 Oct 2024 17:19:45 +0800
Subject: [PATCH] Support modifying VC change comments for Git

* lisp/vc/vc-git.el (vc-git-allow-rewriting-history): New option.
(vc-git--assert-allowed-rewrite, vc-git-modify-change-comment):
New functions (bug#64055).

(vc-git--current-branch): Factor out of vc-git-dir--branch-headers.
(vc-git--log-edit-extract-headers): Factor out of vc-git-checkin.

* etc/NEWS: Announce the new support and option.
---
 etc/NEWS          |  15 +++++
 lisp/vc/vc-git.el | 147 +++++++++++++++++++++++++++++++++++++---------
 2 files changed, 134 insertions(+), 28 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 10d86173235..d2e72bc537a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -568,6 +568,21 @@ a desktop notification when the song changes, using
 customized using the new user options 'mpc-notifications-title' and
 'mpc-notifications-body'.
=20
+** VC
+
+---
+*** Using 'e' from Log View mode to modify change comments now works for G=
it.
+
+---
+*** New user option 'vc-git-allow-rewriting-history'.
+Many Git commands can change your copy of published change history
+without warning.  If VC commands detect that this could happen, they
+will stop.  You can customize this variable to permit rewriting history
+even though Emacs thinks it is dangerous.
+
+So far, this applies only to the 'log-view-modify-change-comment'
+command.
+
 
 * New Modes and Packages in Emacs 31.1
=20
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index f77bf0cc5ff..0680d8e7353 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -252,6 +252,27 @@ vc-git-revision-complete-only-branches
   :type 'boolean
   :version "28.1")
=20
+;; The default is nil because only a VC user who also possesses a lot of
+;; Git-specific knowledge can know when it is okay to rewrite history,
+;; and we can't convey to a relatively Git-na=C3=AFve user the potential
+;; risks in only the space of a minibuffer y/n prompt.
+(defcustom vc-git-allow-rewriting-history nil
+  "When non-nil, permit Git operations that may rewrite published history.
+
+Many Git commands can change your copy of published change history
+without warning.  If this occurs, you won't be able to pull and push in
+the ordinary way until you take special action.  See \"Recovering from
+Upstream Rebase\" in the Man page git-rebase(1).
+
+Normally, Emacs refuses to run Git commands that it thinks will rewrite
+published history.  If you customize this variable to a non-nil value,
+Emacs will instead prompt you to confirm that you really want to perform
+the rewrite.  A value of `no-ask' means to proceed with no prompting."
+  :type '(choice (const :tag "Don't allow" nil)
+                 (const :tag "Prompt to allow" t)
+                 (const :tag "Allow without prompting" no-ask))
+  :version "31.1")
+
 ;; History of Git commands.
 (defvar vc-git-history nil)
=20
@@ -728,11 +749,13 @@ vc-git-dir-status-files
                                  :files files
                                  :update-function update-function)))
=20
+(defun vc-git--current-branch ()
+  (vc-git--out-match '("symbolic-ref" "HEAD")
+                     "^\\(refs/heads/\\)?\\(.+\\)$" 2))
+
 (defun vc-git-dir--branch-headers ()
   "Return headers for branch-related information."
-  (let ((branch (vc-git--out-match
-                 '("symbolic-ref" "HEAD")
-                 "^\\(refs/heads/\\)?\\(.+\\)$" 2))
+  (let ((branch (vc-git--current-branch))
         tracking remote-url)
     (if branch
         (when-let ((branch-merge
@@ -1082,6 +1105,17 @@ vc-git-checkin-patch
=20
 (autoload 'vc-switches "vc")
=20
+(defun vc-git--log-edit-extract-headers (comment)
+  (cl-flet ((boolean-arg-fn (argument)
+              (lambda (v) (and (equal v "yes") (list argument)))))
+    (log-edit-extract-headers
+     `(("Author" . "--author")
+       ("Date" . "--date")
+       ("Amend" . ,(boolean-arg-fn "--amend"))
+       ("No-Verify" . ,(boolean-arg-fn "--no-verify"))
+       ("Sign-Off" . ,(boolean-arg-fn "--signoff")))
+     comment)))
+
 (defun vc-git-checkin (files comment &optional _rev)
   (let* ((file1 (or (car files) default-directory))
          (root (vc-git-root file1))
@@ -1180,31 +1214,23 @@ vc-git-checkin
               (vc-git-command nil 0 patch-file "apply" "--cached")
             (delete-file patch-file))))
       (when to-stash (vc-git--stash-staged-changes files)))
-    (cl-flet ((boolean-arg-fn
-               (argument)
-               (lambda (value) (when (equal value "yes") (list argument)))=
))
-      ;; When operating on the whole tree, better pass "-a" than ".", sinc=
e "."
-      ;; fails when we're committing a merge.
-      (apply #'vc-git-command nil 0 (if (and only (not vc-git-patch-string=
)) files)
-             (nconc (if msg-file (list "commit" "-F"
-                                       (file-local-name msg-file))
-                      (list "commit" "-m"))
-                    (let ((args
-                           (log-edit-extract-headers
-                            `(("Author" . "--author")
-                              ("Date" . "--date")
-                              ("Amend" . ,(boolean-arg-fn "--amend"))
-                              ("No-Verify" . ,(boolean-arg-fn "--no-verify=
"))
-                              ("Sign-Off" . ,(boolean-arg-fn "--signoff")))
-                            comment)))
-                      (when msg-file
-                        (let ((coding-system-for-write
-                               (or pcsw vc-git-commits-coding-system)))
-                          (write-region (car args) nil msg-file))
-                        (setq args (cdr args)))
-                      args)
-                    (unless vc-git-patch-string
-                      (if only (list "--only" "--") '("-a"))))))
+    ;; When operating on the whole tree, better pass "-a" than ".",
+    ;; since "."  fails when we're committing a merge.
+    (apply #'vc-git-command nil 0
+           (if (and only (not vc-git-patch-string)) files)
+           (nconc (if msg-file (list "commit" "-F"
+                                     (file-local-name msg-file))
+                    (list "commit" "-m"))
+                  (let ((args
+                         (vc-git--log-edit-extract-headers comment)))
+                    (when msg-file
+                      (let ((coding-system-for-write
+                             (or pcsw vc-git-commits-coding-system)))
+                        (write-region (car args) nil msg-file))
+                      (setq args (cdr args)))
+                    args)
+                  (unless vc-git-patch-string
+                    (if only (list "--only" "--") '("-a")))))
     (if (and msg-file (file-exists-p msg-file)) (delete-file msg-file))
     (when to-stash
       (let ((cached (make-nearby-temp-file "git-cached")))
@@ -1960,6 +1986,71 @@ vc-git-get-change-comment
     (vc-git-command standard-output 1 nil
                     "log" "--max-count=3D1" "--pretty=3Dformat:%B" rev)))
=20
+(defun vc-git--assert-allowed-rewrite (rev)
+  (when (and (not (eq vc-git-allow-rewriting-history 'no-ask))
+             ;; Check there is an upstream.
+             (with-temp-buffer
+               (vc-git--out-ok "config" "--get"
+                               (format "branch.%s.merge"
+                                       (vc-git--current-branch)))))
+    (let ((outgoing (split-string
+                     (with-output-to-string
+                       (vc-git-command standard-output 0 nil "log"
+                                       "--pretty=3Dformat:%H"
+                                       "@{upstream}..HEAD")))))
+      (unless (or (cl-member rev outgoing :test #'string-prefix-p)
+                  (and vc-git-allow-rewriting-history
+                       (yes-or-no-p
+                        (format
+"Commit %s looks to be published; are you sure you want to rewrite history=
?"
+                         rev))))
+        (user-error "Will not rewrite likely-public Git history")))))
+
+(defun vc-git-modify-change-comment (files rev comment)
+  (vc-git--assert-allowed-rewrite rev)
+  (let* ((args (vc-git--log-edit-extract-headers comment))
+         (message (format "amend! %s\n\n%s" rev (pop args)))
+         (msg-file
+          ;; On MS-Windows, pass the message through a file, to work
+          ;; around how command line arguments must be in the system
+          ;; codepage, and therefore might not support non-ASCII.
+          ;;
+          ;; As our other arguments are static, we need not be concerned
+          ;; about the encoding of command line arguments in general.
+          ;; See `vc-git-checkin' for the more complex case.
+          (and (eq system-type 'windows-nt)
+               (let ((default-directory
+                      (or (file-name-directory (or (car files)
+                                                   default-directory))
+                          default-directory)))
+                 (make-nearby-temp-file "git-msg")))))
+    (unwind-protect
+        (progn
+          (when (cl-intersection '("--author" "--date") args
+                                 :test #'string=3D)
+            ;; 'git rebase --autosquash' cannot alter authorship.
+            ;; See the description of --fixup in git-commit(1).
+            (error
+"Author: and Date: not supported when modifying existing commits"))
+          (when msg-file
+            (let ((coding-system-for-write
+                   (or coding-system-for-write
+                       vc-git-commits-coding-system)))
+              (write-region message nil msg-file)))
+          ;; Regardless of the state of the index and working tree, this
+          ;; will always create an empty commit, thanks to --only.
+          (apply #'vc-git-command nil 0 nil
+                 "commit" "--only" "--allow-empty"
+                 (nconc (if msg-file
+                            (list "-F" (file-local-name msg-file))
+                          (list "-m" message))
+                        args)))
+      (when (and msg-file (file-exists-p msg-file))
+        (delete-file msg-file))))
+  (with-environment-variables (("GIT_SEQUENCE_EDITOR" "true"))
+    (vc-git-command nil 0 nil "rebase" "--autostash" "--autosquash" "-i"
+                    (format "%s~1" rev))))
+
 (defvar vc-git-extra-menu-map
   (let ((map (make-sparse-keymap)))
     (define-key map [git-grep]
--=20
2.45.2


--=-=-=--

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Fri, 18 Oct 2024 09:31:02 +0000
Resent-Message-ID: <handler.64055.B64055.172924385020644 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, dmitry@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172924385020644
          (code B ref 64055); Fri, 18 Oct 2024 09:31:02 +0000
Received: (at 64055) by debbugs.gnu.org; 18 Oct 2024 09:30:50 +0000
Received: from localhost ([127.0.0.1]:37100 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t1jJp-0005Mt-LL
	for submit <at> debbugs.gnu.org; Fri, 18 Oct 2024 05:30:50 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:34426)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t1jJn-0005Mc-Rd
 for 64055 <at> debbugs.gnu.org; Fri, 18 Oct 2024 05:30:48 -0400
DKIM-Signature: a=rsa-sha256;
 b=R0Jw82y9cskQAw2KUNU0BoyuHGj4FGicG+/KvsEdb2sazaHPbCD55SQo26N9ytelTIQR645riv7QgcSgiyd9Skf5L7D1R400BXEwr6g7CIWtwL0g3O3sw+l6/nhNLGY2LbBS2tifEbBF18Wrc8MXOZvJO3TXO1wsACxp9Lm0Oq0BNoqwdDuWJmXoVRI5GHn4taCJymxhg/kTjrM8oXx9z8niuOi5OInso1nteqoWuxsl6fe5z+ijkNJri5I8/oeK2BDIYLbhLdD+v/Iqtt2MIac7ujPoUoOmX+Fphln/FIBxab6LA5TckX5szLYzxPFgGDD4xtQzVdY6gADVIkRRpg==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=2H9Hpg5lLEZV/DUAH3CjPRyfPwRWcWNli4TPwiBSH98=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=dyPJFoTvWq3tnZ0IfTzEloERPe9iL6ppkcAAVXnRV82Goml5bTidTXb4E8plz39sCGCju5zvXge0z0sWdBTjR5mNQJ0qQQnBs8KBhcXpbMp9q540GcTJQqanVVvNc2q+Z3sUSWyj3wQz09V8Bq4XEU0ASP3VASKJvDxKu8cFW6ytKn8g7+6W0DlVc4KzDYeon76V63OQgBkcTsT9i9rUUD+Va1h7YC1GuQdWGxjNlv3wQT9v6GgUsdqhTeNvvzRzNLv797yqhyN442HXeKb7L5LZLjYSuTQFMoxHB2qbFldZeg0bDM9y4zmngNIMC8sODf7UYnPvS6O7/X+/yxphPA==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=2H9Hpg5lLEZV/DUAH3CjPRyfPwRWcWNli4TPwiBSH98=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1873330782; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Fri, 18 Oct 2024 09:30:18 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 5B7177E980F; Fri, 18 Oct 2024 17:30:16 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <868qulojrx.fsf@HIDDEN> (Eli Zaretskii's message of "Fri, 18 Oct
 2024 12:14:10 +0300")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <87o73sad24.fsf@HIDDEN>
 <877ca63ln5.fsf@HIDDEN> <86r08enfri.fsf@HIDDEN>
 <87cyjyvsns.fsf@HIDDEN> <868qulojrx.fsf@HIDDEN>
Date: Fri, 18 Oct 2024 17:30:16 +0800
Message-ID: <87zfn1vjvb.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Fri 18 Oct 2024 at 12:14pm +03, Eli Zaretskii wrote:

> Definitely.  It is otherwise very hard to realize that the discussion
> of these changes happened in this particular bug.

Right, okay.

> That's definitely not what the comments and the implementation convey.
> And I then understand even less why the backend action was added for
> Git in the first place.

Hmm, I see what you mean.  I should have included more detail in the
commit message and/or comments.

>> > Btw, since CVS has an existing command-line option to amend the log
>> > message of a particular commit, I wonder whether the design that goes
>> > through a separate backend function which extracts the comment first
>> > is valid.
>>
>> We still need to extract the comment first so that the user has some
>> text to edit.
>
> Are we envisioning the user invoking this from anything other than a
> log buffer?  Why would someone want to do that?

I can imagine a few cases where it might be useful, but I don't think
that's the main point.

The main point is that parsing text out of the log view buffer is much
more error-prone.  For example, with a non-distributed VCS like CVS,
what if someone else has edited the comment in the meantime?  It makes
sense to fetch the latest known version instead of relying on buffer
text.

So, I hope that we will eventually completely replace
log-view-extract-comment.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Fri, 18 Oct 2024 12:19:02 +0000
Resent-Message-ID: <handler.64055.B64055.172925393417135 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, dmitry@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172925393417135
          (code B ref 64055); Fri, 18 Oct 2024 12:19:02 +0000
Received: (at 64055) by debbugs.gnu.org; 18 Oct 2024 12:18:54 +0000
Received: from localhost ([127.0.0.1]:37344 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t1lwU-0004SI-9N
	for submit <at> debbugs.gnu.org; Fri, 18 Oct 2024 08:18:54 -0400
Received: from eggs.gnu.org ([209.51.188.92]:37306)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t1lwR-0004Rz-JA
 for 64055 <at> debbugs.gnu.org; Fri, 18 Oct 2024 08:18:52 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t1lvy-0004jg-T9; Fri, 18 Oct 2024 08:18:23 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=uwa2BqueJS/mKnFkjsK8+YNKOSV947QTWqLRkV9Jm80=; b=iCC+rQUADB6p
 Dkwj9GoWKsAIT4l/DMRQXPtz1fcJh6qAXoWOpaDHDISv72ZZQtNNMn4ESrkVl2HQLSl5O5BGv+HFx
 BASk0mKfY3teON6e90Ft9GfA3Cw+14x4++X76q/flXhMkFAIrR66iJdmIio0bw3TqSgLtGMNThmsB
 EBqZu8UmcL7vJRaY4kjxF20I4DDc9ECSgIplMXtV63jlChpK3hR4RWAmZK8aaNc5imSPCwqZ3YJCA
 9SdhmuQZX/+ZAFLsLPZJErZ2VlBhqlz5+tSr6JqH6rKqV04qTqxbPFn+tlkF7ox2U1ZSmEMq4fKDj
 3oUajFvaHWq91ivQHd9oWw==;
Date: Fri, 18 Oct 2024 15:18:18 +0300
Message-Id: <864j59ob91.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <87zfn1vjvb.fsf@HIDDEN> (message from Sean
 Whitton on Fri, 18 Oct 2024 17:30:16 +0800)
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <87o73sad24.fsf@HIDDEN>
 <877ca63ln5.fsf@HIDDEN> <86r08enfri.fsf@HIDDEN>
 <87cyjyvsns.fsf@HIDDEN> <868qulojrx.fsf@HIDDEN>
 <87zfn1vjvb.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: 64055 <at> debbugs.gnu.org,  Morgan.J.Smith@HIDDEN,  rpluim@HIDDEN,
>   dmitry@HIDDEN
> Date: Fri, 18 Oct 2024 17:30:16 +0800
> 
> The main point is that parsing text out of the log view buffer is much
> more error-prone.  For example, with a non-distributed VCS like CVS,
> what if someone else has edited the comment in the meantime?  It makes
> sense to fetch the latest known version instead of relying on buffer
> text.

Now I'm confused: didn't you just tell me that CVS already had this
implemented, without ever needing the new backend method?  How do we
solve this problem in the CVS case without risking the errors?  What
you say above seems to tell that we do need an implementation of this
method for CVS as well, no?  Or what am I missing?

> So, I hope that we will eventually completely replace
> log-view-extract-comment.

So you do agree with me that we should have this implemented for other
backends, and the sooner the better?

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sat, 19 Oct 2024 10:30:02 +0000
Resent-Message-ID: <handler.64055.B64055.172933374731632 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172933374731632
          (code B ref 64055); Sat, 19 Oct 2024 10:30:02 +0000
Received: (at 64055) by debbugs.gnu.org; 19 Oct 2024 10:29:07 +0000
Received: from localhost ([127.0.0.1]:41559 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t26hn-0008E8-52
	for submit <at> debbugs.gnu.org; Sat, 19 Oct 2024 06:29:07 -0400
Received: from eggs.gnu.org ([209.51.188.92]:51956)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t26hk-0008Db-W6
 for 64055 <at> debbugs.gnu.org; Sat, 19 Oct 2024 06:29:05 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t26hH-00026g-8F; Sat, 19 Oct 2024 06:28:35 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=MFU1dnMqwOgf5sywjmzle1jnGVJHB9xwAZN1Txb4lEY=; b=IIwDnZ2NSeTr
 eOu50nM4saL4wVem10AUap+NeKxmJqJKd03oF9QHAYXH5EyfBvlc3twYkWBKcT31RlQRkWlM6SOo2
 wPkglG52WjAU2nnjSHUDVzG48m/Uu+AvIR/6aOg5MGk7AFX8g91fjM3OsPECOlr9qSkV6LxeckDHa
 IaZh2cHOWMv7IkwUmOf1j8Q976WWGNCG/8XiEjvtrJLEYdO3ctLFQLsUXxUW4PwSDh4kfy4OFRxe9
 Dgqemv6f2JMs0rIN7Jbq4TnBsiw4cFrmzMD5gthRtuu/EsX11BORc5WmWVGmWzn5WA556fOkzrkcO
 vYSK2HwD079IlXU+Hj3g1g==;
Date: Sat, 19 Oct 2024 13:28:31 +0300
Message-Id: <868qukl73k.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <874j59wym3.fsf@HIDDEN> (message from Sean
 Whitton on Fri, 18 Oct 2024 17:26:28 +0800)
References: <874j59wym3.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: Dmitry Gutov <dgutov@HIDDEN>, Morgan Smith <Morgan.J.Smith@HIDDEN>
> Date: Fri, 18 Oct 2024 17:26:28 +0800
> 
> This patch is the rest of this feature.  Eli, would you kindly test on
> MS-Windows, please?  Just try to edit the message for an unpushed git
> commit and add some Unicode, and see if it works correctly.

I'm supposed to type 'e' in the log buffer, edit the comment, then
type "C-c C-c"?  Or should I do something else?

When I do the above, I get an error message:

  vc-do-command: Failed (status 128): git --no-pager commit --only --allow-empty -F c:/Users/EliZ/AppData/Local/Temp/git-msgWaNflu

and the *vc* buffer says:

  fatal: No paths with --include/--only does not make sense.

It's possible my Git is very old, but shouldn't this command work with
old versions as well?

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Dmitry Gutov <dmitry@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 00:18:01 +0000
Resent-Message-ID: <handler.64055.B64055.172938342217933 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>, Robert Pluim <rpluim@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172938342217933
          (code B ref 64055); Sun, 20 Oct 2024 00:18:01 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 00:17:02 +0000
Received: from localhost ([127.0.0.1]:45155 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2Jcz-0004f3-VY
	for submit <at> debbugs.gnu.org; Sat, 19 Oct 2024 20:17:02 -0400
Received: from fout-a4-smtp.messagingengine.com ([103.168.172.147]:42385)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dmitry@HIDDEN>) id 1t2Jcx-0004ef-Be
 for 64055 <at> debbugs.gnu.org; Sat, 19 Oct 2024 20:17:00 -0400
Received: from phl-compute-01.internal (phl-compute-01.phl.internal
 [10.202.2.41])
 by mailfout.phl.internal (Postfix) with ESMTP id 5937213801EE;
 Sat, 19 Oct 2024 20:16:29 -0400 (EDT)
Received: from phl-mailfrontend-01 ([10.202.2.162])
 by phl-compute-01.internal (MEProxy); Sat, 19 Oct 2024 20:16:29 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc
 :cc:content-transfer-encoding:content-type:content-type:date
 :date:from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to; s=fm1; t=1729383389;
 x=1729469789; bh=3hKUZeHbzWJhr526avBDXrQpmlbm7FY0YHUsL9lYbxA=; b=
 C6gtRxCULaUx42ICGoeg9qr+RPGHF4B4WQ1BhaiB1MJXPWe9vfG/qo1gHvMyUyDI
 Kgtx4a9HX2J/ClgiAquSiNgAY73e/+pSEOB5McOHNKTVFbydd8+LsoahQxXHZy8G
 VVhqvWakHBB7v8stCFp4DfoN94k18nD9liLNjw0g3Ig8qsRxjN2SgqLZCFQshSFv
 Vh6HV0RvHMwoznzEPTSbKoO9ipP9I8hbdy0JNj59fw/caJwmmk52fHw4og9Hi7Nj
 oM7ur86z3NNDpiuW6ZGft4PPFVgEJ8QBEulipjL7optbaEZWa4PmE0AtiOFJfMAY
 Sk5VG9zTJ5AtHbe6Adartg==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=cc:cc:content-transfer-encoding
 :content-type:content-type:date:date:feedback-id:feedback-id
 :from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy
 :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1729383389; x=
 1729469789; bh=3hKUZeHbzWJhr526avBDXrQpmlbm7FY0YHUsL9lYbxA=; b=g
 rYi85CWQZNaH5gsf2svE3HRTsfg7hMKKl0U3NA4Bye14Ov6bgNjxhFcWWu3d/dJ3
 LXCJMSiZiOttOOzlUynUAwu5h8JdPegv9JRIvXh3C4P0o4mRB/yhNEKz7Zl6nztk
 Mwa/a4gMWJSlYRF60CppuHT21R8MuCSHv+eEpSgxX2q4RAILWx6VVaSb96o//7X3
 qJT6VF7Cr30Kb1QF/3l2EJk1rB8UyemDMmexIdoa6J1kboDf2IFvZrHsdTSXoqjr
 v+Y/kY0qeYMQAJyHYDlj8JQS1aKNXAt5Utx8j2tHT/pwch+O21c20qmNAk5djNkt
 /I6fFlF8iwI9G701oXfiw==
X-ME-Sender: <xms:3EsUZw6BHpmCJMymcVXyC3NpU7KKHpRRKculupIPKMVc7sN0GiYuhQ>
 <xme:3EsUZx6jzf40gd-EgQ1ZGn_bk6KxXM-3MjCzF1AF72vPVWs2354rG6yRLhCtB1ocG
 2sK-FU4MJqUHTFP0-c>
X-ME-Received: <xmr:3EsUZ_e_I5m_27-50Q4_wdEI8ZfjZbc1QlEYAM6EqphwpVmhIzcBMvCbi_jg8zfYg8fERf4XjXfDHYVbsE1piZbaKus4s-L7>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehiedgfeefucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu
 rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh
 htshculddquddttddmnecujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtvdej
 necuhfhrohhmpeffmhhithhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdrug
 gvvheqnecuggftrfgrthhtvghrnhepueegkeeifedtkedvleeujeefkeelhefhhfelhfev
 gfetieejteefffevhfdvtdfgnecuffhomhgrihhnpehsthgrtghkohhvvghrfhhlohifrd
 gtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhep
 ughmihhtrhihsehguhhtohhvrdguvghvpdhnsggprhgtphhtthhopeegpdhmohguvgepsh
 hmthhpohhuthdprhgtphhtthhopehsphifhhhithhtohhnsehsphifhhhithhtohhnrdhn
 rghmvgdprhgtphhtthhopehrphhluhhimhesghhmrghilhdrtghomhdprhgtphhtthhope
 hmohhrghgrnhdrjhdrshhmihhthhesohhuthhlohhokhdrtghomhdprhgtphhtthhopeei
 gedtheehseguvggssghughhsrdhgnhhurdhorhhg
X-ME-Proxy: <xmx:3EsUZ1ISSMF7v2lqA-JBSzingcGnpV7ECGHIEDbAR5j_z00HBV38_A>
 <xmx:3UsUZ0I9AUi4Xgk4pgHX_iFqDURtGPSI2_SxZODwFxy9R8WGhh_2dA>
 <xmx:3UsUZ2z9Tvt_azxb2agtokrC_dYbKE6rUC7mpkvhpb7LFah5RSFmvw>
 <xmx:3UsUZ4KAfrK4g-8yQmqLRxNTlzzx0lMNTyFafGLzD-x8ynNnYGowvg>
 <xmx:3UsUZ5Hd2jnfvpb33AZBF6pC4sDBesyW8HlXPJ9KgzwTkG2cuncD3Bgy>
Feedback-ID: i07de48aa:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat,
 19 Oct 2024 20:16:27 -0400 (EDT)
Message-ID: <a2559bae-4b88-4006-908f-d3750755159f@HIDDEN>
Date: Sun, 20 Oct 2024 01:16:25 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <f65c997d-6f2b-44c6-9bb2-3e493fb73d69@HIDDEN>
 <87jze6vwtx.fsf@HIDDEN>
Content-Language: en-US
From: Dmitry Gutov <dmitry@HIDDEN>
In-Reply-To: <87jze6vwtx.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

On 18/10/2024 07:50, Sean Whitton wrote:
>> So if we determined that its output could be used for editing, perhaps after
>> some massaging (e.g. reindenting and keeping only a subset of the headers),
>> that could be a minor win -- fewer methods is better in general. I haven't
>> tried to code it, so there could be pitfalls.
> I thought about it and realised that, for the git case, variables like
> vc-git-log-switches and vc-git-shortlog-switches can affect the output,
> and could make us misparse it.  And ultimately the benefits of avoiding
> a new backend method didn't seem to outweigh having parsing code that
> could turn out to be fragile.

IIUC vc-git-expanded-log-entry is only affected by the former var. We 
could bind it to nil (that could even be done generically, by looking 
for all vars called vc-BACKEND-log-switches).

But I agree fragility could be a problem. It could also be a win to have 
one of the methods to be implemented in terms of the other.

>> The new vc-git-get-change-comment seems good in terms of functionality. I was
>> thinking that the headers such as Author, No-Verify and Sign-Off, might be
>> good to show as well, but as long as their values are intact after the edit,
>> that's optional.
> I thought that it would be nice to include Author, in particular, as you
> might need to amend the value.  That would require adding additional
> arguments to the modify-change-comment action, though, so I left it for
> later if someone wants to implement it.

I think you're parsing out all the headers from the COMMENT argument in 
the posted patch, so this paragraph seems to be moot. Like you say in 
the patch though, it seems changing Author is not supported.

To do that, apparently we'd either need to rebase with a pause (with 
'git amend' in the middle), or use 'git rebase --exec' like in 
https://stackoverflow.com/a/79068024/615245. The latter seems like it 
would apply to all commits in the range, so it might require the same 
dance as 'amend'.

(I can comment on the patch itself tomorrow.)

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 00:57:01 +0000
Resent-Message-ID: <handler.64055.B64055.172938580824867 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, dmitry@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172938580824867
          (code B ref 64055); Sun, 20 Oct 2024 00:57:01 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 00:56:48 +0000
Received: from localhost ([127.0.0.1]:45191 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2KFU-0006T1-31
	for submit <at> debbugs.gnu.org; Sat, 19 Oct 2024 20:56:48 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:46092)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t2KFS-0006Sj-Ba
 for 64055 <at> debbugs.gnu.org; Sat, 19 Oct 2024 20:56:47 -0400
DKIM-Signature: a=rsa-sha256;
 b=ODHl7AhC6GVq+tbMgecoPOF2MyKZJP/W7MlW/3FWKnnhs7zCdun0lTMmp+Orw9iQEEspl0P3JTg7NHu5DjJ2c9qKW+J4DwnJG9eKswsuP28NiVNejbU5cqi3NvWK215JQNS6wPCEO1eS5Y+kWbRvNpGlaOSFUlBZKjQgo1IS0is+98ZymW69QO95wPo+8IvIbbJ3fSAnWOLfPtJrrVEUONZZdEaDsVQrwG9ryKV7Os7mzUhI0zdZd3R0sMQKJVbzlUbH+YuDU0ErjJwues3ojFv1VqUKAuskc9VJE9UUPjWTJjaHcmRdPYfzXHuThh7SCVFiH7XWzuDB8pONMiT2pA==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=C/9OwYwy81tKIQiOvBiQoYHzyW07TkA/7v4dQ6CbnSQ=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=Inz4oNhVNf9Prea0djWj+CM+CmrCbUyc81garziH8ykKHrcQXS6HquLtmBBC/yrBCiBOVISxbuko2U6TMEi74Xq+Hg4SdkLLUAM8gsLlNEUIMbu0lZMWulgy5QyGEoFgDSkwJXrV7Hf1lt1F1+4DK63tkPoFpY/FaM4zopaUrLg/PDSrJP1Fh2qsHPLLgGCxFUGdIR50W4Dg51UFTWsdWqE789++hrvk8dtsv5BaEKu79tgbrQ07TE9ahSh+UHgoI2Nd7TdpO8vjQsXUsSUzDeNVqeJM+JGTq4oKTyisqOSR4WfrINsKf9hA+X7laqK3vqQErOYSnxEVf7CB2yUdYw==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=C/9OwYwy81tKIQiOvBiQoYHzyW07TkA/7v4dQ6CbnSQ=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -1124431599; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Sun, 20 Oct 2024 00:56:15 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 8A85D7E8333; Sun, 20 Oct 2024 08:56:12 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <864j59ob91.fsf@HIDDEN> (Eli Zaretskii's message of "Fri, 18 Oct
 2024 15:18:18 +0300")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <87o73sad24.fsf@HIDDEN>
 <877ca63ln5.fsf@HIDDEN> <86r08enfri.fsf@HIDDEN>
 <87cyjyvsns.fsf@HIDDEN> <868qulojrx.fsf@HIDDEN>
 <87zfn1vjvb.fsf@HIDDEN> <864j59ob91.fsf@HIDDEN>
Date: Sun, 20 Oct 2024 08:56:12 +0800
Message-ID: <87ldyjvbgz.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Fri 18 Oct 2024 at 03:18pm +03, Eli Zaretskii wrote:

>> From: Sean Whitton <spwhitton@HIDDEN>
>> Cc: 64055 <at> debbugs.gnu.org,  Morgan.J.Smith@HIDDEN,  rpluim@HIDDEN,
>>   dmitry@HIDDEN
>> Date: Fri, 18 Oct 2024 17:30:16 +0800
>>
>> The main point is that parsing text out of the log view buffer is much
>> more error-prone.  For example, with a non-distributed VCS like CVS,
>> what if someone else has edited the comment in the meantime?  It makes
>> sense to fetch the latest known version instead of relying on buffer
>> text.
>
> Now I'm confused: didn't you just tell me that CVS already had this
> implemented, without ever needing the new backend method?  How do we
> solve this problem in the CVS case without risking the errors?  What
> you say above seems to tell that we do need an implementation of this
> method for CVS as well, no?  Or what am I missing?
>
>> So, I hope that we will eventually completely replace
>> log-view-extract-comment.
>
> So you do agree with me that we should have this implemented for other
> backends, and the sooner the better?

The VC design principle here is that commands should be implemented for
more than one version control system, in part because that way we ensure
they really are general version control user operations, and not
something parochial to the way a particular VCS sees the world.

In the context of this bug, the relevant command for this design
principle is log-view-modify-change-comment.  Previously, that command
worked only for src, rcs, sccs, cvs and svn, and partly for Hg.  Soon it
will also work for git.  So, the design principle is respected.

On the other hand, the design principle doesn't apply directly to the
new get-change-comment backend action, because src, rcs, sccs, cvs and
svn do not *require* an implementation of get-change-comment in order
for the log-view-modify-change-comment command to work, so far as I
understand it -- otherwise the feature would not have been implemented
the way it is, or we'd have bug reports.

Git, I think, does require an implementation of get-change-comment, or
at least, I concluded that it's the most natural way to implement
log-view-modify-change-comment for git.

In a similar vein, non-distributed VCS require a receive-file backend
action, but it would not make sense to write a function
vc-git-receive-file.  The VC design principle does not apply directly to
backend actions.  For many backend actions, including
get-change-comment, only certain kinds of VCS will require an
implementation, in order to support the high-level VC user commands.

Nevertheless, although src, rcs, sccs, cvs and svn do not *require*
get-change-comment, I think it would be preferable if they did have an
implementation, instead of using log-view-extract-comment, for the
reasons given previously.  But we are talking about changing working
code.  We should not rush to replace log-view-extract-comment.  We can
do so incrementally and gradually, and it's low priority.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 01:00:01 +0000
Resent-Message-ID: <handler.64055.B64055.172938597625153 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Dmitry Gutov <dmitry@HIDDEN>
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>, Robert Pluim <rpluim@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172938597625153
          (code B ref 64055); Sun, 20 Oct 2024 01:00:01 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 00:59:36 +0000
Received: from localhost ([127.0.0.1]:45197 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2KIB-0006Xd-RT
	for submit <at> debbugs.gnu.org; Sat, 19 Oct 2024 20:59:36 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:46366)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t2KIA-0006XQ-3l
 for 64055 <at> debbugs.gnu.org; Sat, 19 Oct 2024 20:59:34 -0400
DKIM-Signature: a=rsa-sha256;
 b=eBGoP5F5DPGRwZzH7rfu95GHwrQYBzlXRmkmMYkVQCOdzdQrUNS8w7NQkl2c5QHDSZPDvmCpwewLifpUaGU0X5ou5P6lvV+XBO9jUWNl2Y7fOIsO9Ud8i45UGTIoMRGwXKfnboBsTtN7VWkV7eWYtur+s4vttx7Afn/a33vLTqmTUHAaKgYKY/NNSHaQlvyM8jR9+N01aK2107IrDyTqqK1Q6+k6KDzlw24BCr7uu9ipTzrqY0XrczSPh5fw2WkKri9viizqhEuL0W5fGUYSeiAErrj36w8s4TY8qqMsrqQt+sk6AS6buzENrKFLhEhqL3TxzBL1j1ptpPj6QcwcMw==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=xq7dJtiFcbyza3SRMhYCP+yxb3X9lJvNx+Zruyx6Xn0=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=nh8s2VCAYGybpX/N2BfuJ/9Dc2JwEj7R5yDzZXr5mdDY9ek/kBlXUP97bFx6np69w4Hmi/hQasGjlw4XeGDrS8F96Jkv9xkht+2CkKdWb+0XFZTAs1WjcWjVGe2w4JqX14CUINStnv2eJ5O4c0LPbiEOwm0FABgOkfCNibOLAAncr6/7fKRrmo/P/M8QdE6rWFdcilSzepcVm1IK8OgIL4NXtwVyPDUSaJD9Dde7StyjmaUS5ZT15e+/t53tfF5f1qdm6ZL0Tu1jtLDQFTOMdboiitTurjBiYvwufLVeu2evvI9CK33eIfuFXnr972ZFO7P3r4fuwnGSX9VKQ2RVwQ==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=xq7dJtiFcbyza3SRMhYCP+yxb3X9lJvNx+Zruyx6Xn0=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -1529162964; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Sun, 20 Oct 2024 00:58:56 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 90A007E8333; Sun, 20 Oct 2024 08:58:52 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <a2559bae-4b88-4006-908f-d3750755159f@HIDDEN> (Dmitry Gutov's
 message of "Sun, 20 Oct 2024 01:16:25 +0100")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <f65c997d-6f2b-44c6-9bb2-3e493fb73d69@HIDDEN>
 <87jze6vwtx.fsf@HIDDEN>
 <a2559bae-4b88-4006-908f-d3750755159f@HIDDEN>
Date: Sun, 20 Oct 2024 08:58:52 +0800
Message-ID: <87h697vbcj.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Sun 20 Oct 2024 at 01:16am +01, Dmitry Gutov wrote:

>> I thought that it would be nice to include Author, in particular, as you
>> might need to amend the value.  That would require adding additional
>> arguments to the modify-change-comment action, though, so I left it for
>> later if someone wants to implement it.
>
> I think you're parsing out all the headers from the COMMENT argument in the
> posted patch, so this paragraph seems to be moot.

Yeah, I realised that because we are invoking git-commit(1), it's easy
to support most of them.

> Like you say in the patch though, it seems changing Author is not
> supported.
>
> To do that, apparently we'd either need to rebase with a pause (with 'git
> amend' in the middle), or use 'git rebase --exec' like in
> https://stackoverflow.com/a/79068024/615245. The latter seems like it would
> apply to all commits in the range, so it might require the same dance as
> 'amend'.

Yeah.  We can consider it as a possible future enhancement.
I'm also concerned about it making the command slower -- it's already
not that fast.

> (I can comment on the patch itself tomorrow.)

Cool, thanks.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 05:02:01 +0000
Resent-Message-ID: <handler.64055.B64055.17294004673235 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, dmitry@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17294004673235
          (code B ref 64055); Sun, 20 Oct 2024 05:02:01 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 05:01:07 +0000
Received: from localhost ([127.0.0.1]:45438 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2O3v-0000q7-4U
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 01:01:07 -0400
Received: from eggs.gnu.org ([209.51.188.92]:41220)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t2O3s-0000pQ-MS
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 01:01:05 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t2O1H-0005hj-9s; Sun, 20 Oct 2024 00:58:23 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=XE4B8A1kRwFBXSZZ01krgqCXtl8a+Bn1SKsLNqJzrgQ=; b=LGf96zAQWgMA
 8Kxx8jyl06I2dm90OCehJLHx/pzFO4fn+j7JIkpH08L6nqkJbaePK/Bhn1ZFVsrmFzF1lTOQguFVr
 lUAkqENuh8R5FiUibNRbRWbwq+kpjDeiPTGbwBBvOr1ZRnyeJ9vq2RkViJlnu5crbceiOK7N4X76P
 9t3XyWs8oIPXObqcTaIxmNlW1OlbcuZD6hraDHH2wDWlGshYygfZG3NbFTxDmcWv6fRcuZ5KO8rzh
 o8HZ2LZJcxU/8D4MszMQNSJ77LRMSOGjJv7dcrrC4GjsaPU/mlBf9xPD1vww11sCG9M7vnM/YbdqY
 Kr/EuMT/W+Nd9GFvhbFWaA==;
Date: Sun, 20 Oct 2024 07:58:21 +0300
Message-Id: <86h697jrpu.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <87ldyjvbgz.fsf@HIDDEN> (message from Sean
 Whitton on Sun, 20 Oct 2024 08:56:12 +0800)
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <87o73sad24.fsf@HIDDEN>
 <877ca63ln5.fsf@HIDDEN> <86r08enfri.fsf@HIDDEN>
 <87cyjyvsns.fsf@HIDDEN> <868qulojrx.fsf@HIDDEN>
 <87zfn1vjvb.fsf@HIDDEN> <864j59ob91.fsf@HIDDEN>
 <87ldyjvbgz.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: 64055 <at> debbugs.gnu.org,  Morgan.J.Smith@HIDDEN,  rpluim@HIDDEN,
>   dmitry@HIDDEN
> Date: Sun, 20 Oct 2024 08:56:12 +0800
> 
> On the other hand, the design principle doesn't apply directly to the
> new get-change-comment backend action, because src, rcs, sccs, cvs and
> svn do not *require* an implementation of get-change-comment in order
> for the log-view-modify-change-comment command to work, so far as I
> understand it -- otherwise the feature would not have been implemented
> the way it is, or we'd have bug reports.
> 
> Git, I think, does require an implementation of get-change-comment, or
> at least, I concluded that it's the most natural way to implement
> log-view-modify-change-comment for git.

It is this difference between Git and the rest that I don't yet see,
and you didn't explain it, just stated its existence.  Why is the
method necessary for Git, but not for other VCSes? they all produce
similar displays of log messages, complete with Author, Date, etc.,
and so the difficulties of extracting just the change log message
should affect all of them, no?

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 05:20:02 +0000
Resent-Message-ID: <handler.64055.B64055.17294015876700 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17294015876700
          (code B ref 64055); Sun, 20 Oct 2024 05:20:02 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 05:19:47 +0000
Received: from localhost ([127.0.0.1]:45458 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2OLy-0001k0-Ck
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 01:19:47 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:42584)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t2OLv-0001jk-MH
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 01:19:45 -0400
DKIM-Signature: a=rsa-sha256;
 b=T4gakvXkWg5HkCuxPsvs68FwBRfla2m5KrgmyQhyVY7tuH5MjgJ85WqdD626a/4u0rwSweWF+YcDURzZszucCiuKPb6anx/wK8B0QpueLRZdPCzepOIBtuSSaEKK7dYcPjz38c5orTCvB5FgmBbuDmqmUNJmB/EBRS1KgcICeb/9AASIg1s218D2090kVKsXSmIR9XVieeleuoVfWtTu4V+Aw5Ih7v0ovR2GmSgdTwYD2qhAE7t1kWxD5mRQkxAuaEPTC1N1Vz2UHZCJr7WL0Fd1RIbmT7f4pn/zQ+ZtAd8dCK7jW6rzgdaleJWwVx/15ONkg8IyLLy0IwVnzAxUWQ==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=lfssYszMSukwpHxvM4SKCvpABdocGMtyE8pcINYTOBQ=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=VmzExdsX+mSXIKvMudQj1100ZWozyeWNUKR9ht64epWhkK7/wvO9m5wbpBxxOfujz92a/qxBcbJIfGCXXqvNVdbaOzYUWOu2TdrnIEet150O5UPP66oKFyyEaCgtlZ9rNvfmDwnyrYYilxLp6dIjPUmpV2GS5zkQcU9v8/1mubJUWCYwGsIE8cG6v4bliAosujD7Ef9HHxhBSGNEJDtbkgNIXqbxyCTdCWosWnDscPCQW8REe5u6zsGkmo1sdk1nTLaNeNEpQabmHIDvrABoBb+bkrgzAjetVnU/q3iswjzpcrKlFa/wDZ9PWdJWXxvOG4gCchTzQ4fPh8oYdWMrzw==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=lfssYszMSukwpHxvM4SKCvpABdocGMtyE8pcINYTOBQ=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -296761697; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Sun, 20 Oct 2024 05:19:12 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id D9F9E7E1EAA; Sun, 20 Oct 2024 13:19:09 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <868qukl73k.fsf@HIDDEN> (Eli Zaretskii's message of "Sat, 19 Oct
 2024 13:28:31 +0300")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
Date: Sun, 20 Oct 2024 13:19:09 +0800
Message-ID: <87bjzfuzaq.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--=-=-=
Content-Type: text/plain

Hello,

On Sat 19 Oct 2024 at 01:28pm +03, Eli Zaretskii wrote:

>> From: Sean Whitton <spwhitton@HIDDEN>
>> Cc: Dmitry Gutov <dgutov@HIDDEN>, Morgan Smith <Morgan.J.Smith@HIDDEN>
>> Date: Fri, 18 Oct 2024 17:26:28 +0800
>>
>> This patch is the rest of this feature.  Eli, would you kindly test on
>> MS-Windows, please?  Just try to edit the message for an unpushed git
>> commit and add some Unicode, and see if it works correctly.
>
> I'm supposed to type 'e' in the log buffer, edit the comment, then
> type "C-c C-c"?

Yeah, that's right.

> When I do the above, I get an error message:
>
>   vc-do-command: Failed (status 128): git --no-pager commit --only
> --allow-empty -F c:/Users/EliZ/AppData/Local/Temp/git-msgWaNflu
>
> and the *vc* buffer says:
>
>   fatal: No paths with --include/--only does not make sense.
>
> It's possible my Git is very old, but shouldn't this command work with
> old versions as well?

I've looked into it and what's required is Git 2.11.1 from early 2017.

I think we can support older by stashing and unstashing.  So please try
the attached patch, which does that.

-- 
Sean Whitton

--=-=-=
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment;
 filename=v2-0001-Support-modifying-VC-change-comments-for-Git.patch
Content-Transfer-Encoding: quoted-printable

From 3ab65121d229e64915c7b4c89fe53f80cb34ebff Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@HIDDEN>
Date: Fri, 18 Oct 2024 17:19:45 +0800
Subject: [PATCH v2] Support modifying VC change comments for Git

* lisp/vc/vc-git.el (vc-git-allow-rewriting-history): New option.
(vc-git--assert-allowed-rewrite, vc-git-modify-change-comment):
New functions (bug#64055).

(vc-git--current-branch): Factor out of vc-git-dir--branch-headers.
(vc-git--log-edit-extract-headers): Factor out of vc-git-checkin.

* etc/NEWS: Announce the new support and option.
---
 etc/NEWS          |  15 +++++
 lisp/vc/vc-git.el | 167 ++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 154 insertions(+), 28 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 10d86173235..d2e72bc537a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -568,6 +568,21 @@ a desktop notification when the song changes, using
 customized using the new user options 'mpc-notifications-title' and
 'mpc-notifications-body'.
=20
+** VC
+
+---
+*** Using 'e' from Log View mode to modify change comments now works for G=
it.
+
+---
+*** New user option 'vc-git-allow-rewriting-history'.
+Many Git commands can change your copy of published change history
+without warning.  If VC commands detect that this could happen, they
+will stop.  You can customize this variable to permit rewriting history
+even though Emacs thinks it is dangerous.
+
+So far, this applies only to the 'log-view-modify-change-comment'
+command.
+
 
 * New Modes and Packages in Emacs 31.1
=20
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index f77bf0cc5ff..59d5386bc72 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -252,6 +252,27 @@ vc-git-revision-complete-only-branches
   :type 'boolean
   :version "28.1")
=20
+;; The default is nil because only a VC user who also possesses a lot of
+;; Git-specific knowledge can know when it is okay to rewrite history,
+;; and we can't convey to a relatively Git-na=C3=AFve user the potential
+;; risks in only the space of a minibuffer y/n prompt.
+(defcustom vc-git-allow-rewriting-history nil
+  "When non-nil, permit Git operations that may rewrite published history.
+
+Many Git commands can change your copy of published change history
+without warning.  If this occurs, you won't be able to pull and push in
+the ordinary way until you take special action.  See \"Recovering from
+Upstream Rebase\" in the Man page git-rebase(1).
+
+Normally, Emacs refuses to run Git commands that it thinks will rewrite
+published history.  If you customize this variable to a non-nil value,
+Emacs will instead prompt you to confirm that you really want to perform
+the rewrite.  A value of `no-ask' means to proceed with no prompting."
+  :type '(choice (const :tag "Don't allow" nil)
+                 (const :tag "Prompt to allow" t)
+                 (const :tag "Allow without prompting" no-ask))
+  :version "31.1")
+
 ;; History of Git commands.
 (defvar vc-git-history nil)
=20
@@ -728,11 +749,13 @@ vc-git-dir-status-files
                                  :files files
                                  :update-function update-function)))
=20
+(defun vc-git--current-branch ()
+  (vc-git--out-match '("symbolic-ref" "HEAD")
+                     "^\\(refs/heads/\\)?\\(.+\\)$" 2))
+
 (defun vc-git-dir--branch-headers ()
   "Return headers for branch-related information."
-  (let ((branch (vc-git--out-match
-                 '("symbolic-ref" "HEAD")
-                 "^\\(refs/heads/\\)?\\(.+\\)$" 2))
+  (let ((branch (vc-git--current-branch))
         tracking remote-url)
     (if branch
         (when-let ((branch-merge
@@ -1082,6 +1105,17 @@ vc-git-checkin-patch
=20
 (autoload 'vc-switches "vc")
=20
+(defun vc-git--log-edit-extract-headers (comment)
+  (cl-flet ((boolean-arg-fn (argument)
+              (lambda (v) (and (equal v "yes") (list argument)))))
+    (log-edit-extract-headers
+     `(("Author" . "--author")
+       ("Date" . "--date")
+       ("Amend" . ,(boolean-arg-fn "--amend"))
+       ("No-Verify" . ,(boolean-arg-fn "--no-verify"))
+       ("Sign-Off" . ,(boolean-arg-fn "--signoff")))
+     comment)))
+
 (defun vc-git-checkin (files comment &optional _rev)
   (let* ((file1 (or (car files) default-directory))
          (root (vc-git-root file1))
@@ -1180,31 +1214,23 @@ vc-git-checkin
               (vc-git-command nil 0 patch-file "apply" "--cached")
             (delete-file patch-file))))
       (when to-stash (vc-git--stash-staged-changes files)))
-    (cl-flet ((boolean-arg-fn
-               (argument)
-               (lambda (value) (when (equal value "yes") (list argument)))=
))
-      ;; When operating on the whole tree, better pass "-a" than ".", sinc=
e "."
-      ;; fails when we're committing a merge.
-      (apply #'vc-git-command nil 0 (if (and only (not vc-git-patch-string=
)) files)
-             (nconc (if msg-file (list "commit" "-F"
-                                       (file-local-name msg-file))
-                      (list "commit" "-m"))
-                    (let ((args
-                           (log-edit-extract-headers
-                            `(("Author" . "--author")
-                              ("Date" . "--date")
-                              ("Amend" . ,(boolean-arg-fn "--amend"))
-                              ("No-Verify" . ,(boolean-arg-fn "--no-verify=
"))
-                              ("Sign-Off" . ,(boolean-arg-fn "--signoff")))
-                            comment)))
-                      (when msg-file
-                        (let ((coding-system-for-write
-                               (or pcsw vc-git-commits-coding-system)))
-                          (write-region (car args) nil msg-file))
-                        (setq args (cdr args)))
-                      args)
-                    (unless vc-git-patch-string
-                      (if only (list "--only" "--") '("-a"))))))
+    ;; When operating on the whole tree, better pass "-a" than ".",
+    ;; since "."  fails when we're committing a merge.
+    (apply #'vc-git-command nil 0
+           (if (and only (not vc-git-patch-string)) files)
+           (nconc (if msg-file (list "commit" "-F"
+                                     (file-local-name msg-file))
+                    (list "commit" "-m"))
+                  (let ((args
+                         (vc-git--log-edit-extract-headers comment)))
+                    (when msg-file
+                      (let ((coding-system-for-write
+                             (or pcsw vc-git-commits-coding-system)))
+                        (write-region (car args) nil msg-file))
+                      (setq args (cdr args)))
+                    args)
+                  (unless vc-git-patch-string
+                    (if only (list "--only" "--") '("-a")))))
     (if (and msg-file (file-exists-p msg-file)) (delete-file msg-file))
     (when to-stash
       (let ((cached (make-nearby-temp-file "git-cached")))
@@ -1960,6 +1986,91 @@ vc-git-get-change-comment
     (vc-git-command standard-output 1 nil
                     "log" "--max-count=3D1" "--pretty=3Dformat:%B" rev)))
=20
+(defun vc-git--assert-allowed-rewrite (rev)
+  (when (and (not (eq vc-git-allow-rewriting-history 'no-ask))
+             ;; Check there is an upstream.
+             (with-temp-buffer
+               (vc-git--out-ok "config" "--get"
+                               (format "branch.%s.merge"
+                                       (vc-git--current-branch)))))
+    (let ((outgoing (split-string
+                     (with-output-to-string
+                       (vc-git-command standard-output 0 nil "log"
+                                       "--pretty=3Dformat:%H"
+                                       "@{upstream}..HEAD")))))
+      (unless (or (cl-member rev outgoing :test #'string-prefix-p)
+                  (and vc-git-allow-rewriting-history
+                       (yes-or-no-p
+                        (format
+"Commit %s looks to be published; are you sure you want to rewrite history=
?"
+                         rev))))
+        (user-error "Will not rewrite likely-public Git history")))))
+
+(defun vc-git-modify-change-comment (files rev comment)
+  (vc-git--assert-allowed-rewrite rev)
+  (let* ((args (delete "--amend"
+                       (vc-git--log-edit-extract-headers comment)))
+         (message (format "amend! %s\n\n%s" rev (pop args)))
+         (msg-file
+          ;; On MS-Windows, pass the message through a file, to work
+          ;; around how command line arguments must be in the system
+          ;; codepage, and therefore might not support non-ASCII.
+          ;;
+          ;; As our other arguments are static, we need not be concerned
+          ;; about the encoding of command line arguments in general.
+          ;; See `vc-git-checkin' for the more complex case.
+          (and (eq system-type 'windows-nt)
+               (let ((default-directory
+                      (or (file-name-directory (or (car files)
+                                                   default-directory))
+                          default-directory)))
+                 (make-nearby-temp-file "git-msg"))))
+         (nothing-staged
+          (zerop
+           (vc-git-command nil t nil "diff" "--cached" "--quiet"))))
+    ;; We want to do just
+    ;;
+    ;;     % git commit --only --allow-empty -m...
+    ;;     % git rebase --autostash --autosquash -i REV~1
+    ;;
+    ;; because the first command is guaranteed to create an empty commit
+    ;; regardless of the state of the index and working tree.  However,
+    ;; that requires git.git commit 319d835, released in Git 2.11.1.
+    ;; In order to support older Git we do this longer, slower sequence:
+    ;;
+    ;;     % git stash push
+    ;;     % git commit --allow-empty -m...
+    ;;     % git rebase --autosquash -i REV~1
+    ;;     % git stash pop
+    (unless nothing-staged
+      (vc-git-command nil 0 nil "stash" "push"))
+    (unwind-protect
+        (progn
+          (when (cl-intersection '("--author" "--date") args
+                                 :test #'string=3D)
+            ;; 'git rebase --autosquash' cannot alter authorship.
+            ;; See the description of --fixup in git-commit(1).
+            (error
+"Author: and Date: not supported when modifying existing commits"))
+          (when msg-file
+            (let ((coding-system-for-write
+                   (or coding-system-for-write
+                       vc-git-commits-coding-system)))
+              (write-region message nil msg-file)))
+          (apply #'vc-git-command nil 0 nil
+                 "commit" "--allow-empty"
+                 (nconc (if msg-file
+                            (list "-F" (file-local-name msg-file))
+                          (list "-m" message))
+                        args)))
+      (when (and msg-file (file-exists-p msg-file))
+        (delete-file msg-file)))
+    (with-environment-variables (("GIT_SEQUENCE_EDITOR" "true"))
+      (vc-git-command nil 0 nil "rebase" "--autosquash" "-i"
+                      (format "%s~1" rev)))
+    (unless nothing-staged
+      (vc-git-command nil 0 nil "stash" "pop" "--index"))))
+
 (defvar vc-git-extra-menu-map
   (let ((map (make-sparse-keymap)))
     (define-key map [git-grep]
--=20
2.45.2


--=-=-=--

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 05:31:02 +0000
Resent-Message-ID: <handler.64055.B64055.17294022379180 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, dmitry@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17294022379180
          (code B ref 64055); Sun, 20 Oct 2024 05:31:02 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 05:30:37 +0000
Received: from localhost ([127.0.0.1]:45474 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2OWT-0002O0-2M
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 01:30:37 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:52146)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t2OWR-0002Ib-CN
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 01:30:36 -0400
DKIM-Signature: a=rsa-sha256;
 b=UsrYbEV1/aBqOfEyIhVdO9kzpacieV6xDfZqYmDQB8ltL0IhpHw4WphtYZEDaYvxaJzAQjyLBvlKORbsLc0HQHJl8pCtASEo3XP1OEWAJ+QGH4T/K13g3nwKsGSoJ7YIPJsBScBJVOhCw53agtqhhQnaXA13RJ4xkMSYhZ61ShwwCDaXuwE8a1nZ5njhTTJM4SvhmFZMDKpUeWOtYeTYPA54n5gA9Y675A9fx5PJ2tf3II7drNT0p+m9ap5qYi+U1yWdP28P2unSZdRBkNV308W22Q6zS9nA+Uyyt7iZEA6C1rzaHImXtOMQ/1ntNufO5olzedAQtz9dZSQCXx0ezA==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=kq4IrSJBPGG5deYTIUeJ1PalZKLAM5rjFKjdgwZIb2U=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=aWVScY3dq1YK3O/TZVG6CppSW4M2dw7NWwCQQAJHDhIEtBGAXXXqiHarY74O7BkO83asAxE9CQ6CKEys/AX6IjHpZepIDOEWkWAkvKpUGLiR5hBVBRf9n8Z7cmdApDVcBFVZ494YHZQjZ79hYoL7pKO2ty4evpW98oYGiR8sG4MiWtzplcLzgeqTwSdC8kbRvquT/vyXXy06hIUhGGprIV6HWmsBx5SXX+fzpBLaaduddobx75TiOD8mZBhUldDTWBedOCRQnGTsHcy1vceHV/uKDrCv0yTZY5sTEZX7Tmx/v8spmL+eqL/fPMX9cgMGinbxUugoX1nU20a9xNa/pQ==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=kq4IrSJBPGG5deYTIUeJ1PalZKLAM5rjFKjdgwZIb2U=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -413961508; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Sun, 20 Oct 2024 05:30:02 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id B0C387E1EAA; Sun, 20 Oct 2024 13:29:59 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <86h697jrpu.fsf@HIDDEN> (Eli Zaretskii's message of "Sun, 20 Oct
 2024 07:58:21 +0300")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <87o73sad24.fsf@HIDDEN>
 <877ca63ln5.fsf@HIDDEN> <86r08enfri.fsf@HIDDEN>
 <87cyjyvsns.fsf@HIDDEN> <868qulojrx.fsf@HIDDEN>
 <87zfn1vjvb.fsf@HIDDEN> <864j59ob91.fsf@HIDDEN>
 <87ldyjvbgz.fsf@HIDDEN> <86h697jrpu.fsf@HIDDEN>
Date: Sun, 20 Oct 2024 13:29:59 +0800
Message-ID: <87plnvtk88.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Sun 20 Oct 2024 at 07:58am +03, Eli Zaretskii wrote:

> It is this difference between Git and the rest that I don't yet see,
> and you didn't explain it, just stated its existence.  Why is the
> method necessary for Git, but not for other VCSes? they all produce
> similar displays of log messages, complete with Author, Date, etc.,
> and so the difficulties of extracting just the change log message
> should affect all of them, no?

Ah, right.

The difference is that with Git you can use variables like
vc-git-log-switches and vc-git-shortlog-switches to radically change the
log output.  We can't realistically deal with all the possibilities from
Lisp.

Whereas, so far as I understand, such customisation of the output is not
available with the older VCS.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 06:10:01 +0000
Resent-Message-ID: <handler.64055.B64055.172940459616745 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, dmitry@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172940459616745
          (code B ref 64055); Sun, 20 Oct 2024 06:10:01 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 06:09:56 +0000
Received: from localhost ([127.0.0.1]:45501 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2P8V-0004M0-JG
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 02:09:55 -0400
Received: from eggs.gnu.org ([209.51.188.92]:39432)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t2P8T-0004Lk-4V
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 02:09:54 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t2P7x-00039s-7h; Sun, 20 Oct 2024 02:09:21 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=4S0fsYjI8iz+OAtVdaQG2+y5fzs7z18Z9rFkuaSCcqA=; b=hZxvKzc/9/8T
 i2saPCqtoPWukVB4BVtNQifEa/2nCiwStUwolmtxwuGPIDJgA0r3xRtWdpUcbtPPgKPZeJ3kElrTO
 nXe0HquWMNEmNY3yFEDtYm+R/2g7DlwAZsA/n5UEIX2xX4xzLh22+rzO8mzZFPiFSPLZEFHT4LV1E
 Swn3I9VW/ZPvHeuovWihd57pIiecldUKmnzuDjJl3Y38GH+0IUoQFMqOVh4tKuSeKFz8He6ZorAZj
 /GQimd72tNR+qdkStPBEoN5mQh+WF/2tUn2wQhg1NG04ofVPl+IXajNxvUST/hDIrrAx3IukDXpM6
 wGtwh3kaFjigYH1EOYoVGA==;
Date: Sun, 20 Oct 2024 09:09:16 +0300
Message-Id: <86bjzfjofn.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <87plnvtk88.fsf@HIDDEN> (message from Sean
 Whitton on Sun, 20 Oct 2024 13:29:59 +0800)
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <87o73sad24.fsf@HIDDEN>
 <877ca63ln5.fsf@HIDDEN> <86r08enfri.fsf@HIDDEN>
 <87cyjyvsns.fsf@HIDDEN> <868qulojrx.fsf@HIDDEN>
 <87zfn1vjvb.fsf@HIDDEN> <864j59ob91.fsf@HIDDEN>
 <87ldyjvbgz.fsf@HIDDEN> <86h697jrpu.fsf@HIDDEN>
 <87plnvtk88.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: 64055 <at> debbugs.gnu.org,  Morgan.J.Smith@HIDDEN,  rpluim@HIDDEN,
>   dmitry@HIDDEN
> Date: Sun, 20 Oct 2024 13:29:59 +0800
> 
> Hello,
> 
> On Sun 20 Oct 2024 at 07:58am +03, Eli Zaretskii wrote:
> 
> > It is this difference between Git and the rest that I don't yet see,
> > and you didn't explain it, just stated its existence.  Why is the
> > method necessary for Git, but not for other VCSes? they all produce
> > similar displays of log messages, complete with Author, Date, etc.,
> > and so the difficulties of extracting just the change log message
> > should affect all of them, no?
> 
> Ah, right.
> 
> The difference is that with Git you can use variables like
> vc-git-log-switches and vc-git-shortlog-switches to radically change the
> log output.  We can't realistically deal with all the possibilities from
> Lisp.
> 
> Whereas, so far as I understand, such customisation of the output is not
> available with the older VCS.

I see vc-hg-log-switches and vc-bzr-log-switches, so I don't think I
understand why you say Git is special here.  What did I miss?

In any case, the reason for having a backend method should be
explained in the comments.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 07:20:01 +0000
Resent-Message-ID: <handler.64055.B64055.172940875729161 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, dmitry@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172940875729161
          (code B ref 64055); Sun, 20 Oct 2024 07:20:01 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 07:19:17 +0000
Received: from localhost ([127.0.0.1]:45591 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2QDc-0007aG-O6
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 03:19:17 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:59806)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t2QDa-0007a2-MV
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 03:19:15 -0400
DKIM-Signature: a=rsa-sha256;
 b=bUWrVMRoUyXHB/ZaajGtJQQcAtlpJJnmnFQ6RoJb5i6WHBNJvWmmoTPsC9oaWySqABfTrT+pTeb7oFiqt3XmjsJeY50DxQ50t7fQLO0kNlHKfS7OmxmFqU2Hj70ADXB6JH60syjVbtwZBxfEFQr9Rs8WvFXmq63oPSrI28VmxeLbZABjV7h2cVxylgZ7OmWxlm5E6PPP40EylMsvMSvzsjkJXJjRz1p11paqvtEP/yeOSZjGEi11T+QEMqWGu/9rWyPsHGHFwFJ+S+RzSRrrCL3p97KB7+kCeN3lKM0JBzClEXbNLG8JDu+VXTjNkGm7iOaVXO6875aWgm4R9LcaVQ==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=GYO1kfuEtybxBq01G6MOW+N9oz1IxIb4gST18UfundQ=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=dvw/lAygabKGSPyRT+QCjgPXkOZii5TiT3aEGC/hGwxrXGkHplqzMuZxOREk9AECTVeshvlprpLNkdWUA5Z4nTzRIw2b+WFH3qQNDk38HXm+1RCt2AOr2IwZrcIdME1H/donKWf064iQoZce8oFpvjftoEwBmbhhY50fKDF67+xhKfiTDqH2ITubH4TgUv0tsX5nExQWhNfRZZCm/Rg0wmD9q5K4vIzmpSh4DbZpH+SUwCBoYwEgoPALhOw83vGrB/loFnEARPRw+P8wvl1nfznKBhl2G1XyDGAf+WUPs7fXqPBg/9ngEgW4XRPC/P5J1t02a+iJ2r+s+onqGC9GeQ==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=GYO1kfuEtybxBq01G6MOW+N9oz1IxIb4gST18UfundQ=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -859114018; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Sun, 20 Oct 2024 07:18:40 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 138677E09E6; Sun, 20 Oct 2024 15:18:38 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <86bjzfjofn.fsf@HIDDEN> (Eli Zaretskii's message of "Sun, 20 Oct
 2024 09:09:16 +0300")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <87o73sad24.fsf@HIDDEN>
 <877ca63ln5.fsf@HIDDEN> <86r08enfri.fsf@HIDDEN>
 <87cyjyvsns.fsf@HIDDEN> <868qulojrx.fsf@HIDDEN>
 <87zfn1vjvb.fsf@HIDDEN> <864j59ob91.fsf@HIDDEN>
 <87ldyjvbgz.fsf@HIDDEN> <86h697jrpu.fsf@HIDDEN>
 <87plnvtk88.fsf@HIDDEN> <86bjzfjofn.fsf@HIDDEN>
Date: Sun, 20 Oct 2024 15:18:38 +0800
Message-ID: <87zfmzs0mp.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Sun 20 Oct 2024 at 09:09am +03, Eli Zaretskii wrote:

> I see vc-hg-log-switches and vc-bzr-log-switches, so I don't think I
> understand why you say Git is special here.  What did I miss?

By "older VCS" I did not mean to include Hg and bzr, which are special
in the same way as Git.  And indeed, neither vc-bzr or vc-hg have
log-view-modify-change-comment support.  It would be good to add it.

> In any case, the reason for having a backend method should be
> explained in the comments.

I've added a FIXME pointing to this bug.  Is there somewhere else you
have in mind?

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 08:21:01 +0000
Resent-Message-ID: <handler.64055.B64055.17294124577292 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, dmitry@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17294124577292
          (code B ref 64055); Sun, 20 Oct 2024 08:21:01 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 08:20:57 +0000
Received: from localhost ([127.0.0.1]:45648 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2RBI-0001tY-Mv
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 04:20:57 -0400
Received: from eggs.gnu.org ([209.51.188.92]:45306)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t2RBF-0001tJ-B6
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 04:20:55 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t2RAk-0006sR-Kp; Sun, 20 Oct 2024 04:20:22 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=p2W0+bu7JZlsw0I8ItbSK17o9AuR2KxzVwqzkSCPX+0=; b=SQrhXlglrd1T
 O+1zvvgXZz66SsCy+OYitWLN/865XeCM2hYx/xjZ2rZFVApHoCqOMVg2yfy0zQ0y3NUpFQJSCtsC6
 TI4w0xdk6kK4+3nChc4K/EbKWW7wvziAZxWGCaeFUIqdN+1T4Rgt7GxxuD/WuMReCqPk9JI3gSwCO
 mpU8Rf73HA4P/Z9J6M0F14XCIcJAkDbQsnxIkGIbkYS0OBJRJzPSM58kYqRkZ/vbqwsZA/e84vQLS
 skvvEsJEkGx/7glljCbwApWcLMhb0SKAQ2QFgWnlKcjcuuHvZrWqKucUJyHgfKFC5c80lNaN7+n4N
 RXUDnn+gkfPwJ8Ua45sfHw==;
Date: Sun, 20 Oct 2024 11:20:19 +0300
Message-Id: <868qujjid8.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <87zfmzs0mp.fsf@HIDDEN> (message from Sean
 Whitton on Sun, 20 Oct 2024 15:18:38 +0800)
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <87pm5yo4m7.fsf@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <87o73sad24.fsf@HIDDEN>
 <877ca63ln5.fsf@HIDDEN> <86r08enfri.fsf@HIDDEN>
 <87cyjyvsns.fsf@HIDDEN> <868qulojrx.fsf@HIDDEN>
 <87zfn1vjvb.fsf@HIDDEN> <864j59ob91.fsf@HIDDEN>
 <87ldyjvbgz.fsf@HIDDEN> <86h697jrpu.fsf@HIDDEN>
 <87plnvtk88.fsf@HIDDEN> <86bjzfjofn.fsf@HIDDEN>
 <87zfmzs0mp.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: 64055 <at> debbugs.gnu.org,  Morgan.J.Smith@HIDDEN,  rpluim@HIDDEN,
>   dmitry@HIDDEN
> Date: Sun, 20 Oct 2024 15:18:38 +0800
> 
> Hello,
> 
> On Sun 20 Oct 2024 at 09:09am +03, Eli Zaretskii wrote:
> 
> > I see vc-hg-log-switches and vc-bzr-log-switches, so I don't think I
> > understand why you say Git is special here.  What did I miss?
> 
> By "older VCS" I did not mean to include Hg and bzr, which are special
> in the same way as Git.  And indeed, neither vc-bzr or vc-hg have
> log-view-modify-change-comment support.  It would be good to add it.

I consider this change incomplete until we add that support at least
for Hg.

> > In any case, the reason for having a backend method should be
> > explained in the comments.
> 
> I've added a FIXME pointing to this bug.  Is there somewhere else you
> have in mind?

I don't see it; did you forget to push?  In any case, I prefer an
explicit explanation, including the reference to the vc-*-log-switches
variables, not just a reference to a bug number.

Thanks.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 08:34:02 +0000
Resent-Message-ID: <handler.64055.B64055.17294132069287 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17294132069287
          (code B ref 64055); Sun, 20 Oct 2024 08:34:02 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 08:33:26 +0000
Received: from localhost ([127.0.0.1]:45692 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2RNO-0002Pj-7c
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 04:33:26 -0400
Received: from eggs.gnu.org ([209.51.188.92]:52288)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t2RNM-0002PT-HS
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 04:33:25 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t2RMr-00086J-Gf; Sun, 20 Oct 2024 04:32:53 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=rQi756t0Px2WypiAErnTgT5VqukMDy6MW21cjZ0u0qY=; b=VMU/D3k0oxAC
 RBbanYpicRDoFv5XOc8Zoa7W53nrmotIxbi/uyuZOL2Ar/ybN1oHi4zoi3m7BQU5/DkJMoSE6YjID
 aM4gU6WQ9D0JaJHaOKZRpf8tOXGTs3KoGFM6XZr6M3c2rYgaHf78pyHU/YcR/ly3hVIqW5WUNaz0E
 yOlVvIuMRngHyPmVhVopWt8YgLigxD0u2U0UIqgsDa/cdBHlLZY9OgrMTR2lGu/wbkzUMpDcmvXV2
 RtPbiQ7hdWF5SC6zjNtiyjuTtL9q909Nibe/rAl92I4oZKPmco7+5r+17PJHi5cyqHtxTj1Fcj0eu
 WsNmhoHOEay+b/1UnQdzpw==;
Date: Sun, 20 Oct 2024 11:32:50 +0300
Message-Id: <867ca3jhsd.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <87bjzfuzaq.fsf@HIDDEN> (message from Sean
 Whitton on Sun, 20 Oct 2024 13:19:09 +0800)
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: 64055 <at> debbugs.gnu.org,  dgutov@HIDDEN,  Morgan.J.Smith@HIDDEN
> Date: Sun, 20 Oct 2024 13:19:09 +0800
> 
> > When I do the above, I get an error message:
> >
> >   vc-do-command: Failed (status 128): git --no-pager commit --only
> > --allow-empty -F c:/Users/EliZ/AppData/Local/Temp/git-msgWaNflu
> >
> > and the *vc* buffer says:
> >
> >   fatal: No paths with --include/--only does not make sense.
> >
> > It's possible my Git is very old, but shouldn't this command work with
> > old versions as well?
> 
> I've looked into it and what's required is Git 2.11.1 from early 2017.

So someone will have to test the patch on Windows with a new en ough
Git version.

> I think we can support older by stashing and unstashing.  So please try
> the attached patch, which does that.

This seems to work without any errors, and the *vc* buffer says

  Successfully rebased and updated refs/heads/master.

But the log message is not updated, neither in the *vc-change-log*
buffer nor if I manually invoke "git log" from the shell prompt.  It
sounds like the commit message was not amended.  "git stash list" also
shows no relevant stashes.

Let me know how can I help you debug this.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 08:44:01 +0000
Resent-Message-ID: <handler.64055.B64055.172941381511009 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, control <at> debbugs.gnu.org, dmitry@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172941381511009
          (code B ref 64055); Sun, 20 Oct 2024 08:44:01 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 08:43:35 +0000
Received: from localhost ([127.0.0.1]:45731 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2RXD-0002rV-G1
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 04:43:35 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:39418)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t2RXB-0002rG-6T
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 04:43:34 -0400
DKIM-Signature: a=rsa-sha256;
 b=D/pnHt6eS4PAdU9P02f4g0z2tZoI6D+GygeyUD8GwUl+Bs69ARidxNvWsBGIsqPy4lJ6G9jUmrj98BkVdFcKwmQqN9uNTxY9igkOd4MkDcvTn8ODVxsSlqQoCC4GdRsbAsYph2CHJr0p0rB2u5MpfQzudzxEpMZaWfOgOzef1UvRmeZ32PpxGFsx2Y1K18a1StCOvlPYJTkdTg4SvtpuMQfk2r9WMsJxu1nVlFPqpC9pap8xjvZmpEe9vo0TBETZOSVzyxjWkusuexh3RLnYgqTuSiu1PuytvRHxNYXbj0j1M68iFEsfR6P0pgPQH3f/xW60HQzdS8CgzlhR2r++Ig==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=Uzn8qZojcxKHNXe9Xvxxf2kBhfXdizIVhdx3nzH3n3M=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=CNg5Nu2XoKiMhKWJ6Lud9ajsIAE+jyD1ELA6A51+ifOqAOvL90QdHt1YZCHpRab1z2zSHRFcCUFYHp3yVI6SuLQDqY7sNyx6pBEzEbPlnONuhhjTMGnPwZKb3xu6CNbm9Clq8qeyTw/BTtPZD8uwF/WBh47+NrXjP1qTjsWEkUhp7YDbn81j8hJTMsokhD6z1aJIdgAHyPDD9kGjkifuwthejznk1cazqDZzz5M3MKjT4CMS8F/2vHSRoh5br39sPBHGOkln2ng3P0NMTk9CV1jTIGoR3MxAD9/c8WTGPXwoo5afhVXU1NDy8KFf7IzlCf3K+kpb4zBomrA7KhESsA==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=Uzn8qZojcxKHNXe9Xvxxf2kBhfXdizIVhdx3nzH3n3M=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1738419589; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Sun, 20 Oct 2024 08:42:58 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 4A85A7E086F; Sun, 20 Oct 2024 16:42:54 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <868qujjid8.fsf@HIDDEN> (Eli Zaretskii's message of "Sun, 20 Oct
 2024 11:20:19 +0300")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <87o73sad24.fsf@HIDDEN>
 <877ca63ln5.fsf@HIDDEN> <86r08enfri.fsf@HIDDEN>
 <87cyjyvsns.fsf@HIDDEN> <868qulojrx.fsf@HIDDEN>
 <87zfn1vjvb.fsf@HIDDEN> <864j59ob91.fsf@HIDDEN>
 <87ldyjvbgz.fsf@HIDDEN> <86h697jrpu.fsf@HIDDEN>
 <87plnvtk88.fsf@HIDDEN> <86bjzfjofn.fsf@HIDDEN>
 <87zfmzs0mp.fsf@HIDDEN> <868qujjid8.fsf@HIDDEN>
Date: Sun, 20 Oct 2024 16:42:54 +0800
Message-ID: <87ed4brwq9.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

retitle 64055 31.0.50; log-view-modify-change-comment support for Git and Hg
thanks

On Sun 20 Oct 2024 at 11:20am +03, Eli Zaretskii wrote:

> I consider this change incomplete until we add that support at least
> for Hg.

Fair enough.  I'm retitling the bug.  And after I install the change to
vc-git.el, I won't close this bug.

>> > In any case, the reason for having a backend method should be
>> > explained in the comments.
>>
>> I've added a FIXME pointing to this bug.  Is there somewhere else you
>> have in mind?
>
> I don't see it; did you forget to push?

I did push it.

> In any case, I prefer an explicit explanation, including the reference
> to the vc-*-log-switches variables, not just a reference to a bug
> number.

Added a second FIXME regarding modern VCS.

-- 
Sean Whitton

Message received at control <at> debbugs.gnu.org:

Received: (at control) by debbugs.gnu.org; 20 Oct 2024 08:43:41 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Oct 20 04:43:41 2024
Received: from localhost ([127.0.0.1]:45736 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2RXI-0002rm-RI
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 04:43:41 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:39424)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t2RXH-0002rP-A1
 for control <at> debbugs.gnu.org; Sun, 20 Oct 2024 04:43:39 -0400
DKIM-Signature: a=rsa-sha256;
 b=D/pnHt6eS4PAdU9P02f4g0z2tZoI6D+GygeyUD8GwUl+Bs69ARidxNvWsBGIsqPy4lJ6G9jUmrj98BkVdFcKwmQqN9uNTxY9igkOd4MkDcvTn8ODVxsSlqQoCC4GdRsbAsYph2CHJr0p0rB2u5MpfQzudzxEpMZaWfOgOzef1UvRmeZ32PpxGFsx2Y1K18a1StCOvlPYJTkdTg4SvtpuMQfk2r9WMsJxu1nVlFPqpC9pap8xjvZmpEe9vo0TBETZOSVzyxjWkusuexh3RLnYgqTuSiu1PuytvRHxNYXbj0j1M68iFEsfR6P0pgPQH3f/xW60HQzdS8CgzlhR2r++Ig==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=Uzn8qZojcxKHNXe9Xvxxf2kBhfXdizIVhdx3nzH3n3M=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=CNg5Nu2XoKiMhKWJ6Lud9ajsIAE+jyD1ELA6A51+ifOqAOvL90QdHt1YZCHpRab1z2zSHRFcCUFYHp3yVI6SuLQDqY7sNyx6pBEzEbPlnONuhhjTMGnPwZKb3xu6CNbm9Clq8qeyTw/BTtPZD8uwF/WBh47+NrXjP1qTjsWEkUhp7YDbn81j8hJTMsokhD6z1aJIdgAHyPDD9kGjkifuwthejznk1cazqDZzz5M3MKjT4CMS8F/2vHSRoh5br39sPBHGOkln2ng3P0NMTk9CV1jTIGoR3MxAD9/c8WTGPXwoo5afhVXU1NDy8KFf7IzlCf3K+kpb4zBomrA7KhESsA==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=Uzn8qZojcxKHNXe9Xvxxf2kBhfXdizIVhdx3nzH3n3M=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: control <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1738419589; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Sun, 20 Oct 2024 08:42:58 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 4A85A7E086F; Sun, 20 Oct 2024 16:42:54 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
To: Eli Zaretskii <eliz@HIDDEN>
Subject: Re: bug#64055: [WIP Patch] Enable editing commit messages -
 vc-git-modify-change-comment
In-Reply-To: <868qujjid8.fsf@HIDDEN> (Eli Zaretskii's message of "Sun, 20 Oct
 2024 11:20:19 +0300")
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <87o73sad24.fsf@HIDDEN>
 <877ca63ln5.fsf@HIDDEN> <86r08enfri.fsf@HIDDEN>
 <87cyjyvsns.fsf@HIDDEN> <868qulojrx.fsf@HIDDEN>
 <87zfn1vjvb.fsf@HIDDEN> <864j59ob91.fsf@HIDDEN>
 <87ldyjvbgz.fsf@HIDDEN> <86h697jrpu.fsf@HIDDEN>
 <87plnvtk88.fsf@HIDDEN> <86bjzfjofn.fsf@HIDDEN>
 <87zfmzs0mp.fsf@HIDDEN> <868qujjid8.fsf@HIDDEN>
Date: Sun, 20 Oct 2024 16:42:54 +0800
Message-ID: <87ed4brwq9.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: control
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org,
 control <at> debbugs.gnu.org, dmitry@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

retitle 64055 31.0.50; log-view-modify-change-comment support for Git and Hg
thanks

On Sun 20 Oct 2024 at 11:20am +03, Eli Zaretskii wrote:

> I consider this change incomplete until we add that support at least
> for Hg.

Fair enough.  I'm retitling the bug.  And after I install the change to
vc-git.el, I won't close this bug.

>> > In any case, the reason for having a backend method should be
>> > explained in the comments.
>>
>> I've added a FIXME pointing to this bug.  Is there somewhere else you
>> have in mind?
>
> I don't see it; did you forget to push?

I did push it.

> In any case, I prefer an explicit explanation, including the reference
> to the vc-*-log-switches variables, not just a reference to a bug
> number.

Added a second FIXME regarding modern VCS.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 08:58:01 +0000
Resent-Message-ID: <handler.64055.B64055.172941465113328 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, rpluim@HIDDEN, 64055 <at> debbugs.gnu.org, control <at> debbugs.gnu.org, dmitry@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172941465113328
          (code B ref 64055); Sun, 20 Oct 2024 08:58:01 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 08:57:31 +0000
Received: from localhost ([127.0.0.1]:45755 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2Rkg-0003Sp-Mr
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 04:57:31 -0400
Received: from eggs.gnu.org ([209.51.188.92]:46112)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>)
 id 1t2Rkb-0003SS-Hs; Sun, 20 Oct 2024 04:57:28 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t2Rk5-00023v-SS; Sun, 20 Oct 2024 04:56:53 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=98uRONMfqmkGDH7+O1igEOU+uovivC7Tvasy6ROxMlA=; b=CqVx4nnIhadF
 FcfoHCB7HdKJDxVgheXUedpml6sKC18CK4opKIiCzIpHywPeZXdP7axeeKZBc6JF6T815yk6FHJpA
 /0XAsrF8HL2iCxp9XVM9gbr5KorXti6Lc+iDW0lcD8AyfqaV4qeAFO1qFMr++91DI3lnn+pAy/LWx
 Yx6UkC5cad+sF3oM6nBUmkuANRfjSXnU115esD2DTdw+x77PjryktbMuEAsTe6BjhkSV/Qn6GQ5N8
 +bOzh01Z8lrvKZnmR0jHymYwE2HYmzJxMmjC2qSuuoIAP1z4flmbeqP4Nsh/2SVv33CMl6ECMXUKs
 5rgcGggSOUutKse9w5ufog==;
Date: Sun, 20 Oct 2024 11:56:49 +0300
Message-Id: <865xpnjgoe.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <87ed4brwq9.fsf@HIDDEN> (message from Sean
 Whitton on Sun, 20 Oct 2024 16:42:54 +0800)
References: <DM5PR03MB3163ADD665E6B3B1D8704A2AC555A@HIDDEN>
 <DM5PR03MB3163FB13F7078D55788A928FC55AA@HIDDEN>
 <87legmnq4l.fsf@HIDDEN> <87r090o8cl.fsf@HIDDEN>
 <bf69b914-2f0a-49e2-bece-fef5f28d5c2b@HIDDEN>
 <874j5vgypf.fsf@HIDDEN>
 <787fb692-db24-4682-871b-5a52d31a1249@HIDDEN>
 <87ed4obs1b.fsf@HIDDEN>
 <87o73sad24.fsf@HIDDEN>
 <877ca63ln5.fsf@HIDDEN> <86r08enfri.fsf@HIDDEN>
 <87cyjyvsns.fsf@HIDDEN> <868qulojrx.fsf@HIDDEN>
 <87zfn1vjvb.fsf@HIDDEN> <864j59ob91.fsf@HIDDEN>
 <87ldyjvbgz.fsf@HIDDEN> <86h697jrpu.fsf@HIDDEN>
 <87plnvtk88.fsf@HIDDEN> <86bjzfjofn.fsf@HIDDEN>
 <87zfmzs0mp.fsf@HIDDEN> <868qujjid8.fsf@HIDDEN>
 <87ed4brwq9.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: 64055 <at> debbugs.gnu.org,  Morgan.J.Smith@HIDDEN,  rpluim@HIDDEN,
>   dmitry@HIDDEN, control <at> debbugs.gnu.org
> Date: Sun, 20 Oct 2024 16:42:54 +0800
> 
> > In any case, I prefer an explicit explanation, including the reference
> > to the vc-*-log-switches variables, not just a reference to a bug
> > number.
> 
> Added a second FIXME regarding modern VCS.

Thanks, LGTM.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 09:01:02 +0000
Resent-Message-ID: <handler.64055.B64055.172941481313699 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172941481313699
          (code B ref 64055); Sun, 20 Oct 2024 09:01:02 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 09:00:13 +0000
Received: from localhost ([127.0.0.1]:45763 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2RnJ-0003Yr-A8
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 05:00:13 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:46036)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t2RnG-0003XV-PS
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 05:00:11 -0400
DKIM-Signature: a=rsa-sha256;
 b=WEn9keyEKVCIKIsEElGbYCoNoB+LxfN2s24WW4u6civQedlqOakrkc6KP6Aik340WwtzCeg/XZ6mOR2aVejLIdnlYVhKrMchUJFuFk1tM8WvCFiJleLbTijc9eeq4ONXMWdl9nPjGe9JnelQTUa4xtBVe7Nf+Zbo6nStmznNrtKasmCp+s0Q7EvbMtk78pcXfLotr9GuuJ00TraiwU9WW2pnCVxUSAFdfAH5PuoXAHWdp2RCm5DeGYRV0/Z0D5M6B0bYraolFXQtPyzoLUmwRle9uAOQeKjoUfu2YgxVgSdnLdhdc0nzn8SCLfN1qBJLh83b6vcA1AKDeTCJnV0QMg==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=tZHuKcsaxd3phYvngOucdNhJVe8jLthndQhCJLJvNBs=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=VsWnI7cPOsYmemyF3R6eZNWnweg5vBlab1iuSES/bXcXHeZfGeegPrducWIJ+L46NRjvcA9l2V6Ml8kW1xjrqKJ+O/wQqn+MzLyFADFZ9rFKAK/AzM5XDTHwuPBPZDxI6TRiU3mQnF1gc3PwsSBVoAa3DzlQCQVLmUnohsBwTZp0IWTHICDEJ8ssBa+CdGf0MFt1yLt80rmH3KrGrMF1cC3dFTx257nwhWIVR+NvEr+CoNBcQ7wbt5Y3x00XqQxBwRKQf//e/6miPdY8WFYgNEIgsgGxBoKJOZSx1AuJAG9IJJIVbj5fEgKE9MyeICBceW08bj2FrWmHGPlCbcWYdA==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=tZHuKcsaxd3phYvngOucdNhJVe8jLthndQhCJLJvNBs=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 2058858321; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Sun, 20 Oct 2024 08:59:36 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 6B0597E8333; Sun, 20 Oct 2024 16:59:32 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <867ca3jhsd.fsf@HIDDEN> (Eli Zaretskii's message of "Sun, 20 Oct
 2024 11:32:50 +0300")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
Date: Sun, 20 Oct 2024 16:59:32 +0800
Message-ID: <871q0brvyj.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Sun 20 Oct 2024 at 11:32am +03, Eli Zaretskii wrote:

> So someone will have to test the patch on Windows with a new en ough
> Git version.

I don't think so -- the code to support Windows is independent of the
code to support older Git.  So, my tests here on GNU/Linux with newer
Git, together with yours on Windows with older Git, are sufficient.

>> I think we can support older by stashing and unstashing.  So please try
>> the attached patch, which does that.
>
> This seems to work without any errors, and the *vc* buffer says
>
>   Successfully rebased and updated refs/heads/master.
>
> But the log message is not updated, neither in the *vc-change-log*
> buffer nor if I manually invoke "git log" from the shell prompt.  It
> sounds like the commit message was not amended.  "git stash list" also
> shows no relevant stashes.
>
> Let me know how can I help you debug this.

Thank you for testing it.

Let's try commenting out everything except the 'git commit', as done in
the following diff on top of my patch.  Please test this without
anything staged.  Does it create a new commit at the tip of your branch?

The contents of the commit should be a special first line, followed by
your amended commit message.

If not: I've also commented out the deletion of the temporary file, and
sent its name to *Messages*.  If you look in that temporary file, do you
find your amended commit message?

--8<---------------cut here---------------start------------->8---
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 59d5386bc72..d2ada63f71e 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -2042,8 +2042,8 @@ vc-git-modify-change-comment
     ;;     % git commit --allow-empty -m...
     ;;     % git rebase --autosquash -i REV~1
     ;;     % git stash pop
-    (unless nothing-staged
-      (vc-git-command nil 0 nil "stash" "push"))
+    ;; (unless nothing-staged
+    ;;   (vc-git-command nil 0 nil "stash" "push"))
     (unwind-protect
         (progn
           (when (cl-intersection '("--author" "--date") args
@@ -2064,12 +2064,15 @@ vc-git-modify-change-comment
                           (list "-m" message))
                         args)))
       (when (and msg-file (file-exists-p msg-file))
-        (delete-file msg-file)))
-    (with-environment-variables (("GIT_SEQUENCE_EDITOR" "true"))
-      (vc-git-command nil 0 nil "rebase" "--autosquash" "-i"
-                      (format "%s~1" rev)))
-    (unless nothing-staged
-      (vc-git-command nil 0 nil "stash" "pop" "--index"))))
+        ;; (delete-file msg-file)
+        ))
+    ;; (with-environment-variables (("GIT_SEQUENCE_EDITOR" "true"))
+    ;;   (vc-git-command nil 0 nil "rebase" "--autosquash" "-i"
+    ;;                   (format "%s~1" rev)))
+    ;; (unless nothing-staged
+    ;;   (vc-git-command nil 0 nil "stash" "pop" "--index"))
+    (message "temporary file is: %s" msg-file)
+    ))

 (defvar vc-git-extra-menu-map
   (let ((map (make-sparse-keymap)))
--8<---------------cut here---------------end--------------->8---

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 09:21:02 +0000
Resent-Message-ID: <handler.64055.B64055.172941600417153 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172941600417153
          (code B ref 64055); Sun, 20 Oct 2024 09:21:02 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 09:20:04 +0000
Received: from localhost ([127.0.0.1]:45828 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2S6V-0004Sb-O3
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 05:20:04 -0400
Received: from eggs.gnu.org ([209.51.188.92]:46150)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t2S6T-0004S0-EN
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 05:20:02 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t2S5y-0003pg-9L; Sun, 20 Oct 2024 05:19:30 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=rTlhXstWREM5Yn8oKDVQvioC1eDmoQIAErN/haIl2xY=; b=QLQn2hNcF/PB
 rNvR2qu3ftYIGUTPO6F/50/sE1bBks9Gmt4jdZsvMFNLN6u16VlF+GqlS8fvcIJHZkKkYq1yz8Jm/
 1wEZRNMbmLG5JChom2yZ9zxVUPMTFEdhEjrvVsCtwxruyqumTr1LZtmvsjc2Q5Ura7e/24zh1kjt3
 QWpn6cBnBVsT96ljZB9pAGUuNcHjdKFne4Fpxfz+PsCcQfrqjvDgJgJRJxVXtac3DPcuMotYCCcty
 kgW/xn2Uq0c7H/nHbJ0gUUmjTubjJLIO66AScxVaRGjLH+ihnJ1HXSSz6z9el3qYyl1PAjv2vVmBN
 /E+SLCCze/eqevc3q1SEJQ==;
Date: Sun, 20 Oct 2024 12:19:27 +0300
Message-Id: <8634krjfmo.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <871q0brvyj.fsf@HIDDEN> (message from Sean
 Whitton on Sun, 20 Oct 2024 16:59:32 +0800)
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN> 
 <871q0brvyj.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: 64055 <at> debbugs.gnu.org,  dgutov@HIDDEN,  Morgan.J.Smith@HIDDEN
> Date: Sun, 20 Oct 2024 16:59:32 +0800
> 
> Let's try commenting out everything except the 'git commit', as done in
> the following diff on top of my patch.  Please test this without
> anything staged.  Does it create a new commit at the tip of your branch?

Yes.  But only "git log" shows that additional commit, "C-x v l"
doesn't update the log.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 09:26:02 +0000
Resent-Message-ID: <handler.64055.B64055.172941634718437 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172941634718437
          (code B ref 64055); Sun, 20 Oct 2024 09:26:02 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 09:25:47 +0000
Received: from localhost ([127.0.0.1]:45856 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2SC2-0004mT-QG
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 05:25:47 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:49806)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t2SBz-0004hc-TA
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 05:25:45 -0400
DKIM-Signature: a=rsa-sha256;
 b=cnL+F16AOFNmHNZb2akRuBub9MOJ/I0v1OrLpmQOlKzhBA65/YsnGdEyisTuPNSvxSaJki2YEyFnKb4pTZbLt5F0/413FAyDfdCUmtNHwhNB8uxeDyBSWEYijS5WQKyNltp3zCnz7IYzqo34pdXHv1WTLid8cuZa4+M0oDx2XAiLFwAk0kDyy0aHoECebCU0Yrr8F5JbkfpCwqhQfDFFKjePjL3y4NMx/1M0/bxtI8WyG81Xiv13gqGMrrpl1laFfMRJs5FVBFwGdj0RM/mixQyU7IT6eFk+PdKqnEq1N3+TN2MNXsIUjLwVubfxLMseWhU7Wz/poNGRtu35RhpJgw==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=T24xA7GakZtudUAWb2W54pXrB9SuzeAnnAc7XVO6/NU=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=d1hmF7Rplf+iWMQJft3ZHwtu0apT3PLOvx+dYL8HjwhbkJnmpsJr5op4yqrpYX9zsUrNhkgouOyH5TcGMgjhj3UkVXJoaF9z55UgL+UCOfmBATgmpOTX1rk4KrysCBEYRaMqG+j3AvNE21nd+hGsl6vAqGKUJLztWggSc9RaQbyr4SJltsbfoJwaVRdVnassGFGoeiaYw7aIRoYN/I9XwXctRJoAoxaWB8GTYYp9EBrDeqsc4oPpWzhKZxQ5MBCutlh/eTrjBjvYpKTZx/jK6zHnR9gqOtTjnAfFNuAxyMUHY38GKbScSyEwHILti6OCLxO+ubu9P1IqHZazp4H88w==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=T24xA7GakZtudUAWb2W54pXrB9SuzeAnnAc7XVO6/NU=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1992943481; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Sun, 20 Oct 2024 09:25:12 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 892327EB7D9; Sun, 20 Oct 2024 17:25:10 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <8634krjfmo.fsf@HIDDEN> (Eli Zaretskii's message of "Sun, 20 Oct
 2024 12:19:27 +0300")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
 <871q0brvyj.fsf@HIDDEN> <8634krjfmo.fsf@HIDDEN>
Date: Sun, 20 Oct 2024 17:25:10 +0800
Message-ID: <87bjzfqg7d.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Sun 20 Oct 2024 at 12:19pm +03, Eli Zaretskii wrote:

>> From: Sean Whitton <spwhitton@HIDDEN>
>> Cc: 64055 <at> debbugs.gnu.org,  dgutov@HIDDEN,  Morgan.J.Smith@HIDDEN
>> Date: Sun, 20 Oct 2024 16:59:32 +0800
>>
>> Let's try commenting out everything except the 'git commit', as done in
>> the following diff on top of my patch.  Please test this without
>> anything staged.  Does it create a new commit at the tip of your branch?
>
> Yes.  But only "git log" shows that additional commit, "C-x v l"
> doesn't update the log.

If you press 'g' in the 'C-x v l' buffer, does it appear then?

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 09:48:01 +0000
Resent-Message-ID: <handler.64055.B64055.172941765122221 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172941765122221
          (code B ref 64055); Sun, 20 Oct 2024 09:48:01 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 09:47:31 +0000
Received: from localhost ([127.0.0.1]:45923 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2SX5-0005mL-6W
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 05:47:31 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:57022)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t2SX2-0005m4-DN
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 05:47:29 -0400
DKIM-Signature: a=rsa-sha256;
 b=f6aB9UyUOx5lL5ct9apnvQ6t1yzvNRXh/KVmhCRgsVe9QI8DuJaf7/w6mQcdQiraGCW4w0jZyO8VSrNUw6C4ojlVRYMS68qvLYXPta6saE9O79wA+VBNElSTpUITUy1VdJthmxJXSqQGVi8OgeWcvmvsUf/oZr6pNEyJ2qdLDS7Krmt1U7ZiZIvFui5YXyFHWKltsBW8Xmzq2wW/6iG65ydMe2rvB1syMmsH1AqE2b9mxIUwnOmU3zaNDNGuFkxq7ExTYr1ZwLV0+nPESnZzt2oYt2SVejqBUaTKc6kOfnS6Qr7AiQ/WPnxqcrQNdteVw/jo658dmrwdhmswW2fyyw==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=yUypVKW9jsBDpHOjozylFuyqNs1EB68/N3iv3F/2c8o=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=C8tp7O7kS8ytqyzMca8RzA/HDDYnJ1kEhnR4NGD/YsCPVpoeksd3TAmKZdswchg6+polR1QUBbKYLmKtK2TMJUY6XOkzpSf2K0KrUfFRlXKgRKZ2lxnPf5YW9m56mWgP1nrOjMK2zB2Q7kkxyxrDlKAv2AQgnVmg2sLzhENCka/+Z/j7YRn+O51/4k37/T7Kbh67qnNBBkzVGoOtEEiTra83EO8ltbO2w+Tx6UVCysjt08ZMbXmGxb/Y76OxAvl52IwEyoNyJVGha36PgqTigOsNp//INieLj2Ey367XIQjLpPX3/3ZteuteZmqHLBKhfoSWLb0T63XpNg1qjH1VXw==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=yUypVKW9jsBDpHOjozylFuyqNs1EB68/N3iv3F/2c8o=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -1229325981; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Sun, 20 Oct 2024 09:46:56 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id C361C7E1CFD; Sun, 20 Oct 2024 17:46:53 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <87bjzfqg7d.fsf@HIDDEN> (Sean Whitton's message
 of "Sun, 20 Oct 2024 17:25:10 +0800")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
 <871q0brvyj.fsf@HIDDEN> <8634krjfmo.fsf@HIDDEN>
 <87bjzfqg7d.fsf@HIDDEN>
Date: Sun, 20 Oct 2024 17:46:53 +0800
Message-ID: <878qujp0mq.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Sun 20 Oct 2024 at 05:25pm +08, Sean Whitton wrote:

> Hello,
>
> On Sun 20 Oct 2024 at 12:19pm +03, Eli Zaretskii wrote:
>
>>> From: Sean Whitton <spwhitton@HIDDEN>
>>> Cc: 64055 <at> debbugs.gnu.org,  dgutov@HIDDEN,  Morgan.J.Smith@HIDDEN
>>> Date: Sun, 20 Oct 2024 16:59:32 +0800
>>>
>>> Let's try commenting out everything except the 'git commit', as done in
>>> the following diff on top of my patch.  Please test this without
>>> anything staged.  Does it create a new commit at the tip of your branch?
>>
>> Yes.  But only "git log" shows that additional commit, "C-x v l"
>> doesn't update the log.
>
> If you press 'g' in the 'C-x v l' buffer, does it appear then?

Oh, wait, it wouldn't.  Does it appear in 'C-x v L'?

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 11:20:02 +0000
Resent-Message-ID: <handler.64055.B64055.17294231736103 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17294231736103
          (code B ref 64055); Sun, 20 Oct 2024 11:20:02 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 11:19:33 +0000
Received: from localhost ([127.0.0.1]:46020 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2Ty9-0001aN-2y
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 07:19:33 -0400
Received: from eggs.gnu.org ([209.51.188.92]:51180)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t2Ty7-0001a8-9x
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 07:19:32 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t2Txb-000151-Os; Sun, 20 Oct 2024 07:18:59 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=9cAiYDfjPaNqyLgqUqvJ0tjvn3enRGiXyTKmxfghw1k=; b=d+yx0XccaN1w
 HBkZyHbNBrZ0TsOPx5AV62WJkyL9+5qIXOKWHXL3IpvEocVmIHQJ4QUT1+3vHvGmCD2IW0V4oY410
 YTyRkHNaZI9UYda2IJUHjvJDMl8aAIOvKQVNqqG+GNdJfJd9juqNMUIdk5yWcQPQh+eEjHAUBVXrp
 2itEBeDqomnT4EeLGtr0BGoGNSP6sDdvC3LqWWgz3BfMqb78OtsZWWs6FOQVSMof+nWuvuRvDBGWU
 s6MPYlL+/P/5ECjD3vcdEarOwMtqKb8piK0L+rHoGzPGgEvDov+6ZQC4d6JGP+1JnrWc+VLMu2Q0M
 K1EQQZe3NF4HUcsRwJ+MDw==;
Date: Sun, 20 Oct 2024 14:18:54 +0300
Message-Id: <861q0bja3l.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <87bjzfqg7d.fsf@HIDDEN> (message from Sean
 Whitton on Sun, 20 Oct 2024 17:25:10 +0800)
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
 <871q0brvyj.fsf@HIDDEN> <8634krjfmo.fsf@HIDDEN>
 <87bjzfqg7d.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: 64055 <at> debbugs.gnu.org,  dgutov@HIDDEN,  Morgan.J.Smith@HIDDEN
> Date: Sun, 20 Oct 2024 17:25:10 +0800
> 
> Hello,
> 
> On Sun 20 Oct 2024 at 12:19pm +03, Eli Zaretskii wrote:
> 
> >> From: Sean Whitton <spwhitton@HIDDEN>
> >> Cc: 64055 <at> debbugs.gnu.org,  dgutov@HIDDEN,  Morgan.J.Smith@HIDDEN
> >> Date: Sun, 20 Oct 2024 16:59:32 +0800
> >>
> >> Let's try commenting out everything except the 'git commit', as done in
> >> the following diff on top of my patch.  Please test this without
> >> anything staged.  Does it create a new commit at the tip of your branch?
> >
> > Yes.  But only "git log" shows that additional commit, "C-x v l"
> > doesn't update the log.
> 
> If you press 'g' in the 'C-x v l' buffer, does it appear then?

No.  Not even if I restart Emacs.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 11:25:01 +0000
Resent-Message-ID: <handler.64055.B64055.17294234937122 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17294234937122
          (code B ref 64055); Sun, 20 Oct 2024 11:25:01 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 11:24:53 +0000
Received: from localhost ([127.0.0.1]:46046 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2U3J-0001qo-8j
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 07:24:53 -0400
Received: from eggs.gnu.org ([209.51.188.92]:33428)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t2U3H-0001qZ-4q
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 07:24:51 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t2U2m-0001hQ-Nw; Sun, 20 Oct 2024 07:24:20 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=bnLPKUj3QFNbXwxacYELvSm9P5qLX6GxVc93NJOdA8A=; b=G3vOmZJQMriq
 UhFml/6Ll/wyq2bH2D1YQXHzlUvdgbIGluVfxBuxcOVp4y01NPV9InSZOT/RTWjsHLNSybP98ZVYb
 H9vCjNs7XnFuLAu8gWWtIDmHGfnUbwDy2AErYr/XkaQVLNUpT/+QeRGfqK5h53W+rTtVFJI1Zo4CV
 O4YCjfrMth+VCtuKFSGfywmSRiqAM53FJvd1A7NDLZyTdhNS5jNGkYh7rbcOoVKVIdK0QgJ6f1AvD
 rJqF6xcmZe8CMt7KC88ioO+15nyZzjex94eI73YVGMRqHm1kj2dg3v0rVhiYp1/5abg3PgSLczolQ
 JSjYXEIBUJJhoDg4uDK8Ng==;
Date: Sun, 20 Oct 2024 14:24:17 +0300
Message-Id: <86y12jhva6.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <878qujp0mq.fsf@HIDDEN> (message from Sean
 Whitton on Sun, 20 Oct 2024 17:46:53 +0800)
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
 <871q0brvyj.fsf@HIDDEN> <8634krjfmo.fsf@HIDDEN>
 <87bjzfqg7d.fsf@HIDDEN>
 <878qujp0mq.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: 64055 <at> debbugs.gnu.org,  dgutov@HIDDEN,  Morgan.J.Smith@HIDDEN
> Date: Sun, 20 Oct 2024 17:46:53 +0800
> 
> >> Yes.  But only "git log" shows that additional commit, "C-x v l"
> >> doesn't update the log.
> >
> > If you press 'g' in the 'C-x v l' buffer, does it appear then?
> 
> Oh, wait, it wouldn't.  Does it appear in 'C-x v L'?

Yes.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 13:12:01 +0000
Resent-Message-ID: <handler.64055.B64055.172942990326980 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172942990326980
          (code B ref 64055); Sun, 20 Oct 2024 13:12:01 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 13:11:43 +0000
Received: from localhost ([127.0.0.1]:46306 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2Vih-000715-8a
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 09:11:43 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:50308)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t2Vif-00070o-92
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 09:11:42 -0400
DKIM-Signature: a=rsa-sha256;
 b=c7oPnfggFDVoNpNkaEIlwtt3b1A/vv3AYD/CSO09Wd4wn8wk3E3cwtggSyYGuBfXFdUTjCSXcfANStrgPGJNFJGL694sJeuApGTxZqH55e/OUAjhNn6ZqyPCic5qAjL/0dRRSOXnGZBa/hcVo5Kb5GvOLWdaFDIBEkBF3lZe1snbSjF8MynAz6/KlPLLxO45GSWJIEjl76fuMgsGBXbsJKuIKtSvXRmz4nlgEGV/Xsb349W0AzSz5Ob4t2VX0j7zw4mfJrtXIrQsSLGHq994CyKEorxrGZ4xgJgysaQPN/Dv1FNaETVpx/4Gx/gW6+zimAMz+yHi9YX92TF5d0K0hg==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=LJcBQiDrRSKT4w0oJ/Cidi1eWS8enHunFob1uREv9ZQ=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=RnzUnVxU1OvXNonbYHTXkqFZGSPyZB6T1iKG8CSyc88ngNOUNdPungJhM/FCIiJpBrMvy8twndCzF8k3QZb3qFWUkM8PuzcfXrZiP2TYzRueLDGpQTolk2uJzTG669Z7gvCO6KRigeUi1P2wT4SB+mgltY4fuTpuqMoD3VlcKaHV7zPvQz+STp8S5UIbHiEXmC4F6q1JuK4XxfBARu7LV5uHStrqWYK9SaI4xKQNtlH0M3PrpvWHdLYXhfPOU6UG8TPhRVO26cgEfIOvCEvRz3OSnEqXX0i3netRA/0JSjCJ1/shzxRdtMu0/3IUzdetgzFH049dqiCRBFzDCZbQiQ==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=LJcBQiDrRSKT4w0oJ/Cidi1eWS8enHunFob1uREv9ZQ=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1219702271; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Sun, 20 Oct 2024 13:11:07 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id DE3637EB81C; Sun, 20 Oct 2024 21:11:00 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <86y12jhva6.fsf@HIDDEN> (Eli Zaretskii's message of "Sun, 20 Oct
 2024 14:24:17 +0300")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
 <871q0brvyj.fsf@HIDDEN> <8634krjfmo.fsf@HIDDEN>
 <87bjzfqg7d.fsf@HIDDEN>
 <878qujp0mq.fsf@HIDDEN> <86y12jhva6.fsf@HIDDEN>
Date: Sun, 20 Oct 2024 21:11:00 +0800
Message-ID: <87o73eor6j.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Sun 20 Oct 2024 at 02:24pm +03, Eli Zaretskii wrote:

>> From: Sean Whitton <spwhitton@HIDDEN>
>> Cc: 64055 <at> debbugs.gnu.org,  dgutov@HIDDEN,  Morgan.J.Smith@HIDDEN
>> Date: Sun, 20 Oct 2024 17:46:53 +0800
>>
>> >> Yes.  But only "git log" shows that additional commit, "C-x v l"
>> >> doesn't update the log.
>> >
>> > If you press 'g' in the 'C-x v l' buffer, does it appear then?
>>
>> Oh, wait, it wouldn't.  Does it appear in 'C-x v L'?
>
> Yes.

Okay.  Does the message look like this:

    amend! <sha1 of the commit whose message you edited>

    <your edited message>

If so, then we know that the invocation of 'git commit' is working, and
the problem is somewhere else -- probably the invocation of 'git rebase'.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 13:54:02 +0000
Resent-Message-ID: <handler.64055.B64055.17294324112662 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17294324112662
          (code B ref 64055); Sun, 20 Oct 2024 13:54:02 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 13:53:31 +0000
Received: from localhost ([127.0.0.1]:46363 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2WN8-0000gs-KW
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 09:53:30 -0400
Received: from eggs.gnu.org ([209.51.188.92]:38250)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t2WN6-0000gc-RF
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 09:53:29 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t2WMb-0003Ea-Sl; Sun, 20 Oct 2024 09:52:57 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=jSRqz04Z2+/3Xlj+rq5duFWSUwcmkEk7TZgOW6dup88=; b=B/l/Ly4hYW0r
 54MKfMWVmYjUk+QHFtwrOVrNesrbdri9uZYfPTf03W+QUS4ygSdJEzM0rGidRFWDPQt5DbjQ3rjEe
 YMpKCZSkLvmW0bR3fJkGbh9+XmZs/he0VaGhcvkSywf1ZUxHF3PSl0LkUwxFkenRX8jJHpEGfI7N3
 6M+dB9uSe8Xw5/hU4M41DFaH9p2yHUQaxjDqU5tCfbp1rtO9+KP3H43G+mM3a/ZI3Q0FXK0LXaear
 p1j9b7Ksfy+V9f/2Kjejz8Z4pSlUhRxqbKVRxclMLt0gwFCxzdJLnB/uh8YPv7qdLAlrWQwAuyIvd
 lfgK9pRsxv0MOKIXTzyozw==;
Date: Sun, 20 Oct 2024 16:52:52 +0300
Message-Id: <86r08aj2yz.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <87o73eor6j.fsf@HIDDEN> (message from Sean
 Whitton on Sun, 20 Oct 2024 21:11:00 +0800)
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
 <871q0brvyj.fsf@HIDDEN> <8634krjfmo.fsf@HIDDEN>
 <87bjzfqg7d.fsf@HIDDEN>
 <878qujp0mq.fsf@HIDDEN> <86y12jhva6.fsf@HIDDEN>
 <87o73eor6j.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: 64055 <at> debbugs.gnu.org,  dgutov@HIDDEN,  Morgan.J.Smith@HIDDEN
> Date: Sun, 20 Oct 2024 21:11:00 +0800
> 
> >> Oh, wait, it wouldn't.  Does it appear in 'C-x v L'?
> >
> > Yes.
> 
> Okay.  Does the message look like this:
> 
>     amend! <sha1 of the commit whose message you edited>
> 
>     <your edited message>

Yes.

> If so, then we know that the invocation of 'git commit' is working, and
> the problem is somewhere else -- probably the invocation of 'git rebase'.

With you, so far.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Dmitry Gutov <dgutov@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 20 Oct 2024 23:56:02 +0000
Resent-Message-ID: <handler.64055.B64055.172946855020527 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>, Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172946855020527
          (code B ref 64055); Sun, 20 Oct 2024 23:56:02 +0000
Received: (at 64055) by debbugs.gnu.org; 20 Oct 2024 23:55:50 +0000
Received: from localhost ([127.0.0.1]:49342 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2fm1-0005L0-JL
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 19:55:49 -0400
Received: from forward502a.mail.yandex.net ([178.154.239.82]:56534)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dgutov@HIDDEN>) id 1t2fly-0005Kj-F5
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 19:55:48 -0400
Received: from mail-nwsmtp-smtp-production-main-91.myt.yp-c.yandex.net
 (mail-nwsmtp-smtp-production-main-91.myt.yp-c.yandex.net
 [IPv6:2a02:6b8:c12:1eaf:0:640:53c2:0])
 by forward502a.mail.yandex.net (Yandex) with ESMTPS id 9360660F94;
 Mon, 21 Oct 2024 02:55:18 +0300 (MSK)
Received: by mail-nwsmtp-smtp-production-main-91.myt.yp-c.yandex.net
 (smtp/Yandex) with ESMTPSA id EtaNc7WpCuQ0-OPETXeX1; 
 Mon, 21 Oct 2024 02:55:17 +0300
X-Yandex-Fwd: 1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail;
 t=1729468517; bh=uEDLqacim3t+Cw8zY3sZx30OuNyI+UB7xdQGkfBJppk=;
 h=In-Reply-To:From:Subject:Message-ID:Cc:References:Date:To;
 b=sunJMFgUqzJD+kU4ZGnYc8jpjkMA7Jq+IcKtawt3R3ZcOKi1wm8dnPPwqWk52U5Er
 Hw8vqd/7uEfVaS/S3zbl1JPwjoOvtruAmw79m9FLw++fsB6fL1lqlzChVHDqf/a8y4
 LuuBFiS6Izkf5HKkr+CCEf/EdwT3EWuX/Ya0wI9E=
Authentication-Results: mail-nwsmtp-smtp-production-main-91.myt.yp-c.yandex.net;
 dkim=pass header.i=@yandex.ru
Received: from phl-compute-08.internal (phl-compute-08.phl.internal
 [10.202.2.48])
 by mailfauth.phl.internal (Postfix) with ESMTP id A81C8120007A;
 Sun, 20 Oct 2024 19:55:14 -0400 (EDT)
Received: from phl-mailfrontend-01 ([10.202.2.162])
 by phl-compute-08.internal (MEProxy); Sun, 20 Oct 2024 19:55:14 -0400
X-ME-Sender: <xms:YpgVZ342fVgclo1e3GVnuCKHHhfKEFlnU4_er5LNXUwDONOx57qX8g>
 <xme:YpgVZ86DY_SOFDYpWjBkk6XxDWV591Dbh7VpFvXWUK-0p4fFQ8K61IXofqmLr2rB8
 o1yUMfT8CwJ3xb6vsk>
X-ME-Received: <xmr:YpgVZ-eKEpSS4Ojaq5CjCqD_fucdhqiWf3GwsNJ5qZQgYmLmPSupSuyvx0s4El6jNtkH>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehkedgvdekucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu
 rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh
 htshculddquddttddmnegovehorghsthgrlhdqrfegfedtqdeigeculdeftddtmdenucfj
 ughrpefkffggfgfuvfevfhfhjggtgfesthejredttddvjeenucfhrhhomhepffhmihhtrh
 ihucfiuhhtohhvuceoughguhhtohhvseihrghnuggvgidrrhhuqeenucggtffrrghtthgv
 rhhnpeehuddtieetuedvvedvjeejtdefkeefudeuvefgvdefleduudejhedvgfekieevge
 enucffohhmrghinheprhgvphholhhoghihrdhorhhgnecuvehluhhsthgvrhfuihiivgep
 tdenucfrrghrrghmpehmrghilhhfrhhomhepughguhhtohhvodhmvghsmhhtphgruhhthh
 hpvghrshhonhgrlhhithihqddufeeffeelleehhedvqddvleegjeejjeejiedqughguhht
 ohhvpeephigrnhguvgigrdhruhesfhgrshhtmhgrihhlrdgtohhmpdhnsggprhgtphhtth
 hopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehsphifhhhithhtohhnsehs
 phifhhhithhtohhnrdhnrghmvgdprhgtphhtthhopegvlhhiiiesghhnuhdrohhrghdprh
 gtphhtthhopehmohhrghgrnhdrjhdrshhmihhthhesohhuthhlohhokhdrtghomhdprhgt
 phhtthhopeeigedtheehseguvggssghughhsrdhgnhhurdhorhhg
X-ME-Proxy: <xmx:YpgVZ4IaiFgYrjxELVcjkw0jQXDi_DxTsLsfJ5-YWTzTz_LMlEBvpA>
 <xmx:YpgVZ7LZ32GPII0SYMRdfuPyFye7EgwPyAWHCP8S7xgk2PsTRhR79A>
 <xmx:YpgVZxw55FZh3R5XFnk7YuuQ4boW3tI8j_snPBmBSMxvvwyiWRsjuQ>
 <xmx:YpgVZ3IK6Wrc1-Ae3uaf5zJS4zVxYvea5Sx70FQ4OLrxjCsYZmL7Pw>
 <xmx:YpgVZ2arZGr6hDplXmUHhBf23gMiYiuPBe-baqgObpLFRzsYx3z5KD1s>
Feedback-ID: ib1d9465d:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun,
 20 Oct 2024 19:55:13 -0400 (EDT)
Message-ID: <64eb22e7-4cec-42c3-8dcc-d838c72860f8@HIDDEN>
Date: Mon, 21 Oct 2024 00:55:12 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN>
Content-Language: en-US
From: Dmitry Gutov <dgutov@HIDDEN>
In-Reply-To: <87bjzfuzaq.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Yandex-Filter: 1
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

On 20/10/2024 08:19, Sean Whitton wrote:
>> When I do the above, I get an error message:
>>
>>    vc-do-command: Failed (status 128): git --no-pager commit --only
>> --allow-empty -F c:/Users/EliZ/AppData/Local/Temp/git-msgWaNflu
>>
>> and the*vc* buffer says:
>>
>>    fatal: No paths with --include/--only does not make sense.
>>
>> It's possible my Git is very old, but shouldn't this command work with
>> old versions as well?
> I've looked into it and what's required is Git 2.11.1 from early 2017.
> 
> I think we can support older by stashing and unstashing.  So please try
> the attached patch, which does that.

Just to note, looking at https://repology.org/project/git/versions, 
support for Git 2.11 seems ubiquitous enough, even the next-to-last 
Trisquel release (based on Ubuntu 2020) has 2.25. And the very newest 
versions are available in Git for Windows.

And since this is an optional feature, we might as well limit ourselves 
to certain newer Git versions.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Dmitry Gutov <dgutov@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Mon, 21 Oct 2024 00:03:02 +0000
Resent-Message-ID: <handler.64055.B64055.172946895221964 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>, Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172946895221964
          (code B ref 64055); Mon, 21 Oct 2024 00:03:02 +0000
Received: (at 64055) by debbugs.gnu.org; 21 Oct 2024 00:02:32 +0000
Received: from localhost ([127.0.0.1]:49349 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2fsW-0005iB-Ec
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 20:02:32 -0400
Received: from forward502b.mail.yandex.net ([178.154.239.146]:58320)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dgutov@HIDDEN>) id 1t2fsT-0005i0-2X
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 20:02:30 -0400
Received: from mail-nwsmtp-smtp-production-main-45.sas.yp-c.yandex.net
 (mail-nwsmtp-smtp-production-main-45.sas.yp-c.yandex.net
 [IPv6:2a02:6b8:c16:179d:0:640:38f5:0])
 by forward502b.mail.yandex.net (Yandex) with ESMTPS id 7A6FE60E5E;
 Mon, 21 Oct 2024 03:01:32 +0300 (MSK)
Received: by mail-nwsmtp-smtp-production-main-45.sas.yp-c.yandex.net
 (smtp/Yandex) with ESMTPSA id T1EUjk0e3Os0-lrss3XOl; 
 Mon, 21 Oct 2024 03:01:31 +0300
X-Yandex-Fwd: 1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail;
 t=1729468891; bh=Y75xYiqPWj55+MA8E5a4MrCE9pLKdAUSIHliwwavcC4=;
 h=In-Reply-To:From:Subject:Message-ID:Cc:References:Date:To;
 b=ZmQfLm1vSufU+YS4sna40xRwN0FIOMzCnFCqNtaL9sdDr7c2xAYrwBMYBzVrqg1JP
 Av9VGuu7y6HJM19dZWD1l5CAASxXF5ov4Pr7V+9BIdFsjgIfFO8UKORvbWnFXwqgac
 nqSK8y+uZzpMl16quBGx85rYrtPWYGs0Ewgg+8S0=
Authentication-Results: mail-nwsmtp-smtp-production-main-45.sas.yp-c.yandex.net;
 dkim=pass header.i=@yandex.ru
Received: from phl-compute-01.internal (phl-compute-01.phl.internal
 [10.202.2.41])
 by mailfauth.phl.internal (Postfix) with ESMTP id 824191200077;
 Sun, 20 Oct 2024 20:01:29 -0400 (EDT)
Received: from phl-mailfrontend-01 ([10.202.2.162])
 by phl-compute-01.internal (MEProxy); Sun, 20 Oct 2024 20:01:29 -0400
X-ME-Sender: <xms:2ZkVZzzd1mQmXrFco_JQNjvU74jCvJmor6YB4A6ZsdTwGBKQSuQCYg>
 <xme:2ZkVZ7Q2hj1d04_375Q2AiISnPMc8nCxTdBEDNzDZWjYN6_AQdVHY8m7DTXjsQjG7
 N5KpC5qw0EC-N6dvMI>
X-ME-Received: <xmr:2ZkVZ9Vam0ScKecS2zL9l7QIWt4Az4A272nU9rsqgqeXbTAZ_V2flbusVbuTPwN6iDA4VanG-OevDkb_4mBLlxSeCCQnfZpC>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehkedgfedtucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu
 rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh
 htshculddquddttddmnegovehorghsthgrlhdqrfegfedtqdeigeculdeftddtmdenucfj
 ughrpefkffggfgfuvfevfhfhjggtgfesthejredttddvjeenucfhrhhomhepffhmihhtrh
 ihucfiuhhtohhvuceoughguhhtohhvseihrghnuggvgidrrhhuqeenucggtffrrghtthgv
 rhhnpeeihfejueevteffffdvfeetffffkefhuedujeeiheehiedulefghefgffefudffud
 enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegughhu
 thhovhdomhgvshhmthhprghuthhhphgvrhhsohhnrghlihhthidqudeffeefleelheehvd
 dqvdelgeejjeejjeeiqdgughhuthhovheppeihrghnuggvgidrrhhusehfrghsthhmrghi
 lhdrtghomhdpnhgspghrtghpthhtohepgedpmhhouggvpehsmhhtphhouhhtpdhrtghpth
 htohepvghlihiisehgnhhurdhorhhgpdhrtghpthhtohepshhpfihhihhtthhonhesshhp
 fihhihhtthhonhdrnhgrmhgvpdhrtghpthhtohepmhhorhhgrghnrdhjrdhsmhhithhhse
 houhhtlhhoohhkrdgtohhmpdhrtghpthhtohepieegtdehheesuggvsggsuhhgshdrghhn
 uhdrohhrgh
X-ME-Proxy: <xmx:2ZkVZ9h2AIFm6pE1FFppP5p2TFA3kI-VlqdKCWybl0zxX5qPPmn7dA>
 <xmx:2ZkVZ1BuXHNHQEqlnPKfz89vA5dz0j3rdl9woOmFgzttCNA5TBvuDQ>
 <xmx:2ZkVZ2J0HbzsliY_x87SBPiabX5VIZ8t-x6dU_dVEYMVowvTSO0ecA>
 <xmx:2ZkVZ0ArEEiSQrWQOmqCaDBYrHFP6fEv60zcKcTI2TfU_lgTHR7dpA>
 <xmx:2ZkVZxy3bp0jFJHxbXwj5LR-kDkBeJq9hUqm8tjKLKjmdjShf6ONV9O3>
Feedback-ID: ib1d9465d:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun,
 20 Oct 2024 20:01:28 -0400 (EDT)
Message-ID: <428c7619-b01e-42bc-9350-1fc9665722e0@HIDDEN>
Date: Mon, 21 Oct 2024 01:01:25 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
 <871q0brvyj.fsf@HIDDEN> <8634krjfmo.fsf@HIDDEN>
 <87bjzfqg7d.fsf@HIDDEN>
 <878qujp0mq.fsf@HIDDEN> <86y12jhva6.fsf@HIDDEN>
 <87o73eor6j.fsf@HIDDEN> <86r08aj2yz.fsf@HIDDEN>
Content-Language: en-US
From: Dmitry Gutov <dgutov@HIDDEN>
In-Reply-To: <86r08aj2yz.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Yandex-Filter: 1
X-Spam-Score: 1.0 (+)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

On 20/10/2024 16:52, Eli Zaretskii wrote:
>> From: Sean Whitton<spwhitton@HIDDEN>
>> Cc:64055 <at> debbugs.gnu.org,dgutov@HIDDEN,Morgan.J.Smith@HIDDEN
>> Date: Sun, 20 Oct 2024 21:11:00 +0800
>>
>>>> Oh, wait, it wouldn't.  Does it appear in 'C-x v L'?
>>> Yes.
>> Okay.  Does the message look like this:
>>
>>      amend! <sha1 of the commit whose message you edited>
>>
>>      <your edited message>
> Yes.
> 
>> If so, then we know that the invocation of 'git commit' is working, and
>> the problem is somewhere else -- probably the invocation of 'git rebase'.
> With you, so far.

Eli, it seems you've installed the patch from this bug on master by 
accident, in commit 75fa0cc1ae2.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Dmitry Gutov <dgutov@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Mon, 21 Oct 2024 00:11:02 +0000
Resent-Message-ID: <handler.64055.B64055.172946944123700 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>, Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172946944123700
          (code B ref 64055); Mon, 21 Oct 2024 00:11:02 +0000
Received: (at 64055) by debbugs.gnu.org; 21 Oct 2024 00:10:41 +0000
Received: from localhost ([127.0.0.1]:49358 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2g0P-00069K-G7
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 20:10:41 -0400
Received: from forward500d.mail.yandex.net ([178.154.239.208]:52706)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dgutov@HIDDEN>) id 1t2g0N-00068Z-H1
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 20:10:40 -0400
Received: from mail-nwsmtp-smtp-production-main-38.myt.yp-c.yandex.net
 (mail-nwsmtp-smtp-production-main-38.myt.yp-c.yandex.net
 [IPv6:2a02:6b8:c12:3011:0:640:638d:0])
 by forward500d.mail.yandex.net (Yandex) with ESMTPS id 6EE5E60CFF;
 Mon, 21 Oct 2024 03:09:42 +0300 (MSK)
Received: by mail-nwsmtp-smtp-production-main-38.myt.yp-c.yandex.net
 (smtp/Yandex) with ESMTPSA id d9EjVl7QkmI0-k4mSWQmo; 
 Mon, 21 Oct 2024 03:09:41 +0300
X-Yandex-Fwd: 1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail;
 t=1729469381; bh=oTT6zWPc6DvrZOHVQrBj/U84b0mI/yO4oW3RmTe81/4=;
 h=In-Reply-To:From:Subject:Message-ID:Cc:References:Date:To;
 b=WRJB8mC7l70S/9NGgF3lPcjDirBQokSQYGbayJcd13TltfJFeW5amI5qC1IZMwh6Y
 AU/yGeNETsRc//lmdegMe4J2EEgEkQcHCBsYZv+b7rKyjglcsBzCXMi4gZNYBN4JvH
 cWAH6y0g/FhT1LRAAhEvgpQbA5VEUlBYVHnTHKcg=
Authentication-Results: mail-nwsmtp-smtp-production-main-38.myt.yp-c.yandex.net;
 dkim=pass header.i=@yandex.ru
Received: from phl-compute-01.internal (phl-compute-01.phl.internal
 [10.202.2.41])
 by mailfauth.phl.internal (Postfix) with ESMTP id CA7651200043;
 Sun, 20 Oct 2024 20:09:38 -0400 (EDT)
Received: from phl-mailfrontend-01 ([10.202.2.162])
 by phl-compute-01.internal (MEProxy); Sun, 20 Oct 2024 20:09:38 -0400
X-ME-Sender: <xms:wpsVZ8AI-Tz6rGwJsTr-GQgWSTCo84QXEpXRBadn7rZDstadnWPs2A>
 <xme:wpsVZ-hV24x4ACLvd9q2mctWhXUPnxVetWl8WlTrFHrDLNLJDNbWwSz0PEjF5f-x7
 tnlpsfCsHdJ2SAoJ-k>
X-ME-Received: <xmr:wpsVZ_lb0mHJnekG6yd_22oqwc5SEPsKAZD_hUa7A2Cib8aK4x3HXpm394QJXMMh4agr3D9mD102OhGXLjHlKQbPZp6AeAFv>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehkedgfedvucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu
 rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh
 htshculddquddttddmnegovehorghsthgrlhdqrfegfedtqdeigeculdeftddtmdenucfj
 ughrpefkffggfgfuvfevfhfhjggtgfesthejredttddvjeenucfhrhhomhepffhmihhtrh
 ihucfiuhhtohhvuceoughguhhtohhvseihrghnuggvgidrrhhuqeenucggtffrrghtthgv
 rhhnpeeihfejueevteffffdvfeetffffkefhuedujeeiheehiedulefghefgffefudffud
 enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegughhu
 thhovhdomhgvshhmthhprghuthhhphgvrhhsohhnrghlihhthidqudeffeefleelheehvd
 dqvdelgeejjeejjeeiqdgughhuthhovheppeihrghnuggvgidrrhhusehfrghsthhmrghi
 lhdrtghomhdpnhgspghrtghpthhtohepgedpmhhouggvpehsmhhtphhouhhtpdhrtghpth
 htohepshhpfihhihhtthhonhesshhpfihhihhtthhonhdrnhgrmhgvpdhrtghpthhtohep
 vghlihiisehgnhhurdhorhhgpdhrtghpthhtohepmhhorhhgrghnrdhjrdhsmhhithhhse
 houhhtlhhoohhkrdgtohhmpdhrtghpthhtohepieegtdehheesuggvsggsuhhgshdrghhn
 uhdrohhrgh
X-ME-Proxy: <xmx:wpsVZyxLoqFob_caA6_EdEPG-4hvvNCLmr-GYI1DMKfk7CtJSWDCtQ>
 <xmx:wpsVZxROd1IdobPPRxbWmidenfoFC3-SRyotKjBMzMTmdJg72PDieg>
 <xmx:wpsVZ9bSSCAS8DkRwLsDhPm3r8Sb7cU5zcvAumdIlWvaXGj3wwd8IQ>
 <xmx:wpsVZ6SaU5DOkkiRmKRRxmb6Dchm5TUiIDIBDc1bax_ihqzMlhk4jA>
 <xmx:wpsVZ7D8aGBJg99R_H2hNbNwHf2bLLwvl4mH7U2sHACNU7DWMGCIpPCT>
Feedback-ID: ib1d9465d:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun,
 20 Oct 2024 20:09:37 -0400 (EDT)
Message-ID: <96d49abc-888b-4561-b57d-8d85627e2c42@HIDDEN>
Date: Mon, 21 Oct 2024 01:09:36 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN>
Content-Language: en-US
From: Dmitry Gutov <dgutov@HIDDEN>
In-Reply-To: <87bjzfuzaq.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Yandex-Filter: 1
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

On 20/10/2024 08:19, Sean Whitton wrote:
> +*** New user option 'vc-git-allow-rewriting-history'.
> +Many Git commands can change your copy of published change history
> +without warning.  If VC commands detect that this could happen, they
> +will stop.  You can customize this variable to permit rewriting history
> +even though Emacs thinks it is dangerous.

Curious: do we consider Git to be different from others? Or would we 
have corresponding options for Hg, Bzr, (maybe) Svn?

If we think rewriting history dangerous for all, we could mark the 
command as 'disabled' instead.

Otherwise, seems to work well, even though, as you said, a bit slower 
than one might naively expect.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Mon, 21 Oct 2024 01:47:02 +0000
Resent-Message-ID: <handler.64055.B64055.17294751759585 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Dmitry Gutov <dgutov@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, Eli Zaretskii <eliz@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17294751759585
          (code B ref 64055); Mon, 21 Oct 2024 01:47:02 +0000
Received: (at 64055) by debbugs.gnu.org; 21 Oct 2024 01:46:15 +0000
Received: from localhost ([127.0.0.1]:49455 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2hUt-0002UW-F2
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 21:46:15 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:56540)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t2hUs-0002UI-Aq
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 21:46:14 -0400
DKIM-Signature: a=rsa-sha256;
 b=U6TEmxKq8hZ1AP+o5L5qz8CpFs7EMAjJd6veYSLuaM0DP9ugptpXpLsLTwDkUJXmPtj5gDGOts1bn+4cnHNwXehfw/Jr+llr/tN4ZDeo9e4eUKbrVKB40PIyQdm22T7xE7CHokBlh0pAT27IfygVUk93Kz+uuhdp3mSCkYF0uxUwzRyLmNuTAOuegVntzfqXfQ+bD3fMitXRIew3+ok/Dyw9OSFA/Wz9ZvKdDmd/L3Ub3GvxJpn/oidsnpZSqh7Cpbb6bGdq8mea3Vth0w04a14FRMzXf1DdQErZnrawI04JhqJiTeVFE5FzJAlea8AH6q9dZDUwIsmdKtaYxWvyag==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=cr+muPfEZ+XOUd4a0i9tSKmj4Zw5pyY7TwUYPaJWmdw=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=ZQIqz6U7acukPNvUwU7+6ke0ZNdTq1lpDa7OrumxLWA+QE95AhTcFYS+Jxnqad512mko9FIYdNNIU5UlSrXiubZEJPP9hRHJb97cMQZ1Gg/UaK0YLEGJ5jDL6YdKIJln6icnDZF3EPZHS5hO7QMG6Si/CY5exTt4clqH3BbOreSVDDUyJ6FyRkzZU4mz+07ZZM1jw17NXCBiJnsiRyPrAW0AaTyf1XHpHKFJJLRfD/UedJq8Wp6tZRUWj1m5K/ex6b+8Pcit82CGFVCT5RenUYvfU1fjxnbLP18T3LemkUCoGx2x9OGZ3Gx9XmrcSt/5Y6FjQ+5vd4Zm47poTAkX5Q==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=cr+muPfEZ+XOUd4a0i9tSKmj4Zw5pyY7TwUYPaJWmdw=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 642239233; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Mon, 21 Oct 2024 01:45:41 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id E68F67E0774; Mon, 21 Oct 2024 09:45:37 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <428c7619-b01e-42bc-9350-1fc9665722e0@HIDDEN> (Dmitry Gutov's
 message of "Mon, 21 Oct 2024 01:01:25 +0100")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
 <871q0brvyj.fsf@HIDDEN> <8634krjfmo.fsf@HIDDEN>
 <87bjzfqg7d.fsf@HIDDEN>
 <878qujp0mq.fsf@HIDDEN> <86y12jhva6.fsf@HIDDEN>
 <87o73eor6j.fsf@HIDDEN> <86r08aj2yz.fsf@HIDDEN>
 <428c7619-b01e-42bc-9350-1fc9665722e0@HIDDEN>
Date: Mon, 21 Oct 2024 09:45:37 +0800
Message-ID: <874j56mdoe.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Mon 21 Oct 2024 at 01:01am +01, Dmitry Gutov wrote:

> Eli, it seems you've installed the patch from this bug on master by accident,
> in commit 75fa0cc1ae2.

The debugging version, it would seem.  I've gone ahead and reverted it.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Mon, 21 Oct 2024 01:53:01 +0000
Resent-Message-ID: <handler.64055.B64055.172947556210644 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172947556210644
          (code B ref 64055); Mon, 21 Oct 2024 01:53:01 +0000
Received: (at 64055) by debbugs.gnu.org; 21 Oct 2024 01:52:42 +0000
Received: from localhost ([127.0.0.1]:49470 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2hb7-0002lc-Is
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 21:52:41 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:35422)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t2hb5-0002lO-JQ
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 21:52:40 -0400
DKIM-Signature: a=rsa-sha256;
 b=S8uKtMwebiXDjJAgnJDXnp1rFBdAfjaIQj7JSzgOnxV1EeYLSJi5Zk4EMK9BQbPqV2mP7vkMtdnqrggRTGKBSqwQOohhPJ9M8MhbXJ+bGhm1lcIHw9G8t86rDJHcXEQVCOHn2V5QH8cfhi+VlqokgvN4fANrOA1wrAfwmOZoqMP/mrl7TaoIcvb4enw8MntC/V9bPcFthDxoAuYE7n4XdmvDB5MNdtGSsdhITnBVFWrQBIYCXhRCz28iJwQnGadzhyfBFmpoQEny72MML55JLTlOzHOd23QD6xs69HUjju7dIcgcrDBqgbiyU1qkFgjjL0hJcGXliflfAat9SIcXhA==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=et/lEUe5m5tt2+u/qXYM/xjBsKdlYfaOP/NvbUEH9rQ=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=AqaeB1vBX7IX9bx/R1qycWr3DRegS0/AkzE5B2Lw4mEA8L0fYjzzFtBAwt6++y4im2MyrwPa8Ry2V0stDaPFlSqj2lWivJb/k/rFKu3glW0Su2AeGttAIxMTrtyKaDG4m+oOw2RLiRogVHpEJCylcHK/eFZD1/OWio5aAZc5M1DvgP53B97fW2Gii/oXSn8+12YzUPYCcyVEWmfumvtUI9CqxfzyKPrjEwEc6LGEceM365UExOF0GyYpw7nIamBQfdWOxGqrADXC7MeZIDvyoRKXb5wYDyOWAq89VyDtDxBJPBeBc/x7O1qy17HRN9gvYwoGjD+vYixFFJIfDdryww==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=et/lEUe5m5tt2+u/qXYM/xjBsKdlYfaOP/NvbUEH9rQ=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -1993594376; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Mon, 21 Oct 2024 01:52:06 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 3C8C17EB6AA; Mon, 21 Oct 2024 09:52:02 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <86r08aj2yz.fsf@HIDDEN> (Eli Zaretskii's message of "Sun, 20 Oct
 2024 16:52:52 +0300")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
 <871q0brvyj.fsf@HIDDEN> <8634krjfmo.fsf@HIDDEN>
 <87bjzfqg7d.fsf@HIDDEN>
 <878qujp0mq.fsf@HIDDEN> <86y12jhva6.fsf@HIDDEN>
 <87o73eor6j.fsf@HIDDEN> <86r08aj2yz.fsf@HIDDEN>
Date: Mon, 21 Oct 2024 09:52:02 +0800
Message-ID: <87wmi2kyt9.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Sun 20 Oct 2024 at 04:52pm +03, Eli Zaretskii wrote:

>> From: Sean Whitton <spwhitton@HIDDEN>
>> Cc: 64055 <at> debbugs.gnu.org,  dgutov@HIDDEN,  Morgan.J.Smith@HIDDEN
>> Date: Sun, 20 Oct 2024 21:11:00 +0800
>>
>> >> Oh, wait, it wouldn't.  Does it appear in 'C-x v L'?
>> >
>> > Yes.
>>
>> Okay.  Does the message look like this:
>>
>>     amend! <sha1 of the commit whose message you edited>
>>
>>     <your edited message>
>
> Yes.
>
>> If so, then we know that the invocation of 'git commit' is working, and
>> the problem is somewhere else -- probably the invocation of 'git rebase'.
>
> With you, so far.

I think the next thing to do is try the rebase from the command line.
So, please use the debugging version of my patch to create the special
"amend!" commit again, or use the one from yesterday if you still have
it, or you could manually create it by passing --allow-empty to 'git
commit'.

Then, at the command line, use

    git rebase --autosquash -i REV~1

where REV is the sha1 of the commit whose message you intend to edit.

This should open an editor with a rebase plan in which you see

    - the commit whose message you wanted to change
    - followed by the special amend! commit
    - followed by any other commits following the one whose message you wanted to change

i.e. the amend! commit has been pulled down in history to just after the
commit whose message you want to cahnge.

Just save and exit without making any changes to the plan.

After that, the whole process should be complete: you should have the
same commits as previously except the message should have been updated,
and sha1 hashes will have changed.

Let me know if this all works.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Mon, 21 Oct 2024 02:03:02 +0000
Resent-Message-ID: <handler.64055.B64055.172947613012413 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Dmitry Gutov <dgutov@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, Eli Zaretskii <eliz@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172947613012413
          (code B ref 64055); Mon, 21 Oct 2024 02:03:02 +0000
Received: (at 64055) by debbugs.gnu.org; 21 Oct 2024 02:02:10 +0000
Received: from localhost ([127.0.0.1]:49484 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2hkH-0003E8-QG
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 22:02:10 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:60688)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t2hkG-0003Du-1W
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 22:02:09 -0400
DKIM-Signature: a=rsa-sha256;
 b=DTWNoGja27cfVLE5SJhewQVVed+WTV4RIChKw2SdS9SkMji774dIkZdRLqyU+DeE7xnm7366GBJ/YUI83gUa1qdp1ed2Y4EYZ41XuiCfElO3utS1SAgPIe5sqO9SlibLfUFIJ72r3Zk/F0v0qPzoCYWx8mKXLhU/Iu1TlMO9cRDdXvRm7SFREd8ItdHLrU80zE75A0HLxs0AgAo8iMFpJcSkK5m1udxrzsw5ACwFbBCUkuGHjgv5sgmoCfL9U4inz+Ria24PPXx+b69tJ3txGskPJHePGhkiXKuG11MByaf7akC8iXlTkv15TunI5FjmXDX4C/yxUb65r2jL5Jr34Q==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=Pa593PjYyqwYFVYS/VMYL3jVeWXNIWbc49JxvNRBiw0=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=nm4NgHKsmZTIfXF1VxRCKX/HpWyJVBju1FmNv0GDB79CqGWUb+gCm8mtN6pblwVPpht+js5RXCZVe/BTsUzSLteRQdNWVd/VBv+CZdeIpjm+grk8We4o0yXm+3FcaDo2HXnnAc+e36DTWzqrANRM7fdTI3yUOZZMs3xp894AWlh4TBrzV+J1+sOFGYslOubGAimwemrPCekBaT6rCER++3kUFWxk/BNyAsHbRA14ZcIed7olOw8/E3k3cAj93vLd2MrluEjuv0ST45+vtOw1iBBVVKqJk8PRIoaRrApX9OIP5yCz6LRTLfhF2QWIzzf1cEQqQznbdLrJ7fVNq+olxA==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=Pa593PjYyqwYFVYS/VMYL3jVeWXNIWbc49JxvNRBiw0=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -44438419; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Mon, 21 Oct 2024 02:01:31 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 92BE57EB6AA; Mon, 21 Oct 2024 10:01:28 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <96d49abc-888b-4561-b57d-8d85627e2c42@HIDDEN> (Dmitry Gutov's
 message of "Mon, 21 Oct 2024 01:09:36 +0100")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN>
 <96d49abc-888b-4561-b57d-8d85627e2c42@HIDDEN>
Date: Mon, 21 Oct 2024 10:01:28 +0800
Message-ID: <87h696kydj.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Mon 21 Oct 2024 at 01:09am +01, Dmitry Gutov wrote:

> On 20/10/2024 08:19, Sean Whitton wrote:
>> +*** New user option 'vc-git-allow-rewriting-history'.
>> +Many Git commands can change your copy of published change history
>> +without warning.  If VC commands detect that this could happen, they
>> +will stop.  You can customize this variable to permit rewriting history
>> +even though Emacs thinks it is dangerous.
>
> Curious: do we consider Git to be different from others? Or would we have
> corresponding options for Hg, Bzr, (maybe) Svn?
>
> If we think rewriting history dangerous for all, we could mark the command as
> 'disabled' instead.

I think that for some VCS editing the commit message is not a form of
rewriting history in any sense.  And we can hope for a future VCS that
keeps change histories for commit messages, so that we might easily
correct our mistakes.  So I don't believe it would make sense to just
disable log-view-modify-change-comment.

We might, though, want to consider a more general
vc-allow-rewriting-history instead of vc-git-allow-rewriting-history,
and use it wherever its applicable -- it will be VCS-dependent where
exactly it applies.

I'm cautious about doing that without more information, because
"rewriting history" is, in my mind, a Git-specific piece of terminology
to begin with.

I think it is probably okay to keep vc-git-allow-rewriting-history even
if we decide to deprecate it in favour of a more general variable at
some point.

> Otherwise, seems to work well, even though, as you said, a bit slower than one
> might naively expect.

Ah, thank you for testing.

I'm not whether the slowness is coming from the safety check in
vc-git--assert-allowed-rewrite or from the rebase command, or both.  I
do know that rebases don't tend to be fast.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Mon, 21 Oct 2024 02:11:02 +0000
Resent-Message-ID: <handler.64055.B64055.172947664713975 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Dmitry Gutov <dgutov@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, Eli Zaretskii <eliz@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172947664713975
          (code B ref 64055); Mon, 21 Oct 2024 02:11:02 +0000
Received: (at 64055) by debbugs.gnu.org; 21 Oct 2024 02:10:47 +0000
Received: from localhost ([127.0.0.1]:49496 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2hsc-0003dK-UC
	for submit <at> debbugs.gnu.org; Sun, 20 Oct 2024 22:10:47 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:39208)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t2hsa-0003Yh-7W
 for 64055 <at> debbugs.gnu.org; Sun, 20 Oct 2024 22:10:45 -0400
DKIM-Signature: a=rsa-sha256;
 b=SVtMsWmn3sZzs92TMoiFo/w2gtXOJdSYy0q2gPb9rKvE6A/ZYM+zNET17r01BHiYCUxMaXJUzTaZFSUpf+zmqW/Ukv5VrUFc1bBKEnD+KRszi7S/NmCciLBKiUuhaCq1Qg1SjQHw1j479TKw4wX4BIeLDN0QRbG+GgEEjKYHoZnPOZeuvrmQdFbqMrsRWAG132dl64B2regSc90PNhmNoDhAWspzMGEWBav0f+yqe2iETx/NYPfNWqU0m0LshCPFv0ltesdf2eMiWyhgyRLHFBtl6B8SYYLJ8F9HbsgEsYndPQWofheZ8bFcVYGhjd/s097f9kltLTeysvp6V69MSg==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=orEtaUL3E5wB8o8PXskBB7phNZV4F1owdCl7fu9Wn30=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=PY01G03SwTsTcVq1TbDuuoUArhCe6GJjbUsvfOViv9Sm9mJrJu4LTtj5cOW7XnGAaseycHQCTCU/cO4UoXy6IMAm55J3WhL9Eh0S4zd7zx5g8pPKFRTIzEHdeKARp92GKO6tOTktOTxEOtV4mLInBqc4NcY6b43UgMNCn7oCeS6oXZaZZn22CvLlu2oL/wGPX4FYsCdxTgkY9rmKZCF7a7CnQrfHLTuzpOv1qm24jeCACKXm366Ts4su3Nw0TEzvU/YFOFqF0ugUudfibnr4Si5uHTQMy6q6bFEzjLzoAZv5j/7cppNU36OxXsEgBzyM8buXMpxHbbyAwswkPu6ZCg==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=orEtaUL3E5wB8o8PXskBB7phNZV4F1owdCl7fu9Wn30=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 196359967; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Mon, 21 Oct 2024 02:10:09 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 4D2F67EBE8C; Mon, 21 Oct 2024 10:10:07 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <64eb22e7-4cec-42c3-8dcc-d838c72860f8@HIDDEN> (Dmitry Gutov's
 message of "Mon, 21 Oct 2024 00:55:12 +0100")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN>
 <64eb22e7-4cec-42c3-8dcc-d838c72860f8@HIDDEN>
Date: Mon, 21 Oct 2024 10:10:07 +0800
Message-ID: <87zfmyjjeo.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Mon 21 Oct 2024 at 12:55am +01, Dmitry Gutov wrote:

> Just to note, looking at https://repology.org/project/git/versions, support
> for Git 2.11 seems ubiquitous enough, even the next-to-last Trisquel release
> (based on Ubuntu 2020) has 2.25. And the very newest versions are available in
> Git for Windows.
>
> And since this is an optional feature, we might as well limit ourselves to
> certain newer Git versions.

AFAICT it's straightforward to support the older git -- basically
replace the --autostash argument to 'git rebase' with a manual stash and
unstash (not because --autostash is unsupported, but because we need the
stash to occur earlier).

If the Windows testing that Eli and I are doing reaches a conclusion
that there are other incompatibilities caused by the older Git, we may
have to abandon trying to support <<2.11.1, so thank you for looking
into the availability.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Mon, 21 Oct 2024 05:28:02 +0000
Resent-Message-ID: <handler.64055.B64055.172948846316546 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Dmitry Gutov <dgutov@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, spwhitton@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172948846316546
          (code B ref 64055); Mon, 21 Oct 2024 05:28:02 +0000
Received: (at 64055) by debbugs.gnu.org; 21 Oct 2024 05:27:43 +0000
Received: from localhost ([127.0.0.1]:49762 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2kxD-0004Io-F5
	for submit <at> debbugs.gnu.org; Mon, 21 Oct 2024 01:27:43 -0400
Received: from eggs.gnu.org ([209.51.188.92]:42412)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t2kxA-0004IW-LS
 for 64055 <at> debbugs.gnu.org; Mon, 21 Oct 2024 01:27:41 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t2kwe-0002MX-M6; Mon, 21 Oct 2024 01:27:08 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=mr+rrgJ1XC/kgHEvOEs71YjubM4Uq8DHTBuuD7r6nlM=; b=XMV/Ku/pPDcJ
 mIfb3mjgZvc8zizOJorAR11Y1GkzDDg4FSpEEt6TXpVqJFzL3I8aDs5/KBb1StRvTDtfCz4S9rfWZ
 XnYpSO+TwqSnYkaXffxedj5PmGZl4NDmTpNxmyiTZGj7wsSbdyG5MAOfJkjIZOKZd0SdsjhffZhrX
 l1Ot1hoxs4UEgnHQmP5QbqJHq5y0WhLhmhYtvjV0BvVaki9qLmPDkQtJaXoM7vEVpat2TaR0wICWA
 QMoNdyEmiAiyxIL1d1GKdZ9mSx/pd1AmSdJTGyg3ig3e2JcEF4FrHwSwqpXYVlaat6xaG5lFyJU6Z
 X++44K/53KOB/WSW1i6riA==;
Date: Mon, 21 Oct 2024 08:27:02 +0300
Message-Id: <86y12igh5l.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <428c7619-b01e-42bc-9350-1fc9665722e0@HIDDEN> (message from
 Dmitry Gutov on Mon, 21 Oct 2024 01:01:25 +0100)
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
 <871q0brvyj.fsf@HIDDEN> <8634krjfmo.fsf@HIDDEN>
 <87bjzfqg7d.fsf@HIDDEN>
 <878qujp0mq.fsf@HIDDEN> <86y12jhva6.fsf@HIDDEN>
 <87o73eor6j.fsf@HIDDEN> <86r08aj2yz.fsf@HIDDEN>
 <428c7619-b01e-42bc-9350-1fc9665722e0@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> Date: Mon, 21 Oct 2024 01:01:25 +0100
> Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org
> From: Dmitry Gutov <dgutov@HIDDEN>
> 
> >>      amend! <sha1 of the commit whose message you edited>
> >>
> >>      <your edited message>
> > Yes.
> > 
> >> If so, then we know that the invocation of 'git commit' is working, and
> >> the problem is somewhere else -- probably the invocation of 'git rebase'.
> > With you, so far.
> 
> Eli, it seems you've installed the patch from this bug on master by 
> accident, in commit 75fa0cc1ae2.

Oops, thanks, fixed.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Mon, 21 Oct 2024 05:43:01 +0000
Resent-Message-ID: <handler.64055.B64055.172948934819547 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172948934819547
          (code B ref 64055); Mon, 21 Oct 2024 05:43:01 +0000
Received: (at 64055) by debbugs.gnu.org; 21 Oct 2024 05:42:28 +0000
Received: from localhost ([127.0.0.1]:49778 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2lBU-00055D-4g
	for submit <at> debbugs.gnu.org; Mon, 21 Oct 2024 01:42:28 -0400
Received: from eggs.gnu.org ([209.51.188.92]:33096)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t2lBR-00054z-7c
 for 64055 <at> debbugs.gnu.org; Mon, 21 Oct 2024 01:42:25 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t2l8m-0003WI-Df; Mon, 21 Oct 2024 01:39:40 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=6viJCZeeCqZAsGN3QHr4dPYSguuP//upplLok7iK33c=; b=JeQVboODj1xD
 T6ySKu/PqGo7BWj2XqT8rFlnIUYd58kulBj3uxn2jLX+R5xmgmrsoqTdFSBYYi+KLPLHCB+DxaC1g
 H2p1IJHJ7R7D7/jBNfcdkIqc/7bTeYd0D7gTo+HNJrK2gI8pG6xs+f7CRBteqImbJsWEFoS0ENqPQ
 5JG8natVIpprogPLWBqIGzHNJiTB65Gfhwrpg7uAWjshnB7KiDv3TlRpGVIdnxX/oahRZqTsQ2u9h
 ripSDJPy8l8cYiu374QpEmd2gDzzRavJ665iF2pUF5CndgWZffad7lNlsy/EI9/r55PD/UcPWp1Ue
 ilispFf4n6dSQtk7l3bnFw==;
Date: Mon, 21 Oct 2024 08:39:35 +0300
Message-Id: <86wmi2ggko.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <87h696kydj.fsf@HIDDEN> (message from Sean
 Whitton on Mon, 21 Oct 2024 10:01:28 +0800)
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN>
 <96d49abc-888b-4561-b57d-8d85627e2c42@HIDDEN>
 <87h696kydj.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: Eli Zaretskii <eliz@HIDDEN>,  Morgan.J.Smith@HIDDEN,
>   64055 <at> debbugs.gnu.org
> Date: Mon, 21 Oct 2024 10:01:28 +0800
> 
> > On 20/10/2024 08:19, Sean Whitton wrote:
> >> +*** New user option 'vc-git-allow-rewriting-history'.
> >> +Many Git commands can change your copy of published change history
> >> +without warning.  If VC commands detect that this could happen, they
> >> +will stop.  You can customize this variable to permit rewriting history
> >> +even though Emacs thinks it is dangerous.
> >
> > Curious: do we consider Git to be different from others? Or would we have
> > corresponding options for Hg, Bzr, (maybe) Svn?
> >
> > If we think rewriting history dangerous for all, we could mark the command as
> > 'disabled' instead.
> 
> I think that for some VCS editing the commit message is not a form of
> rewriting history in any sense.  And we can hope for a future VCS that
> keeps change histories for commit messages, so that we might easily
> correct our mistakes.  So I don't believe it would make sense to just
> disable log-view-modify-change-comment.
> 
> We might, though, want to consider a more general
> vc-allow-rewriting-history instead of vc-git-allow-rewriting-history,
> and use it wherever its applicable -- it will be VCS-dependent where
> exactly it applies.
> 
> I'm cautious about doing that without more information, because
> "rewriting history" is, in my mind, a Git-specific piece of terminology
> to begin with.

Which aspects of "rewriting history" you consider Git-specific?  I
think any dVCS has the same issues with that, and supports similar
workflows, so the concept is relevant to all of them.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Mon, 21 Oct 2024 05:48:02 +0000
Resent-Message-ID: <handler.64055.B64055.172948964020400 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172948964020400
          (code B ref 64055); Mon, 21 Oct 2024 05:48:02 +0000
Received: (at 64055) by debbugs.gnu.org; 21 Oct 2024 05:47:20 +0000
Received: from localhost ([127.0.0.1]:49787 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2lGB-0005Iy-VI
	for submit <at> debbugs.gnu.org; Mon, 21 Oct 2024 01:47:20 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:33074)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t2lGA-0005Ie-6C
 for 64055 <at> debbugs.gnu.org; Mon, 21 Oct 2024 01:47:18 -0400
DKIM-Signature: a=rsa-sha256;
 b=QsM5SE1PbWPgS2l+lpX3Wi2flMPQCTHZOG3XaBSOBfJ1Y1FT/KFiPrdxHjmxga3tf80IQZEj/2cV4LtEI6yK6HPNQhb5xVHfNaOy+Mf6yaSua9mnPNeimnqAGHp0+0daii1MLv+ql3njVnrAE4iEksNY3VCnQYVS6YRHeAKjMSUzzqX3WC5kVK7YgRbwbpmvDs7R6yOcSgOgutPLTiX0XTEsJrLBwJ63gqexb/gEbrfS1UAFFKzpsaYzj+G/4Hjhh36MixrG5EypYw6IDvpS+p+lzrMB97xapADjMGQaogiJOtVw8+grelXdsH16LwoJ97++TyCKTv9RO8iHN2DlXQ==;
 s=purelymail1; d=spwhitton.name; v=1;
 bh=NcaB2euBsHupGqA/9R0ZMslg9ByiPrQNQzJbJLSM1fI=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=Tsd6jL7RRiHSLDOxJ3bYcbQqkj1cuRSuNsW6rNrvETXm/EFEqxDcs4g29ri4erlAhm+THGKgsKVphzBfGL8KBYQ6PoqN2Go9TXwyQco8DVM/dH+swyUqM6/qMUgENb8Sch7U3/33p3yLXEDSQ39TrM0g0bnuX7FzzIrI4HB8hfHjdzkBVmH/YsQlXVHmL9NqNuZH28UNaS9FYCogyNfUmYr223oo6dpa+t9Jhf7QdwBle2gJihPj7mZe1R+SRWw4rpp361N7NpksWwlRCZgkKTiuP9vUOcT4ZOhMS6pdVPSwKVBBbcc55sq14q8W2cJZZ6mR5GqqvkrRH9+lutlrLw==;
 s=purelymail1; d=purelymail.com; v=1;
 bh=NcaB2euBsHupGqA/9R0ZMslg9ByiPrQNQzJbJLSM1fI=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 539890598; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Mon, 21 Oct 2024 05:46:42 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 3D2C97EA0CE; Mon, 21 Oct 2024 13:46:39 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <86wmi2ggko.fsf@HIDDEN> (Eli Zaretskii's message of "Mon, 21 Oct
 2024 08:39:35 +0300")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN>
 <96d49abc-888b-4561-b57d-8d85627e2c42@HIDDEN>
 <87h696kydj.fsf@HIDDEN> <86wmi2ggko.fsf@HIDDEN>
Date: Mon, 21 Oct 2024 13:46:39 +0800
Message-ID: <87cyjuj9ds.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Mon 21 Oct 2024 at 08:39am +03, Eli Zaretskii wrote:

> Which aspects of "rewriting history" you consider Git-specific?  I
> think any dVCS has the same issues with that, and supports similar
> workflows, so the concept is relevant to all of them.

Mainly the terminology.

If others think it is fine to go ahead and call the defcustom
vc-allow-rewriting-history, I am happy to do so.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Mon, 21 Oct 2024 05:51:01 +0000
Resent-Message-ID: <handler.64055.B64055.172948984421019 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172948984421019
          (code B ref 64055); Mon, 21 Oct 2024 05:51:01 +0000
Received: (at 64055) by debbugs.gnu.org; 21 Oct 2024 05:50:44 +0000
Received: from localhost ([127.0.0.1]:49799 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2lJT-0005Sl-V9
	for submit <at> debbugs.gnu.org; Mon, 21 Oct 2024 01:50:44 -0400
Received: from eggs.gnu.org ([209.51.188.92]:44718)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t2lJR-0005OO-Ek
 for 64055 <at> debbugs.gnu.org; Mon, 21 Oct 2024 01:50:42 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t2lIv-0004be-OZ; Mon, 21 Oct 2024 01:50:09 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=w/GscC9D+It2wNGYQ7/aQrQpI8CPfj9tcNQGk4BBGPc=; b=Q8kxwG+sP4HM
 7GCQzFgQ9lCaQsywhipA+Ti3njsrLATt7ex2pxkGmjjytaNXT+WhWrADPTvrXbz5y08+GBr4jZLWS
 4xbh+jiUZAi2fidiMUJFtXFFjuMDidWusaKMw0wQx8TL9zXgaumM+SCScPWlGICVQg/h6fj+GchWL
 EK6ilB7oEnU7u9KAI397oFJbrrsGKcHUX56mz/C6Z6UpouHiOvbwMn/U2pmtnRtbv0YQpH/z+0XMw
 UnUQMq0hFpFV3Zjb6BQbwRlKBEbe7ZNKKPCLhGagLuTSCexhkZ6Qv78NNcqoZ+r+ZiTuyGE8C+FSQ
 I3LGh5GX86zmDIBumPVYrg==;
Date: Mon, 21 Oct 2024 08:49:58 +0300
Message-Id: <86sesqgg3d.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <87cyjuj9ds.fsf@HIDDEN> (message from Sean
 Whitton on Mon, 21 Oct 2024 13:46:39 +0800)
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN>
 <96d49abc-888b-4561-b57d-8d85627e2c42@HIDDEN>
 <87h696kydj.fsf@HIDDEN> <86wmi2ggko.fsf@HIDDEN>
 <87cyjuj9ds.fsf@HIDDEN>
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: dgutov@HIDDEN,  Morgan.J.Smith@HIDDEN,  64055 <at> debbugs.gnu.org
> Date: Mon, 21 Oct 2024 13:46:39 +0800
> 
> Hello,
> 
> On Mon 21 Oct 2024 at 08:39am +03, Eli Zaretskii wrote:
> 
> > Which aspects of "rewriting history" you consider Git-specific?  I
> > think any dVCS has the same issues with that, and supports similar
> > workflows, so the concept is relevant to all of them.
> 
> Mainly the terminology.

I think both rebasing and non-FF pushes can happen with all dVCSes, so
the issue is indeed more general than only with Git.

> If others think it is fine to go ahead and call the defcustom
> vc-allow-rewriting-history, I am happy to do so.

I think we should indeed rename it, yes.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Mon, 21 Oct 2024 13:50:04 +0000
Resent-Message-ID: <handler.64055.B64055.17295185518789 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17295185518789
          (code B ref 64055); Mon, 21 Oct 2024 13:50:04 +0000
Received: (at 64055) by debbugs.gnu.org; 21 Oct 2024 13:49:11 +0000
Received: from localhost ([127.0.0.1]:50694 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2smU-0002Hg-El
	for submit <at> debbugs.gnu.org; Mon, 21 Oct 2024 09:49:11 -0400
Received: from eggs.gnu.org ([209.51.188.92]:46134)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t2smO-0002H7-UB
 for 64055 <at> debbugs.gnu.org; Mon, 21 Oct 2024 09:49:08 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t2sls-0003Lu-3w; Mon, 21 Oct 2024 09:48:32 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From:
 Date; bh=UvFlXTYU/iC9Opi2h+48NUdtfIfOsPx30Y/XgAlrCzE=; b=HPSyW0DhTSJZnSzX6XNU
 PkJ6blGjfYhM2bcDXrlM4WAwAYD2+MGCimn2j7NMLW5qEdz8L2wFmaCrPmKQggDytgGtq2He0KVtq
 0gLoL7lz+qfA/smgNbHk852NbStx5TjE92XqeHU10XojE4k6TRwEQT+BSjrhtfce3FmVf/s0TtEc9
 BMnO+debVkrKatQoUzbXynBhj6CHT8X8I1OTctPIyktrtlO4u6ZkuReUrLHbPSTH3jWL0JMDV209c
 k85SwTu0oopt5UwRgy2fxSu2I99DVx1rT0jw/2Io3TDaC+KD79BFckcxeLIrNO00alIXnXVr3vHDc
 031yuhSTDEGGwQ==;
Date: Mon, 21 Oct 2024 16:48:28 +0300
Message-Id: <86a5exh8ib.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <87wmi2kyt9.fsf@HIDDEN> (message from Sean
 Whitton on Mon, 21 Oct 2024 09:52:02 +0800)
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
 <871q0brvyj.fsf@HIDDEN> <8634krjfmo.fsf@HIDDEN>
 <87bjzfqg7d.fsf@HIDDEN>
 <878qujp0mq.fsf@HIDDEN> <86y12jhva6.fsf@HIDDEN>
 <87o73eor6j.fsf@HIDDEN> <86r08aj2yz.fsf@HIDDEN>
 <87wmi2kyt9.fsf@HIDDEN>
MIME-version: 1.0
Content-type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: 64055 <at> debbugs.gnu.org,  dgutov@HIDDEN,  Morgan.J.Smith@HIDDEN
> Date: Mon, 21 Oct 2024 09:52:02 +0800
> 
> I think the next thing to do is try the rebase from the command line.
> So, please use the debugging version of my patch to create the special
> "amend!" commit again, or use the one from yesterday if you still have
> it, or you could manually create it by passing --allow-empty to 'git
> commit'.
> 
> Then, at the command line, use
> 
>     git rebase --autosquash -i REV~1
> 
> where REV is the sha1 of the commit whose message you intend to edit.
> 
> This should open an editor with a rebase plan in which you see
> 
>     - the commit whose message you wanted to change
>     - followed by the special amend! commit
>     - followed by any other commits following the one whose message you wanted to change
> 
> i.e. the amend! commit has been pulled down in history to just after the
> commit whose message you want to cahnge.
> 
> Just save and exit without making any changes to the plan.
> 
> After that, the whole process should be complete: you should have the
> same commits as previously except the message should have been updated,
> and sha1 hashes will have changed.
> 
> Let me know if this all works.

I'm not sure I understood you correctly, but if I perform all these
step, I'm back at the original tip, with the original log message, not
the edited one.

But let me describe what I did and saw, to make sure I did it
correctly.

>     git rebase --autosquash -i REV~1
> 
> where REV is the sha1 of the commit whose message you intend to edit.

At this point "git log" shows a revision with my amended log message
(let's call this AMENDED-REV), followed by the revision with the
original log message (let's call it ORIG-REV).  So my Git command
looks like this:

  git rebase --autosquash -i ORIG-REV~1

After this step, I see this in the editor (where I indented the text
by 2 columns):

  pick bf73d7e Foobar with some Unicode אבגד ą ě č
  # pick bc3c567b2b136d040fd13373b6594c1ec026fec6 Foobar with some Unicode אבגד ą ě č

  # Rebase 6c6ea73..bc3c567 onto 6c6ea73 (1 command)
  #
  # Commands:
  # p, pick = use commit
  # r, reword = use commit, but edit the commit message
  # e, edit = use commit, but stop for amending
  # s, squash = use commit, but meld into previous commit
  # f, fixup = like "squash", but discard this commit's log message
  # x, exec = run command (the rest of the line) using shell
  # d, drop = remove commit
  #
  # These lines can be re-ordered; they are executed from top to bottom.
  #
  # If you remove a line here THAT COMMIT WILL BE LOST.
  #
  # However, if you remove everything, the rebase will be aborted.
  #
  # Note that empty commits are commented out

Here bf73d7e is ORIG-REV and bc3c567b is AMENDED-REV.  At this point,
I just type "C-x #", since you said "just save and exit" (of course,
saving is not needed, since I didn't edit the buffer).

After that, I see in the shell window:

  $ git rebase --autosquash -i bf73d7e036c5d80cdd112f34255a0ab1ea697c07~1
  Waiting for Emacs...
  Successfully rebased and updated refs/heads/master.

But "git log" shows the original log message for ORIG-REV.

Does this mean it didn't work? or did I misinterpret the steps?

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Dmitry Gutov <dgutov@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Mon, 21 Oct 2024 19:58:01 +0000
Resent-Message-ID: <handler.64055.B64055.172954066111641 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>, Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172954066111641
          (code B ref 64055); Mon, 21 Oct 2024 19:58:01 +0000
Received: (at 64055) by debbugs.gnu.org; 21 Oct 2024 19:57:41 +0000
Received: from localhost ([127.0.0.1]:53418 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2yX6-00031g-MI
	for submit <at> debbugs.gnu.org; Mon, 21 Oct 2024 15:57:40 -0400
Received: from forward501b.mail.yandex.net ([178.154.239.145]:60552)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dgutov@HIDDEN>) id 1t2yX3-00031U-Tu
 for 64055 <at> debbugs.gnu.org; Mon, 21 Oct 2024 15:57:38 -0400
Received: from mail-nwsmtp-smtp-production-canary-88.sas.yp-c.yandex.net
 (mail-nwsmtp-smtp-production-canary-88.sas.yp-c.yandex.net
 [IPv6:2a02:6b8:c23:4c0c:0:640:5ee9:0])
 by forward501b.mail.yandex.net (Yandex) with ESMTPS id CCDFF61526;
 Mon, 21 Oct 2024 22:56:38 +0300 (MSK)
Received: by mail-nwsmtp-smtp-production-canary-88.sas.yp-c.yandex.net
 (smtp/Yandex) with ESMTPSA id ZuXZ673IZqM0-WQDDaRoR; 
 Mon, 21 Oct 2024 22:56:38 +0300
X-Yandex-Fwd: 1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail;
 t=1729540598; bh=w17lUHAkRFekoqy++xzSUXnWpoawXuRMTtSe51n1dd8=;
 h=In-Reply-To:From:Subject:Message-ID:Cc:References:Date:To;
 b=MefrXWqNXWLZYHs+cpPC4/U/Rmpo9g/LOFtCdReRqKWK+z05dddlyaonQaRk9fZR8
 5GGSymzS+IvIJiot7GsvdV73ORUo09zNNCc+BADbUMbpCumplnuqLFk1x1Hb5SPj1h
 lBqlzCECPZL6xhkeDVJOm2Z6zFdyUmA0C1wAeK88=
Authentication-Results: mail-nwsmtp-smtp-production-canary-88.sas.yp-c.yandex.net;
 dkim=pass header.i=@yandex.ru
Received: from phl-compute-11.internal (phl-compute-11.phl.internal
 [10.202.2.51])
 by mailfauth.phl.internal (Postfix) with ESMTP id 4B4761200043;
 Mon, 21 Oct 2024 15:56:35 -0400 (EDT)
Received: from phl-mailfrontend-02 ([10.202.2.163])
 by phl-compute-11.internal (MEProxy); Mon, 21 Oct 2024 15:56:35 -0400
X-ME-Sender: <xms:87EWZ7q8MmizEzsm6g3h1joloWpniXBvGJN4kRH8Na3W1KHhD-_jww>
 <xme:87EWZ1qTl4Jh18A6z3rVWw1gk8XyvkfuM75mJ125mitiAbmDKRnXJYsKIsrZtzqpz
 c73L7QZQmfAUB2ZIyo>
X-ME-Received: <xmr:87EWZ4PxRKNDaG9Lm_CxW_61XKz5cE0nZ6btrWx7rO9FPWGtmgpS81_k2CVoqVpCfnNv>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehledgudeggecutefuodetggdotefrod
 ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp
 uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg
 hnthhsucdlqddutddtmdenucfjughrpefkffggfgfuvfevfhfhjggtgfesthejredttddv
 jeenucfhrhhomhepffhmihhtrhihucfiuhhtohhvuceoughguhhtohhvseihrghnuggvgi
 drrhhuqeenucggtffrrghtthgvrhhnpeeihfejueevteffffdvfeetffffkefhuedujeei
 heehiedulefghefgffefudffudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh
 epmhgrihhlfhhrohhmpegughhuthhovhdomhgvshhmthhprghuthhhphgvrhhsohhnrghl
 ihhthidqudeffeefleelheehvddqvdelgeejjeejjeeiqdgughhuthhovheppeihrghnug
 gvgidrrhhusehfrghsthhmrghilhdrtghomhdpnhgspghrtghpthhtohepgedpmhhouggv
 pehsmhhtphhouhhtpdhrtghpthhtohepshhpfihhihhtthhonhesshhpfihhihhtthhonh
 drnhgrmhgvpdhrtghpthhtohepvghlihiisehgnhhurdhorhhgpdhrtghpthhtohepmhho
 rhhgrghnrdhjrdhsmhhithhhsehouhhtlhhoohhkrdgtohhmpdhrtghpthhtohepieegtd
 ehheesuggvsggsuhhgshdrghhnuhdrohhrgh
X-ME-Proxy: <xmx:87EWZ-7y_fiwxS6vzMvqS6aHCb4XSDu_yi9D0BOli3RJcmMwlizZXw>
 <xmx:87EWZ64HDsCyvkxXy75PCzf9s-lMCcnrE5NmapWAYphRFh3wX0-7Pg>
 <xmx:87EWZ2g1Ltr3T0Z2dpusYjDKhZ54QeKqeT3vMd_1G49x2YBgQabjHw>
 <xmx:87EWZ86-JUgHaPctOCcs-Z1JWWBpW4FRDOChtPOQKzdU1i5pmSlVMA>
 <xmx:87EWZ5IeGDRuxp3HQgLwccayHAad5osBBUdkXVw87SF-DwKvLDyFREw0>
Feedback-ID: ib1d9465d:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon,
 21 Oct 2024 15:56:33 -0400 (EDT)
Message-ID: <1e0c5ef6-50cb-46b1-bd3f-ce3b98514257@HIDDEN>
Date: Mon, 21 Oct 2024 20:56:31 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN>
 <96d49abc-888b-4561-b57d-8d85627e2c42@HIDDEN>
 <87h696kydj.fsf@HIDDEN> <86wmi2ggko.fsf@HIDDEN>
 <87cyjuj9ds.fsf@HIDDEN>
Content-Language: en-US
From: Dmitry Gutov <dgutov@HIDDEN>
In-Reply-To: <87cyjuj9ds.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

On 21/10/2024 08:46, Sean Whitton wrote:
> On Mon 21 Oct 2024 at 08:39am +03, Eli Zaretskii wrote:
> 
>> Which aspects of "rewriting history" you consider Git-specific?  I
>> think any dVCS has the same issues with that, and supports similar
>> workflows, so the concept is relevant to all of them.
> Mainly the terminology.
> 
> If others think it is fine to go ahead and call the defcustom
> vc-allow-rewriting-history, I am happy to do so.

Speaking of Git terminology, "rewriting history" can refer to both 
rewriting published commits (often frowned upon) and rewriting local 
history (can be fine and is often encouraged). The proposed name seems 
to conflate the two (although the docstring does clarify that it's 
referring to the former).

In practice, this also often depends on the upstream branch - e.g. a 
branch "feature/xyz" worked on a single developer might be fine with 
force-pushes.

I guess my point was we could do with only a prompt warning the user 
that the published history will be rewritten (proceeding on if they 
agree). Showing an error is a safer choice, but I suppose then the error 
message could reference the option to customize.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Dmitry Gutov <dgutov@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Mon, 21 Oct 2024 20:10:01 +0000
Resent-Message-ID: <handler.64055.B64055.172954138713644 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>, Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172954138713644
          (code B ref 64055); Mon, 21 Oct 2024 20:10:01 +0000
Received: (at 64055) by debbugs.gnu.org; 21 Oct 2024 20:09:47 +0000
Received: from localhost ([127.0.0.1]:53428 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t2yio-0003Xz-WE
	for submit <at> debbugs.gnu.org; Mon, 21 Oct 2024 16:09:47 -0400
Received: from forward502a.mail.yandex.net ([178.154.239.82]:53816)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dgutov@HIDDEN>) id 1t2yim-0003Xp-1C
 for 64055 <at> debbugs.gnu.org; Mon, 21 Oct 2024 16:09:45 -0400
Received: from mail-nwsmtp-smtp-production-main-39.vla.yp-c.yandex.net
 (mail-nwsmtp-smtp-production-main-39.vla.yp-c.yandex.net
 [IPv6:2a02:6b8:c15:2b05:0:640:2a62:0])
 by forward502a.mail.yandex.net (Yandex) with ESMTPS id 0F4E0613D6;
 Mon, 21 Oct 2024 23:08:46 +0300 (MSK)
Received: by mail-nwsmtp-smtp-production-main-39.vla.yp-c.yandex.net
 (smtp/Yandex) with ESMTPSA id h8YbKA3b2mI0-qbSP84yf; 
 Mon, 21 Oct 2024 23:08:45 +0300
X-Yandex-Fwd: 1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail;
 t=1729541325; bh=zpEoMgG+b8mFegRxA9hWyXhgQiQHPqcsFed8wLUO0rU=;
 h=In-Reply-To:From:Subject:Message-ID:Cc:References:Date:To;
 b=Jekv0ibWN4LxqEmqUGttipydyJuOzN8WOTRq284oQmjvN940IP2IDjxdBTq//8Jqj
 zlhw8XEH5b/pffp48gGfs909hRT+vfcE4uGuWUUVqHCB5ROhCeu6mh0/KSoxEsrbet
 mrMfvhKqKvE2vBBoOMcYbnBSU4ae0+a7i0wUeTu4=
Authentication-Results: mail-nwsmtp-smtp-production-main-39.vla.yp-c.yandex.net;
 dkim=pass header.i=@yandex.ru
Received: from phl-compute-09.internal (phl-compute-09.phl.internal
 [10.202.2.49])
 by mailfauth.phl.internal (Postfix) with ESMTP id D85D3120006D;
 Mon, 21 Oct 2024 16:08:42 -0400 (EDT)
Received: from phl-mailfrontend-02 ([10.202.2.163])
 by phl-compute-09.internal (MEProxy); Mon, 21 Oct 2024 16:08:42 -0400
X-ME-Sender: <xms:yrQWZ6Wo1ex-gYyLBEdzI7zDHWE5U-brH7qqSf3ApRSWpTIKGCwmKQ>
 <xme:yrQWZ2koj6JrtyHIRUCqj739-v4PtaHUiWixUywqu-dD1XW3z9xAWMxAU9jHHfsop
 E9a8BD9uaEltpusP7c>
X-ME-Received: <xmr:yrQWZ-bibhumzZKmHhQxITiL-1Qkzv7hYNhrMzvXiULwXfHVSSunBfpPY9SVU0PMuV_I>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehledgudegiecutefuodetggdotefrod
 ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp
 uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg
 hnthhsucdlqddutddtmdenucfjughrpefkffggfgfuvfevfhfhjggtgfesthejredttddv
 jeenucfhrhhomhepffhmihhtrhihucfiuhhtohhvuceoughguhhtohhvseihrghnuggvgi
 drrhhuqeenucggtffrrghtthgvrhhnpeeihfejueevteffffdvfeetffffkefhuedujeei
 heehiedulefghefgffefudffudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh
 epmhgrihhlfhhrohhmpegughhuthhovhdomhgvshhmthhprghuthhhphgvrhhsohhnrghl
 ihhthidqudeffeefleelheehvddqvdelgeejjeejjeeiqdgughhuthhovheppeihrghnug
 gvgidrrhhusehfrghsthhmrghilhdrtghomhdpnhgspghrtghpthhtohepgedpmhhouggv
 pehsmhhtphhouhhtpdhrtghpthhtohepshhpfihhihhtthhonhesshhpfihhihhtthhonh
 drnhgrmhgvpdhrtghpthhtohepvghlihiisehgnhhurdhorhhgpdhrtghpthhtohepmhho
 rhhgrghnrdhjrdhsmhhithhhsehouhhtlhhoohhkrdgtohhmpdhrtghpthhtohepieegtd
 ehheesuggvsggsuhhgshdrghhnuhdrohhrgh
X-ME-Proxy: <xmx:yrQWZxWs_DJvZcvZ9YVEJi1s1rQJJJyLnKBkfaunTKNT8dJyFUq2nw>
 <xmx:yrQWZ0nnz837AKAbZA8QXrf41G_1tg1GxQSZx81Xr4kOTVqxlop-og>
 <xmx:yrQWZ2esg3F6wEG5X5p7QGjErw5LqItPKcd9UIVO4DL86m9tR4IdAA>
 <xmx:yrQWZ2GDhlV0htxFg6gnKKIcdOaRNBHUUdEBDOstgNfTSzr6TeeQjw>
 <xmx:yrQWZynja4hRUs_x_7-zZBmIGhzQDvtr6vvJOM6jWrwlyuEtvUWtg9Lv>
Feedback-ID: ib1d9465d:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon,
 21 Oct 2024 16:08:40 -0400 (EDT)
Message-ID: <5514e870-3766-4070-838a-e92495c1da55@HIDDEN>
Date: Mon, 21 Oct 2024 21:08:37 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN>
Content-Language: en-US
From: Dmitry Gutov <dgutov@HIDDEN>
In-Reply-To: <87bjzfuzaq.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

On 20/10/2024 08:19, Sean Whitton wrote:
> +         (nothing-staged
> +          (zerop
> +           (vc-git-command nil t nil "diff" "--cached" "--quiet"))))

Testing it a little more, this seems insufficient because rebase aborts 
on non-staged changes too. This seems to cover both cases:

          (no-changes
           (zerop
            (vc-git-command nil t nil "diff" "HEAD" "--quiet"))))

Regarding the command's latency it seems to be distributed like this in 
my current example:

allowed rewrite?
Elapsed time: 0.028043s
stash push maybe
Elapsed time: 0.072001s
rebase autosquash
Elapsed time: 0.047211s
stash pop
Elapsed time: 0.032561s

So all steps are somewhat expensive, but stashing is #1 in that. Overall 
it seems fine, not a problem for the interactive command.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Tue, 22 Oct 2024 08:27:02 +0000
Resent-Message-ID: <handler.64055.B64055.172958559921236 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172958559921236
          (code B ref 64055); Tue, 22 Oct 2024 08:27:02 +0000
Received: (at 64055) by debbugs.gnu.org; 22 Oct 2024 08:26:39 +0000
Received: from localhost ([127.0.0.1]:54549 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t3ADs-0005WM-2k
	for submit <at> debbugs.gnu.org; Tue, 22 Oct 2024 04:26:39 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:53148)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t3ADn-0005W4-7b
 for 64055 <at> debbugs.gnu.org; Tue, 22 Oct 2024 04:26:35 -0400
DKIM-Signature: a=rsa-sha256;
 b=ELH8PXJ9jOYF3FCqhO+nHpyN0gN/HNrUrRzSG/KLjScH7aiwPWKK6kDW9ClrP0ABU/3QJ9yS3YjPTAcb4LXn2vaEfYx6xlzd1xr1zE+VWYRpHEUYcOd5SIXa1ctS6hjkCykp3LUQwEuqDUGIYyY6QLA7X3jT81lEbgGa5iSZuTNBEhgZ0PlSvwNdbF2r5BICICPp00dbIq/i3h2mB2iGHUg5mCU8jp5ixgqtRuBxUFo1xszpC2xpKUr6j7ESuKE4qV2o6uI0OF4mGjwrAIVfDSpGJqPQUgDcQDRA0U474VJjrnTyGbnNxnjG0+bZ1Yjqcckm7BLETfKSnsBwEt7r/A==;
 s=purelymail2; d=spwhitton.name; v=1;
 bh=nBm3anQ0fVhO1hv9lEsZqjV/49EFq5VYhQe3oYV0eNE=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=Ky84kHn2pnRF4mTari6E9jgNGfR9NKlsgpy5qp0+BCVram+DSNjKETkKybjQGv0DEFykZ4MATIP3h/ggDabxw6+DDLWbExMhH/DFoxii6/PRXlzW0O5Kci0vNVJf2wJI7FjDXJbzY22KYODZj8hYzW4RKAvPS6LMAvn2KWj9njRCVyGcU3MiHNlp/N3OB/uiItnl4agPENM9kOVR2/6/tJYaHaHmKP3lym8T0dIEU45ps3ERMKHVav1kMDT32I8fYuMGV+6tcXwY97xQ5t7WyANI0opKQcpy2/gHKBjBWQ1yIgEKnmDUC8xDWVL51yNaqFUe/aKb5beQHqX+x9p6dg==;
 s=purelymail2; d=purelymail.com; v=1;
 bh=nBm3anQ0fVhO1hv9lEsZqjV/49EFq5VYhQe3oYV0eNE=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -1151163291; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Tue, 22 Oct 2024 08:25:56 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 675BC7EAD05; Tue, 22 Oct 2024 16:25:52 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <86a5exh8ib.fsf@HIDDEN> (Eli Zaretskii's message of "Mon, 21 Oct
 2024 16:48:28 +0300")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
 <871q0brvyj.fsf@HIDDEN> <8634krjfmo.fsf@HIDDEN>
 <87bjzfqg7d.fsf@HIDDEN>
 <878qujp0mq.fsf@HIDDEN> <86y12jhva6.fsf@HIDDEN>
 <87o73eor6j.fsf@HIDDEN> <86r08aj2yz.fsf@HIDDEN>
 <87wmi2kyt9.fsf@HIDDEN> <86a5exh8ib.fsf@HIDDEN>
Date: Tue, 22 Oct 2024 16:25:52 +0800
Message-ID: <87y12gfsrz.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

Thanks for trying the manual rebase.

On Mon 21 Oct 2024 at 04:48pm +03, Eli Zaretskii wrote:

> But let me describe what I did and saw, to make sure I did it
> correctly.
>
>>     git rebase --autosquash -i REV~1
>>=20
>> where REV is the sha1 of the commit whose message you intend to edit.
>
> At this point "git log" shows a revision with my amended log message
> (let's call this AMENDED-REV), followed by the revision with the
> original log message (let's call it ORIG-REV).  So my Git command
> looks like this:
>
>   git rebase --autosquash -i ORIG-REV~1
>
> After this step, I see this in the editor (where I indented the text
> by 2 columns):
>
>   pick bf73d7e Foobar with some Unicode =D7=90=D7=91=D7=92=D7=93 =C4=85 =
=C4=9B =C4=8D
>   # pick bc3c567b2b136d040fd13373b6594c1ec026fec6 Foobar with some Unicod=
e =D7=90=D7=91=D7=92=D7=93 =C4=85 =C4=9B =C4=8D

There are two things about this output that are unexpected to me:

- The first line of the AMENDED-REV message does not appear to start
  with "amend!".  I thought that you confirmed in a previous message
  that the commit messsage of AMENDED-REV did have this structure:

    amend! <ORIG-REV sha1>

    <AMENDED-REV amended message>

- The line for the AMENDED-REV message is commented out.  That means
  that git-rebase proposes to drop the commit.  I would guess that git
  wants to drop it because it introduces no content changes.

> Does this mean it didn't work? or did I misinterpret the steps?

I think that there are two possibilities.  If you lost the magic
"amend!" commit then please try again with an AMENDED-REV whose commit
message has the special "amend!" structure.

You can create one manually by passing --allow-empty to git-commit, or
you can use the previous version of my patch with everything except the
call to git-commit commented out -- here's the diff doing the
commenting-out again, if you need it.

On the other hand, if your AMENDED-REV does have the special "amend!"
structure, then I think we have to conclude that the older Git you have
does not support these special "amend!" commits at all, and so we can't
support it for log-view-modify-change-comment.

--8<---------------cut here---------------start------------->8---
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 59d5386bc72..d2ada63f71e 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -2042,8 +2042,8 @@ vc-git-modify-change-comment
     ;;     % git commit --allow-empty -m...
     ;;     % git rebase --autosquash -i REV~1
     ;;     % git stash pop
-    (unless nothing-staged
-      (vc-git-command nil 0 nil "stash" "push"))
+    ;; (unless nothing-staged
+    ;;   (vc-git-command nil 0 nil "stash" "push"))
     (unwind-protect
         (progn
           (when (cl-intersection '("--author" "--date") args
@@ -2064,12 +2064,15 @@ vc-git-modify-change-comment
                           (list "-m" message))
                         args)))
       (when (and msg-file (file-exists-p msg-file))
-        (delete-file msg-file)))
-    (with-environment-variables (("GIT_SEQUENCE_EDITOR" "true"))
-      (vc-git-command nil 0 nil "rebase" "--autosquash" "-i"
-                      (format "%s~1" rev)))
-    (unless nothing-staged
-      (vc-git-command nil 0 nil "stash" "pop" "--index"))))
+        ;; (delete-file msg-file)
+        ))
+    ;; (with-environment-variables (("GIT_SEQUENCE_EDITOR" "true"))
+    ;;   (vc-git-command nil 0 nil "rebase" "--autosquash" "-i"
+    ;;                   (format "%s~1" rev)))
+    ;; (unless nothing-staged
+    ;;   (vc-git-command nil 0 nil "stash" "pop" "--index"))
+    (message "temporary file is: %s" msg-file)
+    ))

 (defvar vc-git-extra-menu-map
   (let ((map (make-sparse-keymap)))
--8<---------------cut here---------------end--------------->8---

--=20
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Tue, 22 Oct 2024 08:31:01 +0000
Resent-Message-ID: <handler.64055.B64055.172958580721636 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Dmitry Gutov <dgutov@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, Eli Zaretskii <eliz@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172958580721636
          (code B ref 64055); Tue, 22 Oct 2024 08:31:01 +0000
Received: (at 64055) by debbugs.gnu.org; 22 Oct 2024 08:30:07 +0000
Received: from localhost ([127.0.0.1]:54555 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t3AHH-0005cu-0R
	for submit <at> debbugs.gnu.org; Tue, 22 Oct 2024 04:30:07 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:53916)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t3AHE-0005bt-SR
 for 64055 <at> debbugs.gnu.org; Tue, 22 Oct 2024 04:30:05 -0400
DKIM-Signature: a=rsa-sha256;
 b=L+mHzqVjt0M2KxcdDZMDtYayyNQ+TFO8JVeGrdw9qT6+0j1yfn6rkMQGSeibZsgcDls3i5HlhruKHMqxq+fId0DLJ70hVs37oUlrgAUZ7g12norQV0EBLBSbxjZu519QSmpQaRsOoSsnA27Yxvpa+AUSdCmbLZE5Yz+juSx+XwTkym/LLJHLOJmGnS7L5dOWehJKPt3ZhMw3nunjV5K2xkOtZzU3mfnY4WbdZ2uikd8T0oiyrMSS8OQI/2dPmmQordyjXh83yLLgWzVaYgCALHVW8SzslSWwy9tM0NXOZ+5m5sYGInvqpssOJTldnsh5Ql2x5+D84oaiqhjpD5SAmw==;
 s=purelymail2; d=spwhitton.name; v=1;
 bh=D0SI7xy7ZIUj+RivIUZ7dlR1ehugZOcOJiDIHAIpVMA=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=Z3cysI2xyLiwGopWnaGR6FyDkyXbZO2v29/5BkHZMmYpNDVEYnryTq5i/Wk5q9MWz+aSWwmYrXaTtgTL2G2ss2Ib/I/ek/Pfx7g+tTBUX/U8SsFKzivIHEguC1yypzOWZpgDtGVONow71IPKRIAH5XbA4w9eQUHsxVdBQ1b9hr3Bz2RFz4gSzvz/C/HFbEU8P9e0SWAY9zj/FjJGtBPy444V08ztmq3osHNOlGvw9a/30xBimbF4z8dPnTScCpHX5viHuzhzSxsx5bkV+wUw//cuvjhZ+gGamHF4xzXtb4t5xfe8fn/Nq6fe2h7nCFCoRGWGoBPlXbTvwarPq8E4LA==;
 s=purelymail2; d=purelymail.com; v=1;
 bh=D0SI7xy7ZIUj+RivIUZ7dlR1ehugZOcOJiDIHAIpVMA=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1149823580; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Tue, 22 Oct 2024 08:29:31 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id D3BCC7EAD05; Tue, 22 Oct 2024 16:29:28 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <1e0c5ef6-50cb-46b1-bd3f-ce3b98514257@HIDDEN> (Dmitry Gutov's
 message of "Mon, 21 Oct 2024 20:56:31 +0100")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN>
 <96d49abc-888b-4561-b57d-8d85627e2c42@HIDDEN>
 <87h696kydj.fsf@HIDDEN> <86wmi2ggko.fsf@HIDDEN>
 <87cyjuj9ds.fsf@HIDDEN>
 <1e0c5ef6-50cb-46b1-bd3f-ce3b98514257@HIDDEN>
Date: Tue, 22 Oct 2024 16:29:28 +0800
Message-ID: <87ttd4fslz.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Mon 21 Oct 2024 at 08:56pm +01, Dmitry Gutov wrote:

> On 21/10/2024 08:46, Sean Whitton wrote:
>> On Mon 21 Oct 2024 at 08:39am +03, Eli Zaretskii wrote:
>>
>>> Which aspects of "rewriting history" you consider Git-specific?  I
>>> think any dVCS has the same issues with that, and supports similar
>>> workflows, so the concept is relevant to all of them.
>> Mainly the terminology.
>> If others think it is fine to go ahead and call the defcustom
>> vc-allow-rewriting-history, I am happy to do so.
>
> Speaking of Git terminology, "rewriting history" can refer to both rewriting
> published commits (often frowned upon) and rewriting local history (can be
> fine and is often encouraged). The proposed name seems to conflate the two
> (although the docstring does clarify that it's referring to the former).
>
> In practice, this also often depends on the upstream branch - e.g. a branch
> "feature/xyz" worked on a single developer might be fine with force-pushes.

Yeah.  I'll use vc-allow-rewriting-published-history.  It's not perfect
but it does a better job covering these various issues.

> I guess my point was we could do with only a prompt warning the user that the
> published history will be rewritten (proceeding on if they agree). Showing an
> error is a safer choice, but I suppose then the error message could reference
> the option to customize.

I think that's what's implemented, except for referencing the option
name, which I'll add, thanks.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Tue, 22 Oct 2024 08:32:02 +0000
Resent-Message-ID: <handler.64055.B64055.172958586922172 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Dmitry Gutov <dgutov@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, Eli Zaretskii <eliz@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172958586922172
          (code B ref 64055); Tue, 22 Oct 2024 08:32:02 +0000
Received: (at 64055) by debbugs.gnu.org; 22 Oct 2024 08:31:09 +0000
Received: from localhost ([127.0.0.1]:54564 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t3AIH-0005lY-G9
	for submit <at> debbugs.gnu.org; Tue, 22 Oct 2024 04:31:09 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:54150)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t3AIG-0005lK-55
 for 64055 <at> debbugs.gnu.org; Tue, 22 Oct 2024 04:31:08 -0400
DKIM-Signature: a=rsa-sha256;
 b=OBqvfsuaXA4ajVKdtr8uXQdmkqQFJ9TR+iTIwILjqWQXU0HTqQUCS48k6ItDmpNjI0uVIum0jOu/bb23KyP2bzbmzyOY5+0j8mtvdZXx80bpYCeLitrhQ/rtpK7eQnlmJzbk1LIjF90P4j+A0hstiHwM66E50udcWHe8+mdwNFCabQDjJ3eMiXwWba93+8tLdHt0r2Y1CYk87U6xBm/wzmmT0NMbgBzAO4ngAaTXZ0PQoQDOcJk8/lkovWXKrr9hmcGVmm8j31yqUlDdoKsdW3mD2ZJ2FKKEWiaIzYahyoGZ/hOOdWFfIXRYhBLmatxcKDpTNsWodqChbyrslF+npw==;
 s=purelymail2; d=spwhitton.name; v=1;
 bh=/cixLIR2WC379LmGsQrVNzH2059DqjQN2s4Ju5vlheg=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=QTIn4uuLwl6VCdcjKL9pDOoRTv8GbPHp0k0tXzlwmHENiI3aNPj4hAFUxd1WZZcH0LnJ/2Xd00KFn5drHRxZQsSSa42x8xygpScq68N9B+HnOmKewJ6WVc5+xDa2FrTmU0CoRLQY7AVIU+4dIdaquaCBMqbBKexYW1xfwzL56mOhbKtjeZqHt5dzjO23s5rv3N5nYtIsuPo/kPX/tvzs8hvT7B+pO8c4jJGF1lW4G4C5ok0skr6sXn9XGjUzxzTUZ62iCVEAgiFjLuQvrrOhe6EAtvjITAMiafz4Lb3KAcxHp4BddXWyvBUBjQrJ9GlYmOhB6XPV3uUe237tnZWxzQ==;
 s=purelymail2; d=purelymail.com; v=1;
 bh=/cixLIR2WC379LmGsQrVNzH2059DqjQN2s4Ju5vlheg=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1427495828; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Tue, 22 Oct 2024 08:30:34 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 530277EACFD; Tue, 22 Oct 2024 16:30:30 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <5514e870-3766-4070-838a-e92495c1da55@HIDDEN> (Dmitry Gutov's
 message of "Mon, 21 Oct 2024 21:08:37 +0100")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN>
 <5514e870-3766-4070-838a-e92495c1da55@HIDDEN>
Date: Tue, 22 Oct 2024 16:30:30 +0800
Message-ID: <87plnsfsk9.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Mon 21 Oct 2024 at 09:08pm +01, Dmitry Gutov wrote:

> On 20/10/2024 08:19, Sean Whitton wrote:
>> +         (nothing-staged
>> +          (zerop
>> +           (vc-git-command nil t nil "diff" "--cached" "--quiet"))))
>
> Testing it a little more, this seems insufficient because rebase aborts on
> non-staged changes too. This seems to cover both cases:
>
>          (no-changes
>           (zerop
>            (vc-git-command nil t nil "diff" "HEAD" "--quiet"))))

Thanks.  I forgot that --autostash covers that case already.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Tue, 22 Oct 2024 13:29:01 +0000
Resent-Message-ID: <handler.64055.B64055.172960373111677 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172960373111677
          (code B ref 64055); Tue, 22 Oct 2024 13:29:01 +0000
Received: (at 64055) by debbugs.gnu.org; 22 Oct 2024 13:28:51 +0000
Received: from localhost ([127.0.0.1]:55076 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t3EwN-00032G-4k
	for submit <at> debbugs.gnu.org; Tue, 22 Oct 2024 09:28:51 -0400
Received: from eggs.gnu.org ([209.51.188.92]:59882)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t3EwJ-00031z-GU
 for 64055 <at> debbugs.gnu.org; Tue, 22 Oct 2024 09:28:50 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t3Evl-0007Nm-OU; Tue, 22 Oct 2024 09:28:13 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From:
 Date; bh=gzzMNB8Gr/kinF8qO55QNVdzrCiR2wzgWIBc/2adYkU=; b=h02jq3DSphCMmnIVZHYq
 eTh2L2KpmJAfPQaSUJ0zaPD/34ozeQHS5NyXo5c1p1pPgwm9rfhTbGfpGxDJ3oejZOuyMKPTfttC9
 nnk10op2PES22P3cXv7EsK7SMJwfZ7QsZCSJvcC2PKjA8f80e32L68BkUGxedOkr//gpAPLYdZC8d
 /CFj5NZZor0gm23cv8nVzvyx7zPyWP62EdyAwIDWKqntOzLO/Y9OIKjdAxNfH/8FQo/IMsa+tWZQT
 PnNhn9crnOo4UxTjJ/vUcqM6Y8H0EUqyKAPHi7y4zdFoEQ/Rpn8mboEsq4rHLzwMI5pU5FHCI2TqC
 8ubTwUwQyVOpfg==;
Date: Tue, 22 Oct 2024 16:27:56 +0300
Message-Id: <86msiwfesj.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <87y12gfsrz.fsf@HIDDEN> (message from Sean
 Whitton on Tue, 22 Oct 2024 16:25:52 +0800)
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
 <871q0brvyj.fsf@HIDDEN> <8634krjfmo.fsf@HIDDEN>
 <87bjzfqg7d.fsf@HIDDEN>
 <878qujp0mq.fsf@HIDDEN> <86y12jhva6.fsf@HIDDEN>
 <87o73eor6j.fsf@HIDDEN> <86r08aj2yz.fsf@HIDDEN>
 <87wmi2kyt9.fsf@HIDDEN> <86a5exh8ib.fsf@HIDDEN>
 <87y12gfsrz.fsf@HIDDEN>
MIME-version: 1.0
Content-type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: 64055 <at> debbugs.gnu.org,  dgutov@HIDDEN,  Morgan.J.Smith@HIDDEN
> Date: Tue, 22 Oct 2024 16:25:52 +0800
> 
> > At this point "git log" shows a revision with my amended log message
> > (let's call this AMENDED-REV), followed by the revision with the
> > original log message (let's call it ORIG-REV).  So my Git command
> > looks like this:
> >
> >   git rebase --autosquash -i ORIG-REV~1
> >
> > After this step, I see this in the editor (where I indented the text
> > by 2 columns):
> >
> >   pick bf73d7e Foobar with some Unicode אבגד ą ě č
> >   # pick bc3c567b2b136d040fd13373b6594c1ec026fec6 Foobar with some Unicode אבגד ą ě č
> 
> There are two things about this output that are unexpected to me:
> 
> - The first line of the AMENDED-REV message does not appear to start
>   with "amend!".  I thought that you confirmed in a previous message
>   that the commit messsage of AMENDED-REV did have this structure:
> 
>     amend! <ORIG-REV sha1>
> 
>     <AMENDED-REV amended message>

It isn't there because you didn't tell me to include it.  The original
commit was lost when I tried to perform the steps the previous time,
so I had to reproduce it, and I used the last part of this step to
produce it:

> So, please use the debugging version of my patch to create the special
> "amend!" commit again, or use the one from yesterday if you still have
> it, or you could manually create it by passing --allow-empty to 'git
> commit'.

IOW, I "manually created it by passing --allow-empty to 'git commit'",
but since you didn't say what log message to give, I used just some
random text, and it didn't include "amend!".  If the log message I use
in this step must have some specific structure or content, please give
more detailed instructions.

> - The line for the AMENDED-REV message is commented out.  That means
>   that git-rebase proposes to drop the commit.  I would guess that git
>   wants to drop it because it introduces no content changes.
> 
> > Does this mean it didn't work? or did I misinterpret the steps?
> 
> I think that there are two possibilities.  If you lost the magic
> "amend!" commit then please try again with an AMENDED-REV whose commit
> message has the special "amend!" structure.

I will, once you give the detailed instructions for how to do it from
the shell prompt.

> You can create one manually by passing --allow-empty to git-commit, or
> you can use the previous version of my patch with everything except the
> call to git-commit commented out -- here's the diff doing the
> commenting-out again, if you need it.

The diff no longer applies to the current master.  And I prefer doing
that manually anyway.  So let's have those instructions in full
detail.

Thanks.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Tue, 22 Oct 2024 13:44:02 +0000
Resent-Message-ID: <handler.64055.B64055.172960459614222 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172960459614222
          (code B ref 64055); Tue, 22 Oct 2024 13:44:02 +0000
Received: (at 64055) by debbugs.gnu.org; 22 Oct 2024 13:43:16 +0000
Received: from localhost ([127.0.0.1]:55110 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t3FAK-0003hJ-5x
	for submit <at> debbugs.gnu.org; Tue, 22 Oct 2024 09:43:16 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:49182)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t3FAH-0003gz-2h
 for 64055 <at> debbugs.gnu.org; Tue, 22 Oct 2024 09:43:14 -0400
DKIM-Signature: a=rsa-sha256;
 b=QOFhF1LgRiu+W50hGmmjzVZEjY8iwcqK66xDCCBMt2JNupKDZ5ur6eix3Z+qVT0Se8esrZjPc7ThJcRCXgWBnXTtNQPAG0e4C7lkiVTAHXuCAbe89z03ROMwRKUTjYtcTPLnjxBTzKKguZZ5tzz1uhOkmOF+n7kLKQB0Kp2ic8b3fTGokDKXDFCDe9czwyvPCs7/95Ly9RRnFcsov3bS/E0hNMbMB0mFPWgWvVKVXfFrb6I3T4tsJ4CFb0rJ7CC7hlaHnzESP6LcuRAX9zkO3ypcGc98xSag1T8YSgOiBHstxvKJsWne6//2zRZwbfp7orWsWFRoXzUEYLh3Z02/Hw==;
 s=purelymail2; d=spwhitton.name; v=1;
 bh=6BsaM6iAm+q7TbGNGrqM1ViCyh3gxMg76sGXN2Iw0o8=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=veGtrENPDyT+WMHI2+6nqStLVqY+i3wn6QloY6AbJSalLMRpIlfpNZl+B+ZEUbV+h1oZQpyRFoymE8hPGgLaWp4DDBphvDtSRb8f41W0l8d5EYUfqqpNCyZnRdm2fpRRiRtBhEO0Ia3MrrQJgrSZ/wBIXx6eqUah8Km0NFOVGDJSiQRPhnxp/j6OvgCwxkrywJPXlIBeY8UgTCoeG1jE4KZoRFeKkCxVo2GUIMiY9fwA0ms9/06EGVU2Mr7rz6GS2SZtW89Ta3gqHSak0LWL6WLBGVsFPdfpwvD88e4UDKoTkpYn4SqPpd+iM8KwUDJ11Zdtwk9FGmh28Dd7fWPHeA==;
 s=purelymail2; d=purelymail.com; v=1;
 bh=6BsaM6iAm+q7TbGNGrqM1ViCyh3gxMg76sGXN2Iw0o8=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 541473510; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Tue, 22 Oct 2024 13:42:37 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 1E2847EA4CA; Tue, 22 Oct 2024 21:42:33 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <86msiwfesj.fsf@HIDDEN> (Eli Zaretskii's message of "Tue, 22 Oct
 2024 16:27:56 +0300")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
 <871q0brvyj.fsf@HIDDEN> <8634krjfmo.fsf@HIDDEN>
 <87bjzfqg7d.fsf@HIDDEN>
 <878qujp0mq.fsf@HIDDEN> <86y12jhva6.fsf@HIDDEN>
 <87o73eor6j.fsf@HIDDEN> <86r08aj2yz.fsf@HIDDEN>
 <87wmi2kyt9.fsf@HIDDEN> <86a5exh8ib.fsf@HIDDEN>
 <87y12gfsrz.fsf@HIDDEN> <86msiwfesj.fsf@HIDDEN>
Date: Tue, 22 Oct 2024 21:42:33 +0800
Message-ID: <87a5ewckza.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Tue 22 Oct 2024 at 04:27pm +03, Eli Zaretskii wrote:

> It isn't there because you didn't tell me to include it.  The original
> commit was lost when I tried to perform the steps the previous time,
> so I had to reproduce it, and I used the last part of this step to
> produce it:
>
>> So, please use the debugging version of my patch to create the special
>> "amend!" commit again, or use the one from yesterday if you still have
>> it, or you could manually create it by passing --allow-empty to 'git
>> commit'.
>
> IOW, I "manually created it by passing --allow-empty to 'git commit'",
> but since you didn't say what log message to give, I used just some
> random text, and it didn't include "amend!".  If the log message I use
> in this step must have some specific structure or content, please give
> more detailed instructions.
> [...]
> The diff no longer applies to the current master.  And I prefer doing
> that manually anyway.  So let's have those instructions in full
> detail.

Okay, this should do it:

- Manually create a temporary file somewhere outside the repository;
  I'll refer to its absolute file name as TEMP.

- Put the commit message for ORIG-REV into the temporary file.

- Modify that commit message to include the Unicode, or whatever.

- Prepend "amend! <sha1 of ORIG-REV>\n\n".  So for example:

--8<---------------cut here---------------start------------->8---
amend! 212cf3125611b123707feac6f7ffd55a230bc568

Make all the entries in 'eshell-parse-argument-hook' named functions

* lisp/eshell/esh-arg.el (eshell-parse-number, eshell-parse-non-special)
(eshell-parse-whitespace, eshell-parse-comment): New functions...
(eshell-parse-argument-hook): ... use them.   =D7=90=D7=91=D7=92=D7=93 =C4=
=85 =C4=9B =C4=8D
--8<---------------cut here---------------end--------------->8---

- Save the temporary file.

- Ensure there are no staged changes.
  ('git reset' with no arguments should do it)

- git commit --allow-empty -F TEMP

- git rebase --autosquash -i ORIG-REV~1

--=20
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Tue, 22 Oct 2024 14:22:02 +0000
Resent-Message-ID: <handler.64055.B64055.172960688523061 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172960688523061
          (code B ref 64055); Tue, 22 Oct 2024 14:22:02 +0000
Received: (at 64055) by debbugs.gnu.org; 22 Oct 2024 14:21:25 +0000
Received: from localhost ([127.0.0.1]:56838 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t3FlE-0005zt-Uj
	for submit <at> debbugs.gnu.org; Tue, 22 Oct 2024 10:21:25 -0400
Received: from eggs.gnu.org ([209.51.188.92]:40732)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <eliz@HIDDEN>) id 1t3FlC-0005ze-29
 for 64055 <at> debbugs.gnu.org; Tue, 22 Oct 2024 10:21:23 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
 id 1t3Fkd-0005lk-LD; Tue, 22 Oct 2024 10:20:48 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From:
 Date; bh=Rcsysc3SrDST86WK3naaYe63DT74w1rkKe81YrVHHSg=; b=nfVVF2r/gGJ4tjTj/J22
 caisDGEXeRLxIFkj8T1QKy2QFoxx3Mvttrv2EwtBuhbKLW4hd7EkGo76/8Hmip5HGFv/n0maIBdGv
 wi+apEK9tRm3iK6MQJR/QGtzuFLTt6bcxUVuox9u53Ggg5SiyjtWwGOyCDJn9vpxqE+uYvAwCwSru
 nz+ySIc27dUJerzn73BL2AhrQIOk7xz7VKX6RmV1PZGVMd5jrw0zKFhT0UkT4U0E2iIPJsMUsONGT
 QH/4F+cyNLumXIep598qZ980PCqRj0LIYn9vCv/0lZcTnYxgEAUNyL7M5FIq0fYhlw/54UyUps9mA
 XQSV1UAyva7Vwg==;
Date: Tue, 22 Oct 2024 17:20:43 +0300
Message-Id: <86froofcck.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <87a5ewckza.fsf@HIDDEN> (message from Sean
 Whitton on Tue, 22 Oct 2024 21:42:33 +0800)
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
 <871q0brvyj.fsf@HIDDEN> <8634krjfmo.fsf@HIDDEN>
 <87bjzfqg7d.fsf@HIDDEN>
 <878qujp0mq.fsf@HIDDEN> <86y12jhva6.fsf@HIDDEN>
 <87o73eor6j.fsf@HIDDEN> <86r08aj2yz.fsf@HIDDEN>
 <87wmi2kyt9.fsf@HIDDEN> <86a5exh8ib.fsf@HIDDEN>
 <87y12gfsrz.fsf@HIDDEN> <86msiwfesj.fsf@HIDDEN>
 <87a5ewckza.fsf@HIDDEN>
MIME-version: 1.0
Content-type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

> From: Sean Whitton <spwhitton@HIDDEN>
> Cc: 64055 <at> debbugs.gnu.org,  dgutov@HIDDEN,  Morgan.J.Smith@HIDDEN
> Date: Tue, 22 Oct 2024 21:42:33 +0800
> 
> - Manually create a temporary file somewhere outside the repository;
>   I'll refer to its absolute file name as TEMP.
> 
> - Put the commit message for ORIG-REV into the temporary file.
> 
> - Modify that commit message to include the Unicode, or whatever.
> 
> - Prepend "amend! <sha1 of ORIG-REV>\n\n".  So for example:
> 
> --8<---------------cut here---------------start------------->8---
> amend! 212cf3125611b123707feac6f7ffd55a230bc568
> 
> Make all the entries in 'eshell-parse-argument-hook' named functions
> 
> * lisp/eshell/esh-arg.el (eshell-parse-number, eshell-parse-non-special)
> (eshell-parse-whitespace, eshell-parse-comment): New functions...
> (eshell-parse-argument-hook): ... use them.   אבגד ą ě č
> --8<---------------cut here---------------end--------------->8---
> 
> - Save the temporary file.
> 
> - Ensure there are no staged changes.
>   ('git reset' with no arguments should do it)
> 
> - git commit --allow-empty -F TEMP
> 
> - git rebase --autosquash -i ORIG-REV~1

This last step shows the following (again, indented 2 columns by me):

  pick bf73d7e Foobar with some Unicode אבגד ą ě č
  # pick d796890ee8cc77ac899954c3e94e5257c5f72615 amend! bf73d7e036c5d80cdd112f34255a0ab1ea697c07

  # Rebase 6c6ea73..d796890 onto 6c6ea73 (1 command)
  #
  # Commands:
  # p, pick = use commit
  # r, reword = use commit, but edit the commit message
  # e, edit = use commit, but stop for amending
  # s, squash = use commit, but meld into previous commit
  # f, fixup = like "squash", but discard this commit's log message
  # x, exec = run command (the rest of the line) using shell
  # d, drop = remove commit
  #
  # These lines can be re-ordered; they are executed from top to bottom.
  #
  # If you remove a line here THAT COMMIT WILL BE LOST.
  #
  # However, if you remove everything, the rebase will be aborted.
  #
  # Note that empty commits are commented out

And if I type "C-x #" to exit, without changing the above in any way
(since you didn't tell me to change anything), I'm back at ORIG-REV
with its original log message.  IOW, the editing of the commit log
message failed.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Tue, 22 Oct 2024 14:54:02 +0000
Resent-Message-ID: <handler.64055.B64055.172960880628595 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org, dgutov@HIDDEN
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172960880628595
          (code B ref 64055); Tue, 22 Oct 2024 14:54:02 +0000
Received: (at 64055) by debbugs.gnu.org; 22 Oct 2024 14:53:26 +0000
Received: from localhost ([127.0.0.1]:56889 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t3GGE-0007R8-Ac
	for submit <at> debbugs.gnu.org; Tue, 22 Oct 2024 10:53:26 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:46968)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t3GGC-0007Qw-4y
 for 64055 <at> debbugs.gnu.org; Tue, 22 Oct 2024 10:53:24 -0400
DKIM-Signature: a=rsa-sha256;
 b=Dwj+Y9CF1XHtAt+X1yvJypNNnF4ML7u56MW6aoyF4/hfTOrA27mYNF6+0X6LJ+dSFDZhOgXPZhZccqGDyUPfFx2pUx0wGNCF5IzzcZWcs/I480fILZcPws7mjDKRsQxiTohwfa1hoXLDUkVneagx0YkhbrV0eBuR4b+fjfcLjxPiN7fKeM2BXgrFmvze54VW6Ma9Aga6dWFeEzoD2aVPFaQHcimaarkP4bPp4kYT/Vqzfpwqv4mJCwD9hykKHV9cOdKR7OGHWs2MG9TX6LoZS4IBOoZIcoMIsI8ukiErtqyVDJ26V7U/5XDRQY8tHHnbHzdr8dGUwemWv1sj7+UZlw==;
 s=purelymail2; d=spwhitton.name; v=1;
 bh=gh2zRAH51pmJja4mkdCZZXAoVM68l/iftHjBDTJVthE=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=lcOC1q2CwzbVIaLgK/4FPosANeAslEf15i8Iv4uz69CJtEKASfxwbCmAqaok8rMtGYWOPBxP33pJG3gh99X8a3vNkH4LJ0L92NCMmU5M4FPOhSaeTpi8Va1dhq656Cb4BwBH1dqnbLoGOW6VRn2DeNanm07pTBXA8xXKBgNO84dya0PpDV5jiYkRJGlE/xqy9+BkGsOipi56SaZMu/L57/R2hAHLNJ+AGDo5w85HaSN4NJphHRKAOGHgpEZw0yt1MAWwpZn0dIWQMUSJ8clH/iSgsfv/4LchN6K+bilZDNqZTY6NbzRbRejvNAME9MgeuhnN92zdmv46QTn+1t73fw==;
 s=purelymail2; d=purelymail.com; v=1;
 bh=gh2zRAH51pmJja4mkdCZZXAoVM68l/iftHjBDTJVthE=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 106449661; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Tue, 22 Oct 2024 14:52:48 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 9A0947EACFD; Tue, 22 Oct 2024 22:52:44 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <86froofcck.fsf@HIDDEN> (Eli Zaretskii's message of "Tue, 22 Oct
 2024 17:20:43 +0300")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN> <867ca3jhsd.fsf@HIDDEN>
 <871q0brvyj.fsf@HIDDEN> <8634krjfmo.fsf@HIDDEN>
 <87bjzfqg7d.fsf@HIDDEN>
 <878qujp0mq.fsf@HIDDEN> <86y12jhva6.fsf@HIDDEN>
 <87o73eor6j.fsf@HIDDEN> <86r08aj2yz.fsf@HIDDEN>
 <87wmi2kyt9.fsf@HIDDEN> <86a5exh8ib.fsf@HIDDEN>
 <87y12gfsrz.fsf@HIDDEN> <86msiwfesj.fsf@HIDDEN>
 <87a5ewckza.fsf@HIDDEN> <86froofcck.fsf@HIDDEN>
Date: Tue, 22 Oct 2024 22:52:44 +0800
Message-ID: <87a5ewb35v.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Tue 22 Oct 2024 at 05:20pm +03, Eli Zaretskii wrote:

> This last step shows the following (again, indented 2 columns by me):
>
>   pick bf73d7e Foobar with some Unicode =D7=90=D7=91=D7=92=D7=93 =C4=85 =
=C4=9B =C4=8D
>   # pick d796890ee8cc77ac899954c3e94e5257c5f72615 amend!
> bf73d7e036c5d80cdd112f34255a0ab1ea697c07
>
>   # Rebase 6c6ea73..d796890 onto 6c6ea73 (1 command)
>   #
>   # Commands:
>   # p, pick =3D use commit
>   # r, reword =3D use commit, but edit the commit message
>   # e, edit =3D use commit, but stop for amending
>   # s, squash =3D use commit, but meld into previous commit
>   # f, fixup =3D like "squash", but discard this commit's log message
>   # x, exec =3D run command (the rest of the line) using shell
>   # d, drop =3D remove commit
>   #
>   # These lines can be re-ordered; they are executed from top to bottom.
>   #
>   # If you remove a line here THAT COMMIT WILL BE LOST.
>   #
>   # However, if you remove everything, the rebase will be aborted.
>   #
>   # Note that empty commits are commented out
>
> And if I type "C-x #" to exit, without changing the above in any way
> (since you didn't tell me to change anything), I'm back at ORIG-REV
> with its original log message.  IOW, the editing of the commit log
> message failed.

Thanks.  I think this concludes the testing on old Git on Windows.
There are two conclusions:

- the special handling for MS-Windows character encoding issues works

- the special handling for old Git cannot work, because the older Git
  doesn't recognise the "amend!" commits as special.

So, I'll restore the old sequence of git commands, move the defcustom
into vc.git and call it vc-allow-rewriting-published-history, and
install the change.  (It's late here, so, in the morning.)

--=20
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Dmitry Gutov <dgutov@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sat, 26 Oct 2024 02:00:02 +0000
Resent-Message-ID: <handler.64055.B64055.172990799523279 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>, Eli Zaretskii <eliz@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172990799523279
          (code B ref 64055); Sat, 26 Oct 2024 02:00:02 +0000
Received: (at 64055) by debbugs.gnu.org; 26 Oct 2024 01:59:55 +0000
Received: from localhost ([127.0.0.1]:39975 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t4W5q-00063O-PR
	for submit <at> debbugs.gnu.org; Fri, 25 Oct 2024 21:59:55 -0400
Received: from forward501b.mail.yandex.net ([178.154.239.145]:34440)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dgutov@HIDDEN>) id 1t4W5p-00063F-Av
 for 64055 <at> debbugs.gnu.org; Fri, 25 Oct 2024 21:59:53 -0400
Received: from mail-nwsmtp-smtp-production-main-22.iva.yp-c.yandex.net
 (mail-nwsmtp-smtp-production-main-22.iva.yp-c.yandex.net
 [IPv6:2a02:6b8:c0c:aa25:0:640:2ff9:0])
 by forward501b.mail.yandex.net (Yandex) with ESMTPS id 8071360DCE;
 Sat, 26 Oct 2024 04:58:49 +0300 (MSK)
Received: by mail-nwsmtp-smtp-production-main-22.iva.yp-c.yandex.net
 (smtp/Yandex) with ESMTPSA id kwKvDPC8PmI0-B1U5GZlt; 
 Sat, 26 Oct 2024 04:58:48 +0300
X-Yandex-Fwd: 1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail;
 t=1729907928; bh=dMMZLnt347reJTGM04+qakU/P1pHqqkfFn5ZKhn3Ef4=;
 h=In-Reply-To:From:Subject:Message-ID:Cc:References:Date:To;
 b=oNm4PyJBqtkfAisIIOd9eDh0vyjHW6y4HG/9J9NSyaOH5TsQxR1h9YKsPD6nTE1ez
 fx1I+Ck0aIWq/cHiMVlOiYSubldNrfqqmjdI4EHdYAefsbRmsljq0fMui9bGxwRX5q
 nOvFcp3KIr3jRrKthqNGyKtntAIxU6IxRrtuFyRg=
Authentication-Results: mail-nwsmtp-smtp-production-main-22.iva.yp-c.yandex.net;
 dkim=pass header.i=@yandex.ru
Received: from phl-compute-12.internal (phl-compute-12.phl.internal
 [10.202.2.52])
 by mailfauth.phl.internal (Postfix) with ESMTP id 1666B1200066;
 Fri, 25 Oct 2024 21:58:45 -0400 (EDT)
Received: from phl-mailfrontend-02 ([10.202.2.163])
 by phl-compute-12.internal (MEProxy); Fri, 25 Oct 2024 21:58:46 -0400
X-ME-Sender: <xms:1UwcZxx7Jo3sfDuwLEGT6dWKVAsjuonZgRdrwrFjvRBcBOB0aLX8YA>
 <xme:1UwcZxSvw7kYy85a_wwv9t7PO2B--C6Ngv3amla2T71qyIARZs2FuLOb9_JIMooOV
 gNYerXd8mFuZwj0-yE>
X-ME-Received: <xmr:1UwcZ7XbbZ3g_ESCpuFMojDih-vDrx5xePB6E1A-19p5wbzT-WOTfRVljDQQ94IaguPe>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdejfedghedvucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu
 rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh
 htshculddquddttddmnecujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtvdej
 necuhfhrohhmpeffmhhithhrhicuifhuthhovhcuoegughhuthhovheshigrnhguvgigrd
 hruheqnecuggftrfgrthhtvghrnhepiefhjeeuveetffffvdefteffffekhfeuudejieeh
 heeiudelgfehgffffeduffdunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe
 hmrghilhhfrhhomhepughguhhtohhvodhmvghsmhhtphgruhhthhhpvghrshhonhgrlhhi
 thihqddufeeffeelleehhedvqddvleegjeejjeejiedqughguhhtohhvpeephigrnhguvg
 igrdhruhesfhgrshhtmhgrihhlrdgtohhmpdhnsggprhgtphhtthhopeegpdhmohguvgep
 shhmthhpohhuthdprhgtphhtthhopehsphifhhhithhtohhnsehsphifhhhithhtohhnrd
 hnrghmvgdprhgtphhtthhopegvlhhiiiesghhnuhdrohhrghdprhgtphhtthhopehmohhr
 ghgrnhdrjhdrshhmihhthhesohhuthhlohhokhdrtghomhdprhgtphhtthhopeeigedthe
 ehseguvggssghughhsrdhgnhhurdhorhhg
X-ME-Proxy: <xmx:1UwcZziW6oABtxs5AOlAgFsDV4VsNqOZVcbYgX8yFN3bcC-zl_0jlg>
 <xmx:1UwcZzAKvO6t5JOotASXCWhSo87E7dUTWc5puXhEDZnD5BPPmfSV5Q>
 <xmx:1UwcZ8ISXhy3gs6txPqMeL0wUuKE6C5WyerrRABxrzz4KTa0bCi1Ag>
 <xmx:1UwcZyDaXZLMqfTUtCOXwr4Cd2TzgWWM1FYMtWy0VaZAeOipr_yn9g>
 <xmx:1UwcZ3xsH4I6hVUgZu7FtLBtsp_8SaAVuDiCn_m2HxBMDKoXHhYLV6YW>
Feedback-ID: ib1d9465d:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri,
 25 Oct 2024 21:58:44 -0400 (EDT)
Message-ID: <b6f7b5df-3203-48c8-8cc6-a1de4730b26e@HIDDEN>
Date: Sat, 26 Oct 2024 04:58:43 +0300
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN>
Content-Language: en-US
From: Dmitry Gutov <dgutov@HIDDEN>
In-Reply-To: <87bjzfuzaq.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hi Sean,

On 20/10/2024 08:19, Sean Whitton wrote:
> +Many Git commands can change your copy of published change history
> +without warning.  If VC commands detect that this could happen, they
> +will stop.  You can customize this variable to permit rewriting history
> +even though Emacs thinks it is dangerous.
> +
> +So far, this applies only to the 'log-view-modify-change-comment'
> +command.

Coming back to this text - do you think the first and the last sentences 
might mismatch? First we talk about "many Git commands", next sentence 
"VC commands", plural. And in the end we say this only applies to one.

Maybe we can rephrase it like this:

  Some VCS commands can change your copy of published change history
  without warning.  In VC we try to detect before that happens, and stop.
  You can customize this variable to permit rewriting history
  even though Emacs thinks it is dangerous.

  So far, this applies only to using 'e' from Log View mode for Git.

BTW, there is another existing command which can end up changing 
published history: 'vc-git-log-edit-toggle-amend'. I wonder what will be 
our plan for it. Maybe we just add the same check there.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sat, 26 Oct 2024 03:13:01 +0000
Resent-Message-ID: <handler.64055.B64055.17299123754744 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Dmitry Gutov <dgutov@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, Eli Zaretskii <eliz@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17299123754744
          (code B ref 64055); Sat, 26 Oct 2024 03:13:01 +0000
Received: (at 64055) by debbugs.gnu.org; 26 Oct 2024 03:12:55 +0000
Received: from localhost ([127.0.0.1]:40118 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t4XEV-0001ES-2Y
	for submit <at> debbugs.gnu.org; Fri, 25 Oct 2024 23:12:55 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:58962)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t4XER-0001E5-V5
 for 64055 <at> debbugs.gnu.org; Fri, 25 Oct 2024 23:12:53 -0400
DKIM-Signature: a=rsa-sha256;
 b=Ry4bcTF3XXRWyG2efLGe5eHqzRscU6+a2qBexfolYIIv5XcavublFwWVhzjmXvwHismnirEDkq6w5uOF6c8Bkwx1RE99bT6+tNxS3YBN5d8gTgUqTLliHToc9baRX4e58ARQTwKeS+KKxZY8MD4zuUba++31s3alByaOODQ6JYVHvnoIPTv8VdWhlohrz2C3TlEmv6mLWO0x04BEuNVZYWBGw2UeK/NY3DkOv/iKNAzvk76DTlOBVUHYU3L8Mu2f/SP+N6wd9w/j/6pmbDQqjtCS00Q+eCpOcIzUnbDDKaLztulDxmryclg1Y0p6WjWKq374JAG5jqn3co9qJXeFRg==;
 s=purelymail2; d=spwhitton.name; v=1;
 bh=L6Bd0OZh9UAtLCiN03Okue+HLpomjLCVrF83Ihnind4=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=AAOkgLDWRglrXRmaAGQNUHcYxsN/iuhPeid8VBHBmOjxXeeMExHAcDkoZb/j7yBpIej5qsHQFuwjo3S0G/JTsucb9lfPjj/lwPQvXwDAxItQwJQ90k6cS0XYBAH6f1aaUfJvaR1Zr7I3OruDt0ReDggpV8KRIT7ngbWz2pGPtKlslz1QcQShg1/IGHQ+/hRIJRWbpE70nS/dNbV8Hsjn7eQGzNEKUYDiaJc0Y2fI65HPnkYV3qdTnz4vg0BObHqcN8G5+ZZx2emkN/MGQuLP4FNDPu32sB+IgPuMSYukxSSOQc8eoEB70Zs7MnKQDosNa6xLK+loYWQDCpfkroGlLg==;
 s=purelymail2; d=purelymail.com; v=1;
 bh=L6Bd0OZh9UAtLCiN03Okue+HLpomjLCVrF83Ihnind4=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1131415463; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Sat, 26 Oct 2024 03:12:11 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 20A957E686B; Sat, 26 Oct 2024 11:12:08 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <b6f7b5df-3203-48c8-8cc6-a1de4730b26e@HIDDEN> (Dmitry Gutov's
 message of "Sat, 26 Oct 2024 04:58:43 +0300")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN>
 <b6f7b5df-3203-48c8-8cc6-a1de4730b26e@HIDDEN>
Date: Sat, 26 Oct 2024 11:12:08 +0800
Message-ID: <87a5err20n.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Sat 26 Oct 2024 at 04:58am +03, Dmitry Gutov wrote:

> Hi Sean,
>
> On 20/10/2024 08:19, Sean Whitton wrote:
>> +Many Git commands can change your copy of published change history
>> +without warning.  If VC commands detect that this could happen, they
>> +will stop.  You can customize this variable to permit rewriting history
>> +even though Emacs thinks it is dangerous.
>> +
>> +So far, this applies only to the 'log-view-modify-change-comment'
>> +command.
>
> Coming back to this text - do you think the first and the last sentences might
> mismatch? First we talk about "many Git commands", next sentence "VC
> commands", plural. And in the end we say this only applies to one.
>
> Maybe we can rephrase it like this:
>
>  Some VCS commands can change your copy of published change history
>  without warning.  In VC we try to detect before that happens, and stop.
>  You can customize this variable to permit rewriting history
>  even though Emacs thinks it is dangerous.
>
>  So far, this applies only to using 'e' from Log View mode for Git.

Whether or not there is a strict mismatch, I like your new text more.
Please install it.

> BTW, there is another existing command which can end up changing
> published history: 'vc-git-log-edit-toggle-amend'. I wonder what will
> be our plan for it. Maybe we just add the same check there.

Thanks for reminding me about this.  Yes, I think it should be fine to
just add (vc-git--assert-allowed-rewrite "HEAD") or similar.  Would you
like to do it along with your NEWS change?  I guess, then, dropping the
"So far ..." sentence.

-- 
Sean Whitton

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Dmitry Gutov <dgutov@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 27 Oct 2024 01:06:02 +0000
Resent-Message-ID: <handler.64055.B64055.172999115719858 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Sean Whitton <spwhitton@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, Eli Zaretskii <eliz@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.172999115719858
          (code B ref 64055); Sun, 27 Oct 2024 01:06:02 +0000
Received: (at 64055) by debbugs.gnu.org; 27 Oct 2024 01:05:57 +0000
Received: from localhost ([127.0.0.1]:43303 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t4rjA-0005AE-CP
	for submit <at> debbugs.gnu.org; Sat, 26 Oct 2024 21:05:56 -0400
Received: from forward500d.mail.yandex.net ([178.154.239.208]:34292)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <dgutov@HIDDEN>) id 1t4rj7-00059x-Ah
 for 64055 <at> debbugs.gnu.org; Sat, 26 Oct 2024 21:05:55 -0400
Received: from mail-nwsmtp-smtp-production-main-45.klg.yp-c.yandex.net
 (mail-nwsmtp-smtp-production-main-45.klg.yp-c.yandex.net
 [IPv6:2a02:6b8:c42:37a1:0:640:203:0])
 by forward500d.mail.yandex.net (Yandex) with ESMTPS id 697FE60F3C;
 Sun, 27 Oct 2024 04:05:16 +0300 (MSK)
Received: by mail-nwsmtp-smtp-production-main-45.klg.yp-c.yandex.net
 (smtp/Yandex) with ESMTPSA id D5L4BMSX1Gk0-6X6vlFL1; 
 Sun, 27 Oct 2024 04:05:15 +0300
X-Yandex-Fwd: 1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail;
 t=1729991115; bh=0w33jNuQnaa8tpnval0D9ZIGgIratuNqEzzj6knfbPk=;
 h=In-Reply-To:From:Subject:Message-ID:Cc:References:Date:To;
 b=Tf90sGM1u0fxikhpgoWSwKhvw8AmaQDvjptyazSScTeD+8UBA1TKqyMgxLLes/EXR
 uujmuunfTjK7qF7QGBHNoNDaegbZS0emvv7QoYKUcjpagpQIpT0/rmONCxevOJIlz2
 wD8jWDzHj6LXnzMuw3fJg6wk/Hwzwd8FUb0h5UJ0=
Authentication-Results: mail-nwsmtp-smtp-production-main-45.klg.yp-c.yandex.net;
 dkim=pass header.i=@yandex.ru
Received: from phl-compute-07.internal (phl-compute-07.phl.internal
 [10.202.2.47])
 by mailfauth.phl.internal (Postfix) with ESMTP id 46100120007E;
 Sat, 26 Oct 2024 21:05:13 -0400 (EDT)
Received: from phl-mailfrontend-01 ([10.202.2.162])
 by phl-compute-07.internal (MEProxy); Sat, 26 Oct 2024 21:05:13 -0400
X-ME-Sender: <xms:yZEdZ29tU4PvKjdiwOC03yGsWsWQFcTPF0JfFpItUlSF8TWWdxOnrA>
 <xme:yZEdZ2tuIUuE2_1s0H03G3rW07bpSaxa-EFEvV-VZK49HM-ttX9RuWwSztaSLZth3
 RwtEndwSPySo1zNxDc>
X-ME-Received: <xmr:yZEdZ8B9dJLDz2CqtkjM_peEmIi_NYn6BvVw1su94ROY7ES6xMEkcLD9ETjcL6z5CLkc>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdejhedggedvucetufdoteggodetrfdotf
 fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu
 rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh
 htshculddquddttddmnecujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtvdej
 necuhfhrohhmpeffmhhithhrhicuifhuthhovhcuoegughhuthhovheshigrnhguvgigrd
 hruheqnecuggftrfgrthhtvghrnhepiefhjeeuveetffffvdefteffffekhfeuudejieeh
 heeiudelgfehgffffeduffdunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe
 hmrghilhhfrhhomhepughguhhtohhvodhmvghsmhhtphgruhhthhhpvghrshhonhgrlhhi
 thihqddufeeffeelleehhedvqddvleegjeejjeejiedqughguhhtohhvpeephigrnhguvg
 igrdhruhesfhgrshhtmhgrihhlrdgtohhmpdhnsggprhgtphhtthhopeegpdhmohguvgep
 shhmthhpohhuthdprhgtphhtthhopehsphifhhhithhtohhnsehsphifhhhithhtohhnrd
 hnrghmvgdprhgtphhtthhopehmohhrghgrnhdrjhdrshhmihhthhesohhuthhlohhokhdr
 tghomhdprhgtphhtthhopegvlhhiiiesghhnuhdrohhrghdprhgtphhtthhopeeigedthe
 ehseguvggssghughhsrdhgnhhurdhorhhg
X-ME-Proxy: <xmx:yZEdZ-d2d7Y_Qgi-k0bKMI89yz4kh4eXCGQW5_5vpaCt7oyNDT4iaQ>
 <xmx:yZEdZ7Pu6DBxWgvf2CXmyX3rf-5HQrMk5m-1bPGa1VzfnxiOcvsv3A>
 <xmx:yZEdZ4kQjeFyXUfut0lK9HZF6r4rvNXXW8_o6zTGuwqQOef8z0HPlw>
 <xmx:yZEdZ9ux1ESoXUG-kzHylye1QQ0HW1djxytlwPLW3wSM-czFpoKVug>
 <xmx:yZEdZxtJ706c5sV06e5rN_g-FHYehGlfD3A5RTEuyqNJJiKCE-3-VGZk>
Feedback-ID: ib1d9465d:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat,
 26 Oct 2024 21:05:11 -0400 (EDT)
Message-ID: <fa9408dc-a765-488e-9b1a-c4113b3d066f@HIDDEN>
Date: Sun, 27 Oct 2024 03:05:09 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN>
 <b6f7b5df-3203-48c8-8cc6-a1de4730b26e@HIDDEN>
 <87a5err20n.fsf@HIDDEN>
Content-Language: en-US
From: Dmitry Gutov <dgutov@HIDDEN>
In-Reply-To: <87a5err20n.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

On 26/10/2024 06:12, Sean Whitton wrote:
>> Maybe we can rephrase it like this:
>>
>>   Some VCS commands can change your copy of published change history
>>   without warning.  In VC we try to detect before that happens, and stop.
>>   You can customize this variable to permit rewriting history
>>   even though Emacs thinks it is dangerous.
>>
>>   So far, this applies only to using 'e' from Log View mode for Git.
> Whether or not there is a strict mismatch, I like your new text more.
> Please install it.
> 
>> BTW, there is another existing command which can end up changing
>> published history: 'vc-git-log-edit-toggle-amend'. I wonder what will
>> be our plan for it. Maybe we just add the same check there.
> Thanks for reminding me about this.  Yes, I think it should be fine to
> just add (vc-git--assert-allowed-rewrite "HEAD") or similar.  Would you
> like to do it along with your NEWS change?  I guess, then, dropping the
> "So far ..." sentence.

Great! Pushed in 2030b8c7f24.

Speaking of the description in NEWS, completion just reminded me that we 
also have vc-hg-log-edit-toggle-amend, maybe we could also do something 
about it.

I also got to thinking about the older VCSes supporting 
'modify-change-comment'. OT1H it also modifies "published history" in 
those instances. OT2H it does that in a way that won't lead to later 
conflict, because none of those systems are distributed. So I suppose we 
don't need to worry about them.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#64055: Implementation of modifying VC change comments for Git
Resent-From: Sean Whitton <spwhitton@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 27 Oct 2024 02:27:02 +0000
Resent-Message-ID: <handler.64055.B64055.17299959761503 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 64055
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Dmitry Gutov <dgutov@HIDDEN>
Cc: Morgan.J.Smith@HIDDEN, Eli Zaretskii <eliz@HIDDEN>, 64055 <at> debbugs.gnu.org
Received: via spool by 64055-submit <at> debbugs.gnu.org id=B64055.17299959761503
          (code B ref 64055); Sun, 27 Oct 2024 02:27:02 +0000
Received: (at 64055) by debbugs.gnu.org; 27 Oct 2024 02:26:16 +0000
Received: from localhost ([127.0.0.1]:43376 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1t4sys-0000OA-QV
	for submit <at> debbugs.gnu.org; Sat, 26 Oct 2024 22:26:15 -0400
Received: from sendmail.purelymail.com ([34.202.193.197]:49282)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <spwhitton@HIDDEN>) id 1t4syl-0000NW-EV
 for 64055 <at> debbugs.gnu.org; Sat, 26 Oct 2024 22:26:12 -0400
DKIM-Signature: a=rsa-sha256;
 b=C7gCs2dqVy1pjgJ0IN1SmPkSAP1HNa0hCGePwIT8ZZES4ax6HByF8dPcJjDGaMTi536m7cMhlCXnBuRhURhCPptwa870JvW8PFvnoeEXLIb4E4+56/KemGtvFsdXsqUPuzUtHoBd5tWDoqAve06KW0HAfSh5cdbcGRHYtX+XOht34knmXmVAsaAOV/K2ylhtmsvEy+xevbes+dtW3wfVqS4WliSPEZDDpFAdaK450m6Np43WJ491KoVP37j2Jg9+zG+bBXYXAthrA3pPPaoBsZH/Hy4ej6/T9RUeOWdEc61DcFlh00nTiLzORerAePtPLNhsuqwo9O/lQLNurHiRjg==;
 s=purelymail2; d=spwhitton.name; v=1;
 bh=+fFWySiUCDK/I/Opa1TAYL3wMvLqNi1akmElai2l08U=;
 h=Received:Received:From:To:Subject:Date; 
DKIM-Signature: a=rsa-sha256;
 b=CuBGctpaj4e0mUSRcvLjY7H3ithzfHKD8+TSQZ85bVALO2bsLPNKpPDAzBF4YR5a9T7kZXwAklZ5ZFQJG8+gDaloj7pzwPiXSMvUhbxhNIg1yUGZERTuh7E39XSfDGiBiIHtlIbkBNWrJ/bgZ9rcdayFok+LLuxN3m/MEuQZQft8B9aoGbYBR+ynKgrTsXC8kqzDQ6ZW/cBdjUGn699IR/+jYP5cWUwovg3WfQ2XWh/6ED2gyll/0eE2vhPT85mqfjN4lDS1cB5dT11ydlSWLxBQX9WPeg8hNwdbmNarKJoyohORF4lL05+ymz88H6G6z86saWyKv6u6PmTLOMXFpg==;
 s=purelymail2; d=purelymail.com; v=1;
 bh=+fFWySiUCDK/I/Opa1TAYL3wMvLqNi1akmElai2l08U=;
 h=Feedback-ID:Received:Received:From:To:Subject:Date; 
Feedback-ID: 20115:3760:null:purelymail
X-Pm-Original-To: 64055 <at> debbugs.gnu.org
Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1200514287; 
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384);
 Sun, 27 Oct 2024 02:25:23 +0000 (UTC)
Received: by melete.silentflame.com (Postfix, from userid 1000)
 id 35E8C7EE248; Sun, 27 Oct 2024 10:25:21 +0800 (CST)
From: Sean Whitton <spwhitton@HIDDEN>
In-Reply-To: <fa9408dc-a765-488e-9b1a-c4113b3d066f@HIDDEN> (Dmitry Gutov's
 message of "Sun, 27 Oct 2024 03:05:09 +0200")
References: <874j59wym3.fsf@HIDDEN> <868qukl73k.fsf@HIDDEN>
 <87bjzfuzaq.fsf@HIDDEN>
 <b6f7b5df-3203-48c8-8cc6-a1de4730b26e@HIDDEN>
 <87a5err20n.fsf@HIDDEN>
 <fa9408dc-a765-488e-9b1a-c4113b3d066f@HIDDEN>
Date: Sun, 27 Oct 2024 10:25:21 +0800
Message-ID: <87iktenuy6.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

Hello,

On Sun 27 Oct 2024 at 03:05am +02, Dmitry Gutov wrote:

> On 26/10/2024 06:12, Sean Whitton wrote:
>>> Maybe we can rephrase it like this:
>>>
>>>   Some VCS commands can change your copy of published change history
>>>   without warning.  In VC we try to detect before that happens, and stop.
>>>   You can customize this variable to permit rewriting history
>>>   even though Emacs thinks it is dangerous.
>>>
>>>   So far, this applies only to using 'e' from Log View mode for Git.
>> Whether or not there is a strict mismatch, I like your new text more.
>> Please install it.
>>
>>> BTW, there is another existing command which can end up changing
>>> published history: 'vc-git-log-edit-toggle-amend'. I wonder what will
>>> be our plan for it. Maybe we just add the same check there.
>> Thanks for reminding me about this.  Yes, I think it should be fine to
>> just add (vc-git--assert-allowed-rewrite "HEAD") or similar.  Would you
>> like to do it along with your NEWS change?  I guess, then, dropping the
>> "So far ..." sentence.
>
> Great! Pushed in 2030b8c7f24.

Thanks.

> Speaking of the description in NEWS, completion just reminded me that
> we also have vc-hg-log-edit-toggle-amend, maybe we could also do
> something about it.

Yes, would be good to.

> I also got to thinking about the older VCSes supporting
> 'modify-change-comment'. OT1H it also modifies "published history" in those
> instances. OT2H it does that in a way that won't lead to later conflict,
> because none of those systems are distributed. So I suppose we don't need to
> worry about them.

Yes, I think that's right.

-- 
Sean Whitton

Last modified: Sun, 12 Jan 2025 05:45:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.