From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.devel Subject: Re: master 4803fba487 1/2: 'C-x v v' on a diff buffer commits it as a patch (bug#52349) Date: Sun, 04 Sep 2022 07:26:47 +0000 Message-ID: <874jxnha6g.fsf@posteo.net> References: <166171593185.16640.41619657947456727@vcs2.savannah.gnu.org> <20220828194533.23A6BC00889@vcs2.savannah.gnu.org> <87r10znm0y.fsf@gnus.org> <83fshfvvyn.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2133"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , larsi@gnus.org, juri@jurta.org, emacs-devel@gnu.org To: "Alfred M. Szmidt" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Sep 04 09:37:54 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oUkCY-0000NQ-K8 for ged-emacs-devel@m.gmane-mx.org; Sun, 04 Sep 2022 09:37:54 +0200 Original-Received: from localhost ([::1]:53844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUkCX-00025Q-7f for ged-emacs-devel@m.gmane-mx.org; Sun, 04 Sep 2022 03:37:53 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUk1t-0000Gj-QR for emacs-devel@gnu.org; Sun, 04 Sep 2022 03:26:53 -0400 Original-Received: from mout01.posteo.de ([185.67.36.65]:47735) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUk1r-00034c-QD for emacs-devel@gnu.org; Sun, 04 Sep 2022 03:26:53 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 8172F240029 for ; Sun, 4 Sep 2022 09:26:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1662276409; bh=GrFRZC/P39KGw3lukQ4/NS0MMQgS+8kZ9ZnHlVBxRC0=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=HPL4cq3rDDr077VBlKZ+9jV/nlqZ4nNSIajZY5HfeVR/Xk5C2CQWxza1e/18FfYmz z4Q7OZwtFLHSrS9fAKHLswaZIlI1n6hAK5UwErIuDGd3lRnR/rAqZyiXs5Q71EEpBd mZLwIZB2U02kmu3w1nJqGagI2wRuT8PDlNZHAl3fN11izMp9ZhGZhXuNkOrqgRi846 TdNmMfLAjDplsHCAGerEDwNIzfRkZTzgjMwMFp08GE2JeD17dfmnjlLS/NFHxrD9j4 uHW1CTcxA9r3cTvFT9liN77LXHkxHeppoBZWve55Fq3pRq6izAZJKavFv3SIrAduQP +qVFhKJMEPadQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4ML3B04xhgz9rxL; Sun, 4 Sep 2022 09:26:47 +0200 (CEST) In-Reply-To: (Alfred M. Szmidt's message of "Tue, 30 Aug 2022 09:25:31 -0400") Autocrypt: addr=philipk@posteo.net; prefer-encrypt=nopreference; keydata= mDMEYHHqUhYJKwYBBAHaRw8BAQdAp3GdmYJ6tm5McweY6dEvIYIiry+Oz9rU4MH6NHWK0Ee0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiQBBMWCAA4FiEEDM2H44ZoPt9Ms0eHtVrAHPRh1FwFAmBx6lICGwMFCwkIBwIGFQoJ CAsCBBYCAwECHgECF4AACgkQtVrAHPRh1FyTkgEAjlbGPxFchvMbxzAES3r8QLuZgCxeAXunM9gh io0ePtUBALVhh9G6wIoZhl0gUCbQpoN/UJHI08Gm1qDob5zDxnIHuDgEYHHqUhIKKwYBBAGXVQEF AQEHQNcRB+MUimTMqoxxMMUERpOR+Q4b1KgncDZkhrO2ql1tAwEIB4h4BBgWCAAgFiEEDM2H44Zo Pt9Ms0eHtVrAHPRh1FwFAmBx6lICGwwACgkQtVrAHPRh1Fw1JwD/Qo7kvtib8jy7puyWrSv0MeTS g8qIxgoRWJE/KKdkCLEA/jb9b9/g8nnX+UcwHf/4VfKsjExlnND3FrBviXUW6NcB Received-SPF: pass client-ip=185.67.36.65; envelope-from=philipk@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 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, GAPPY_SUBJECT=0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:294692 Archived-At: "Alfred M. Szmidt" writes: > > > 'C-x v v' on a diff buffer commits it as a patch (bug#52349) > > > > Excellent! This is going to save me a lot of work in the future. > > Bother: This is only supported for Git, which is against the spirit of > VC, and definitely against the spirit of "C-x v v". > > This is a pitty indeed. Specially seeing that it is easy enough to > get this working for all VCSs. Here is a hack I wrote ages ago, and > this works for just about everything, it doesn't do exactly what is > needed (e.g, this works on a single file basis) but it isn't too hard > to get that working. This feature looks very interesting to me. Could it be added to vc or as an package to GNU ELPA? > ===File ~/diff-commit-hunk.el=============================== > ;;;; diff-commit-hunk.el --- commit parts of a hunk in `diff-mode' > > (require 'diff-mode) > > (defun current-buffer-file-name () > (buffer-file-name (current-buffer))) > > (defun restore-source-file () > (with-current-buffer (current-buffer) > (erase-buffer) > (insert-buffer "*diff-commit-hunk*") > (write-file (current-buffer-file-name))) > (remove-hook 'vc-checkin-hook 'restore-source-file)) > > (defmacro with-original-file (&rest body) > "Reverts associated source file temporarily in a `diff-mode' > buffer to the latest found in VCS, executes BODY and commits the > changes back VCS." > `(progn > (save-excursion > (diff-goto-source) > (let ((buf (current-buffer))) > (with-current-buffer (get-buffer-create "*diff-commit-hunk*") > (erase-buffer) > (insert-buffer buf))) > (vc-revert-file (current-buffer-file-name))) > ,@body > (save-excursion > (diff-goto-source) > (write-file (current-buffer-file-name)) > (add-hook 'vc-checkin-hook 'restore-source-file) > (vc-checkin (list (current-buffer-file-name)) > (vc-backend (current-buffer-file-name)))))) > > ;;;###autoload > (defun diff-commit-hunk () > "Revert associated source file to the latest version from VCS, > and apply (and commit) current hunk." > (interactive) > (with-original-file > (let ((diff-advance-after-apply-hunk nil)) > (diff-apply-hunk)))) > > ;;;###autoload > (defun diff-commit-all () > "Like `diff-commit-hunk', but applies all hunks in the current > diff buffer." > (interactive) > (with-original-file > (goto-char (point-min)) > (diff-hunk-next) ;Skip header. > (while (not (eobp)) > (diff-apply-hunk)))) > > (define-key diff-mode-map (kbd "s-a") #'diff-commit-hunk) > (define-key diff-mode-map (kbd "H-a") #'diff-commit-all) > > ;;;; diff-commit-hunk.el ends here. > ============================================================