From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: =?UTF-8?Q?Cl=C3=A9ment?= Pit--Claudel Newsgroups: gmane.emacs.bugs Subject: bug#27953: vc-region-history doesn't follow renames Date: Fri, 4 Aug 2017 17:12:39 +0200 Message-ID: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="V3mQ057M9xJxgmA36BCInM9o1cv0TBbjp" X-Trace: blaine.gmane.org 1501862939 30043 195.159.176.226 (4 Aug 2017 16:08:59 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 4 Aug 2017 16:08:59 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 Cc: monnier@iro.umontreal.ca To: 27953@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Aug 04 18:08:54 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddf9f-0007NV-MH for geb-bug-gnu-emacs@m.gmane.org; Fri, 04 Aug 2017 18:08:51 +0200 Original-Received: from localhost ([::1]:51774 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddf9l-0006TH-RA for geb-bug-gnu-emacs@m.gmane.org; Fri, 04 Aug 2017 12:08:57 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddeHi-0003tF-6d for bug-gnu-emacs@gnu.org; Fri, 04 Aug 2017 11:13:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddeHf-0005mE-A6 for bug-gnu-emacs@gnu.org; Fri, 04 Aug 2017 11:13:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:39278) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddeHf-0005m2-6s for bug-gnu-emacs@gnu.org; Fri, 04 Aug 2017 11:13:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ddeHe-00039b-FL; Fri, 04 Aug 2017 11:13:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: =?UTF-8?Q?Cl=C3=A9ment?= Pit--Claudel Original-Sender: "Debbugs-submit" Resent-CC: monnier@iro.umontreal.ca, bug-gnu-emacs@gnu.org Resent-Date: Fri, 04 Aug 2017 15:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 27953 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org X-Debbugs-Original-Xcc: monnier@iro.umontreal.ca Original-Received: via spool by submit@debbugs.gnu.org id=B.150185957812111 (code B ref -1); Fri, 04 Aug 2017 15:13:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 4 Aug 2017 15:12:58 +0000 Original-Received: from localhost ([127.0.0.1]:41954 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddeHa-00039H-1A for submit@debbugs.gnu.org; Fri, 04 Aug 2017 11:12:58 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:33998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddeHY-000394-FK for submit@debbugs.gnu.org; Fri, 04 Aug 2017 11:12:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddeHR-0005bC-KV for submit@debbugs.gnu.org; Fri, 04 Aug 2017 11:12:50 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:47848) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ddeHR-0005b2-Gj for submit@debbugs.gnu.org; Fri, 04 Aug 2017 11:12:49 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddeHO-0003f0-TZ for bug-gnu-emacs@gnu.org; Fri, 04 Aug 2017 11:12:49 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddeHM-0005We-0r for bug-gnu-emacs@gnu.org; Fri, 04 Aug 2017 11:12:46 -0400 Original-Received: from mout.kundenserver.de ([212.227.17.10]:63086) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddeHL-0005UY-Ej for bug-gnu-emacs@gnu.org; Fri, 04 Aug 2017 11:12:43 -0400 Original-Received: from [128.93.70.6] ([128.93.70.6]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.184]) with ESMTPSA (Nemesis) id 0MHrNV-1df0mz1NNd-003fnq for ; Fri, 04 Aug 2017 17:12:40 +0200 X-Provags-ID: V03:K0:XfToF4ffgRZEhsSaVgmqcqt1lsXxMfhqq1QW8pVvXnBqUgrKNnM D4zrNaFxKh7O4mIrfiWKT2lbKtK0iupe8rf8NhVaCOOoEbqEaOJ62vsFEAnqfCGe2gCXzPt IRyjhv3FP7oRF0gQ12RfXWVgGRlWXLda4hnWW+29KmZGQB1iEiKVFr7n8ZazufaH5/StWhx i40n96BruHd4rVO2TV7Ig== X-UI-Out-Filterresults: notjunk:1;V01:K0:gpPKEgJ1WF8=:FwrUZrXtZVekkhA35hnYYI 2w5r4De9VmdMqtbijlj0LpAKNubfa7MuEYYH5B9MPZRIR3g1Pf5rlvmqW8eZNSUI7MA/3qV4C 386Tv4F/AmbSt/Xtf5+JkurB7IH7+G7IwGyCPzusAsZLrnB8DVAz7NmZzD06TUgjM/nJVp4+n Cvoe2EAj+94UnHc/SKACa0nqWOqsitYDf0/kwCQmUW0qi0wrSC+kmNSl9+ciuoCJDbSDwimEa OyFagSS8ZZAMD10hfnF54X94UHAACH88H8aweDrwj7NXFh7A8DZ5vf+vyl9YFIWZGgH4GG6za bm3QuMGzCxaHnGJHAcLz4MrMF2ABd+BB/KIHtn1jsUvn1MyZ6rueHwmyf19vZTN58H9xM1qfN JmXM22UDCii9Yfk3vodwr+1tBDwmrvsD12LZJYBGFcwVQC3EAa79vtvIYDrIjZ6KDttJqEhUN /fAxnv8hCrxRbidoEdVjJ6DsnA1VmkMHFYrA5ER/SN2icfT9HJNhkGJt9RH48mwWQZT57uUha ASfCBip3YAZIeRVdBDbdOYsZQatISDz1dzG9aPC6R2l9h6V91E3gpbelocK9UJJd1dTKWlCNH EQNN9wzY9Z5YKu9aqFnzTaYKNCUw5MffUqNxl2svnkLzKv6EtN3bgoOft2KpTEaGHrKLAAaBQ brs5Y0RTBisj7cam98Wy35RzCXkdzcKox8Zows7CrZ6zG+/HHwhBKQVPi5itGHLTS3thwmBO6 AnOcHKXNeOSokuLUOwEoACA9YVQAgsAMfIQJuA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:135347 Archived-At: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --V3mQ057M9xJxgmA36BCInM9o1cv0TBbjp Content-Type: multipart/mixed; boundary="KamGoNEI0bN1tmRQFoE7pS13FFhO4A2An"; protected-headers="v1" From: =?UTF-8?Q?Cl=c3=a9ment_Pit--Claudel?= To: bug-gnu-emacs@gnu.org Message-ID: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> Subject: vc-region-history doesn't follow renames --KamGoNEI0bN1tmRQFoE7pS13FFhO4A2An Content-Type: multipart/mixed; boundary="------------3A912F79EB85729A3482386A" Content-Language: en-GB This is a multi-part message in MIME format. --------------3A912F79EB85729A3482386A Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Debbugs-CC: monnier@iro.umontreal.ca Hi bug-gnu-emacs, vc-git-region-history currently stops at the first rename, instead of con= tinuing across renames. This is because it doesn't pass --follow to git.= The original author put the required option "--follow" in a comment, ad= ding "FIXME: not supported?". Indeed, `git log -p --follow -L5,25:file.c' doesn't work. But `git log -= p --follow -L5,25:file.c file.c' does work (note the extra mention of the= file name). Any arguments against the attached patch? (CCing Stefan, since you're the last one who modified this function) Cl=C3=A9ment. --------------3A912F79EB85729A3482386A Content-Type: text/x-patch; name="0001-Follow-renames-in-vc-git-region-history.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-Follow-renames-in-vc-git-region-history.patch" =46rom 7a1c945645e6ea3c995ba21b4288b7a048340e67 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Cl=3DC3=3DA9ment=3D20Pit--Claudel?=3D Date: Fri, 4 Aug 2017 17:03:20 +0200 Subject: [PATCH] Follow renames in vc-git-region-history * lisp/vc/vc-git.el (vc-git-region-history): Pass --follow. This requires a path spec, so pass that too. --- lisp/vc/vc-git.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index cc3e295..6830951 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1159,8 +1159,10 @@ vc-git-region-history (- (+ curno curcnt) (+ headno headcnt))))) (setq lto (- lto (or to-offset last-offset))) (setq lfrom (- lfrom (or to-offset last-offset))))) - (vc-git-command buffer 'async nil "log" "-p" ;"--follow" ;FIXME: not s= upported? - (format "-L%d,%d:%s" lfrom lto (file-relative-name fil= e)))) + (vc-git-command buffer 'async nil "log" "-p" "--follow" + (format "-L%d,%d:%s" lfrom lto (file-relative-name file)) + ;; Must include one path spec for --follow to work + (file-relative-name file))) =20 (require 'diff-mode) =20 --=20 2.7.4 --------------3A912F79EB85729A3482386A-- --KamGoNEI0bN1tmRQFoE7pS13FFhO4A2An-- --V3mQ057M9xJxgmA36BCInM9o1cv0TBbjp Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJZhI7nAAoJEPqg+cTm90wjsKAP/R+vtWmhp/fJ51cwVAyShu1Y zcjMVESh4M/jR6J9TOWpcpkwjwsE/chO8t2dnQ9OM5qY6I7M1Fo9SRQSZPoochxO 2y1qXsFUeoDhwFFJhr3EJuBevZc6fxpbSKvK7PFDz4FV6a75K15Mv9YTz8ne+80b LMSCLCmkq7kM9eSaqIK5xr+Dk6A4bbLcfhNp8nnLDE9XByO65QMX7zEH6FD6uZtu zLGVuiq7+Jbvk8ri5pigUGFu/12ws7rVpvf6bJ9rfEvrOBq6x5m7OBn0GqJcAlnU MapeBbAnM3kDcHGXFcT14q3S/Eix0xLpG3xoUxxbrm7cS7CTnba6cvAfQK5EEyyI u/8ClbqiAz2eLKtsHF7N/hlRGYY0xItQ+x8iEWXVA9ic89eNTFrbJX7YTBmzYrpS wI2Oea1zH7jb2ZsH4j3cIMvB8K/4zForHG1HCLoGvt8budtjpBp7XnoDQHuUtdLH la2cYKbJfiei4eo3gRdpvz52szzYCazJLv0AFjPxTPYsLqt0Pdrsy7zDo+PRW+VQ LN7Xg13lcG0cBR5zUNEY959MFsp1pXvR/Knw6o/SezCGJT5C4xNWOdd2w3fbJKDD 0JscE9leefaa5Vi9nwo4EqeWe7KkVFJ2kvfU94hA269kupsXdclRkHuoP34wFl2D rIu203/F0UXDM4b+xfav =LXmV -----END PGP SIGNATURE----- --V3mQ057M9xJxgmA36BCInM9o1cv0TBbjp--