From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 04 11:12:58 2017 Received: (at submit) by debbugs.gnu.org; 4 Aug 2017 15:12:58 +0000 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 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 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_SORBS_SPAM,URIBL_BLOCKED autolearn=disabled version=3.3.2 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 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 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 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 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 To: bug-gnu-emacs@gnu.org From: =?UTF-8?Q?Cl=c3=a9ment_Pit--Claudel?= Subject: vc-region-history doesn't follow renames Message-ID: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> Date: Fri, 4 Aug 2017 17:12:39 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="V3mQ057M9xJxgmA36BCInM9o1cv0TBbjp" 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -3.5 (---) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.5 (---) 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-- From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 04 13:21:38 2017 Received: (at 27953) by debbugs.gnu.org; 4 Aug 2017 17:21:38 +0000 Received: from localhost ([127.0.0.1]:42012 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddgI6-0007wU-Iz for submit@debbugs.gnu.org; Fri, 04 Aug 2017 13:21:38 -0400 Received: from chene.dit.umontreal.ca ([132.204.246.20]:55018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddgI5-0007wL-7F for 27953@debbugs.gnu.org; Fri, 04 Aug 2017 13:21:37 -0400 Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id v74HLZD6003080; Fri, 4 Aug 2017 13:21:36 -0400 Received: by ceviche.home (Postfix, from userid 20848) id 8098F66259; Fri, 4 Aug 2017 13:21:35 -0400 (EDT) From: Stefan Monnier To: =?windows-1252?Q?Cl=E9ment?= Pit--Claudel Subject: Re: bug#27953: vc-region-history doesn't follow renames Message-ID: References: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> Date: Fri, 04 Aug 2017 13:21:35 -0400 In-Reply-To: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> (=?windows-1252?Q?=22Cl=E9ment?= Pit--Claudel"'s message of "Fri, 4 Aug 2017 17:12:39 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 2 Rules triggered EDT_SA_DN_PASS=0, RV6087=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6087> : inlines <6009> : streams <1757156> : uri <2476335> X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: 27953 Cc: 27953@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) > 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). Hmm... what's the difference between git log -p -L5,25:file.c and git log -p -L5,25:file.c file.c ? Would this issue deserve a bug-report to Git? > Any arguments against the attached patch? I'd suggest to compute (file-relative-name file) only once, and to add bug#27953 to the comment, but otherwise, looks good. Stefan From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 04 13:40:19 2017 Received: (at 27953) by debbugs.gnu.org; 4 Aug 2017 17:40:19 +0000 Received: from localhost ([127.0.0.1]:42030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddgaB-0008Oy-3K for submit@debbugs.gnu.org; Fri, 04 Aug 2017 13:40:19 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:46324) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddga8-0008Oo-8U for 27953@debbugs.gnu.org; Fri, 04 Aug 2017 13:40:16 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3xPDht4s3Hz1qr7j; Fri, 4 Aug 2017 19:40:14 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3xPDht3hjzz3jR9Z; Fri, 4 Aug 2017 19:40:14 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 4fqph4NeGsR5; Fri, 4 Aug 2017 19:40:10 +0200 (CEST) X-Auth-Info: vs8/1fcwgbN4gzfR02E8KsTt3AddUH0lRGJquV4qPuQigLHLoyF9UnUEbevDuKVa Received: from igel.home (ppp-88-217-1-226.dynamic.mnet-online.de [88.217.1.226]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Fri, 4 Aug 2017 19:40:10 +0200 (CEST) Received: by igel.home (Postfix, from userid 1000) id 85E562C3623; Fri, 4 Aug 2017 19:40:09 +0200 (CEST) From: Andreas Schwab To: Stefan Monnier Subject: Re: bug#27953: vc-region-history doesn't follow renames References: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> X-Yow: I'm in LOVE with DON KNOTTS!! Date: Fri, 04 Aug 2017 19:40:09 +0200 In-Reply-To: (Stefan Monnier's message of "Fri, 04 Aug 2017 13:21:35 -0400") Message-ID: <87o9rvkz9i.fsf@linux-m68k.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27953 Cc: =?utf-8?Q?Cl=C3=A9ment?= Pit--Claudel , 27953@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On Aug 04 2017, Stefan Monnier wrote: >> 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). > > Hmm... what's the difference between > > git log -p -L5,25:file.c > and > git log -p -L5,25:file.c file.c The latter is supposed to be invalid: -L ,:, -L :: Trace the evolution of the line range given by "," (or the function name regex ) within the . You may not ^^^^^^^^^^^ give any pathspec limiters. ^^^^^^^^^^^^^^^^^^^^^^^^^^^ > Would this issue deserve a bug-report to Git? It does. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 05 09:06:18 2017 Received: (at 27953) by debbugs.gnu.org; 5 Aug 2017 13:06:18 +0000 Received: from localhost ([127.0.0.1]:42628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddymW-0004Lr-37 for submit@debbugs.gnu.org; Sat, 05 Aug 2017 09:06:17 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:58324) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddymT-0004Ld-NZ for 27953@debbugs.gnu.org; Sat, 05 Aug 2017 09:06:14 -0400 Received: from [192.168.1.82] ([109.24.225.43]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.184]) with ESMTPSA (Nemesis) id 0M09nw-1dNHq31jbg-00uKd9; Sat, 05 Aug 2017 15:06:03 +0200 Subject: Re: bug#27953: vc-region-history doesn't follow renames To: Stefan Monnier References: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> From: =?UTF-8?Q?Cl=c3=a9ment_Pit--Claudel?= Message-ID: <3eb66411-a4c1-78e7-4ec1-324fee770702@live.com> Date: Sat, 5 Aug 2017 15:06:00 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="qEnhHX37jOgLkNHInXP3La8F6JhCnFFES" X-Provags-ID: V03:K0:osbGg4DnPkDbeVr9YrMVZ5NDDKMTzdsIbZP1C/4F16WEkO+bQ2/ fyS5ZlcoYRHRMqPM5eyHeZoJUtNf2FyEGcYHluVnSg9vhyNpderilJSvpFZNuLIDglhtLp9 8tkQ6T7Se/VLLjJWE6Bk142DaNFclspls9CLsdyACt/GAsFiZaRCwnhrNe4A9G8paeTpWwL NflHNN/aeZx07fC8n07xg== X-UI-Out-Filterresults: notjunk:1;V01:K0:GYugoLYLrZs=:ffmaYNnSZ9Gzmw+1A0xCnp Dx0BE0VqJEvJRohwpbW8Df6lYSoP21D3MBjWKILECY+j7hkV7ahfpZr/YfC6LlFs9Dvtt/ASj /jw7O547BInUrbj8EM7j+M8MWIeENEH6+n8tzw0Ws1E/pOaUZcg41D8L9wjM+w92TSJSqz6vU /yaADRcVPXC2gZGAUYZTxErIM77BVgdrKlZLN3rhbSh3BzhJUPu1vaCpwe0iZbp675nlbSuXr Btetc5c33wJb3rrEJwMiR+McUGGwPTFJnU+zNYffwx1A2sDM04SxUclhzuqlKqij1til0Udp/ CyFHtWkLrYyT27hSWmXGMqOZcUj+0Lw30MAMEoNLZhcShpIqlQRTz2YbGVn8h97U/c0C0v0mh LbC1F6RpWqrrugr4GpWtVxB2mtkpG3YQLlkeg4aKxL5cjRcqSpjnqQElVW2DM6nEJ6vQNhFq+ WvPkQO+h95Ef5rmvqMZPENB7nwWhmk/g7OkajG7N3mh9CFDwdTVv6jVWmdL/dbK4vPxSPJrVf CMV4+4RJnJg17kPY3mcI6kYL6BLLPgQTNBM9gRBQv/8J7E22L3ttDG9WBeVRTyXPmaMtJ4cXT KWlr0nG4w0hfLPLlqPClpL3w4NdG7O4lqXGsDBNV9MrmouRBgdE1KVBNegRN50zet+arwMjuZ VeUnopfJi2UkImZzfthr/MdpHEvFBC83KSwfygUgrSUFUAsv+lU6g6c6RmHoFeI7ky6wmgshw NnCoauZr73omcB1YTi/3D2Au1rTidxVLcF+/hw== X-Spam-Score: -1.8 (-) X-Debbugs-Envelope-To: 27953 Cc: 27953@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --qEnhHX37jOgLkNHInXP3La8F6JhCnFFES Content-Type: multipart/mixed; boundary="Q9V0w12mE2VuHJXPfp85cKWIOtv9vuIw5"; protected-headers="v1" From: =?UTF-8?Q?Cl=c3=a9ment_Pit--Claudel?= To: Stefan Monnier Cc: 27953@debbugs.gnu.org Message-ID: <3eb66411-a4c1-78e7-4ec1-324fee770702@live.com> Subject: Re: bug#27953: vc-region-history doesn't follow renames References: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> In-Reply-To: --Q9V0w12mE2VuHJXPfp85cKWIOtv9vuIw5 Content-Type: multipart/mixed; boundary="------------5A217863B68EB2500BC978DF" Content-Language: en-GB This is a multi-part message in MIME format. --------------5A217863B68EB2500BC978DF Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2017-08-04 19:21, Stefan Monnier wrote: >> 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 mentio= n of >> the file name). >=20 > Hmm... what's the difference between >=20 > git log -p -L5,25:file.c > and > git log -p -L5,25:file.c file.c The second one allows --follow; the first one doesn't. I don't know what= differences they may be beyond that :/ > Would this issue deserve a bug-report to Git? Possibly; it's a bit intimidating. >> Any arguments against the attached patch? >=20 > I'd suggest to compute (file-relative-name file) only once, and to add > bug#27953 to the comment, but otherwise, looks good. Attached an updated version :) Cl=C3=A9ment. --------------5A217863B68EB2500BC978DF 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 78959b7c2bb7a13c4ab965e2617e3e9eec127b35 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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index cc3e295..7d13dfe 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1159,8 +1159,11 @@ 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)))) + (let ((file-relname (file-relative-name file))) + (vc-git-command buffer 'async nil "log" "-p" "--follow" + (format "-L%d,%d:%s" lfrom lto file-relname) + ;; Must include one path spec for --follow to work (#27953= ) + file-relname))) =20 (require 'diff-mode) =20 --=20 2.7.4 --------------5A217863B68EB2500BC978DF-- --Q9V0w12mE2VuHJXPfp85cKWIOtv9vuIw5-- --qEnhHX37jOgLkNHInXP3La8F6JhCnFFES 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 iQIcBAEBCAAGBQJZhcK4AAoJEPqg+cTm90wjtz4P/0k0QnZoofVIGsyTc3IElAwY s000tYRa6e9keAiBWWfFa/K1tDSg4u2v+iSm3epk2COqWKx3neRngxbuFfkCLgnd ejsjDf/pvtlDyz80yiymSGKSlp1hqo7522LMO7fWMY3WuWVkgWRDveVCYY9QCIS1 olaH1HqqMt7AIEbB085NywtyxSwVpKTR2ooQM6O3TLXhLXiVuRNiWZQlD/ASmB16 lk31hVNZVZNUksnVSxAXURSTdbpDQ/yzpVTecbJpoV4bw1eD0PuILVO9O3D3L+jx jvCZlwU/oLbCZlGjME/pmB7oD4oc49GF5fu0mkRPr6WSFsGjx9mlBXSSVhuFFh6W QdegziFeDWpxUW729PRNXwiLU18HEyS6WXwkaG1AjfwKtxDuzvcklvMdLaW7eWJX 2XhWhuyEiIl6vE/WXEX9MBzQhnDdYrSCyQWJNsaSqhJ5eEJvngXYIV2rd7eTW9qQ r8YP/c6lfygTApp0Y8wlbcEI6C3AAz+35OE6YplUSPr0ap31Wlry6kgHFyl4mF5L KIOpm20of0KQTywevdFajuFR6IrFkEhTo70AWm6Ry/61Zf6eQrMrviNkJfsB5Pyg HSKIZAAnddgEoNIzozaBQAyaYLjetVyIT851PdyuLGROYGyAv+sYZSuEJE4Mbu+m /Mh7o/2LqlMFgaIVEzBv =JZ7N -----END PGP SIGNATURE----- --qEnhHX37jOgLkNHInXP3La8F6JhCnFFES-- From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 05 13:06:02 2017 Received: (at 27953) by debbugs.gnu.org; 5 Aug 2017 17:06:02 +0000 Received: from localhost ([127.0.0.1]:43568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1de2WX-0001wr-MD for submit@debbugs.gnu.org; Sat, 05 Aug 2017 13:06:01 -0400 Received: from pb-smtp1.pobox.com ([64.147.108.70]:53138 helo=sasl.smtp.pobox.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1de2WV-0001wY-Bd for 27953@debbugs.gnu.org; Sat, 05 Aug 2017 13:05:59 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 9B38B99EE7; Sat, 5 Aug 2017 13:05:57 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type:content-transfer-encoding; s=sasl; bh=9z7skjTTz9np aAdMmfhQ7FMXwhw=; b=qo7phyDzBibPgehG/xhVqDX9YB1NcIMP/C9SsUzWnJro bMdBH1oSdcIXAuKCN1E75UMtSPO0YLIQWpR6haMDvcsSZ1EIpAuRRxSMoLm0e+Wb 2SFTdmkKCHjibuqoeaGfrKJJrU8wuy2c4/BdvlY7MoXK/9FsZEUGxqdyJ7p20f0= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 90A7199EE6; Sat, 5 Aug 2017 13:05:57 -0400 (EDT) Received: from localhost (unknown [24.60.167.92]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id F258899EE5; Sat, 5 Aug 2017 13:05:56 -0400 (EDT) From: Kyle Meyer To: =?utf-8?Q?Cl=C3=A9ment?= Pit--Claudel Subject: Re: bug#27953: vc-region-history doesn't follow renames References: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> <3eb66411-a4c1-78e7-4ec1-324fee770702@live.com> X-Attribution: Kyle Date: Sat, 05 Aug 2017 13:05:52 -0400 In-Reply-To: <3eb66411-a4c1-78e7-4ec1-324fee770702@live.com> (=?utf-8?Q?=22Cl=C3=A9ment?= Pit--Claudel"'s message of "Sat, 5 Aug 2017 15:06:00 +0200") Message-ID: <87poca9c7j.fsf@kyleam.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Pobox-Relay-ID: 59037390-7A00-11E7-A861-FE4B1A68708C-24757444!pb-smtp1.pobox.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:references:date:in-reply-to:message-id:mime-version:content-type:content-transfer-encoding; s=mesmtp; bh=DGYDctgMkRxHN6oC6iR6ZCrLEb20XVVHgimSyplVNzM=; b=x7Ip4l4RMg/xx/TDHK1S/AUEIQeJbg8uPwMkZLdMoBpwgAlaoV9vqr/RjXMyasKaCmMMDf4DHiLb7QKSWrA0R27XGF4HJuzYJya+jH4OSG87N1PyjOzhLpn2x7/TATvLGAHewW6eIX/qeEjkMNA8cpzk65xU6eBiN0uHeYFPTfI= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27953 Cc: Andreas Schwab , Stefan Monnier , 27953@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Cl=C3=A9ment Pit--Claudel writes: > On 2017-08-04 19:21, Stefan Monnier wrote: >>> 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). >>=20 >> Hmm... what's the difference between >>=20 >> git log -p -L5,25:file.c >> and >> git log -p -L5,25:file.c file.c > > The second one allows --follow; the first one doesn't. I don't know what= differences they may be beyond that :/ As Andreas mentioned, even though git doesn't throw an error, giving a pathspec with -L is documented as invalid. But you shouldn't need to add --follow here. Renames should be followed by default when -L is used. (At least, that's what I see using Git v2.13.3.) --=20 Kyle From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 05 13:23:56 2017 Received: (at 27953) by debbugs.gnu.org; 5 Aug 2017 17:23:56 +0000 Received: from localhost ([127.0.0.1]:43591 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1de2ns-0002Mw-21 for submit@debbugs.gnu.org; Sat, 05 Aug 2017 13:23:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52247) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1de2nq-0002Mk-CA for 27953@debbugs.gnu.org; Sat, 05 Aug 2017 13:23:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1de2nh-0003Vf-G0 for 27953@debbugs.gnu.org; Sat, 05 Aug 2017 13:23:49 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:53260) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1de2nh-0003VT-CO; Sat, 05 Aug 2017 13:23:45 -0400 Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:2696 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1de2ng-00063m-Lp; Sat, 05 Aug 2017 13:23:45 -0400 Date: Sat, 05 Aug 2017 20:23:36 +0300 Message-Id: <833796udwn.fsf@gnu.org> From: Eli Zaretskii To: Kyle Meyer In-reply-to: <87poca9c7j.fsf@kyleam.com> (message from Kyle Meyer on Sat, 05 Aug 2017 13:05:52 -0400) Subject: Re: bug#27953: vc-region-history doesn't follow renames References: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> <3eb66411-a4c1-78e7-4ec1-324fee770702@live.com> <87poca9c7j.fsf@kyleam.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 27953 Cc: clement.pitclaudel@live.com, schwab@linux-m68k.org, monnier@IRO.UMontreal.CA, 27953@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Eli Zaretskii Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) > From: Kyle Meyer > Date: Sat, 05 Aug 2017 13:05:52 -0400 > Cc: Andreas Schwab , > Stefan Monnier , 27953@debbugs.gnu.org > > But you shouldn't need to add --follow here. Renames should be followed > by default when -L is used. (At least, that's what I see using Git > v2.13.3.) I have 2.10 here, so maybe this was fixed later, but I don't see renames followed when -L is used. E.g., try this: git log -L77,83:admin/charsets/Makefile.in You will see Git claiming the only version which changed that is the one in which Makefile.in was created from Makefile. Am I doing something wrong, or expecting too much? From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 05 13:27:41 2017 Received: (at 27953-done) by debbugs.gnu.org; 5 Aug 2017 17:27:41 +0000 Received: from localhost ([127.0.0.1]:43604 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1de2rU-0002TG-Um for submit@debbugs.gnu.org; Sat, 05 Aug 2017 13:27:41 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:60320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1de2rS-0002T1-Kr for 27953-done@debbugs.gnu.org; Sat, 05 Aug 2017 13:27:39 -0400 Received: from [192.168.1.82] ([109.24.225.43]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.184]) with ESMTPSA (Nemesis) id 0MC1MO-1dmoHb0i5w-008vCk; Sat, 05 Aug 2017 19:27:23 +0200 Subject: Re: bug#27953: vc-region-history doesn't follow renames To: Kyle Meyer References: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> <3eb66411-a4c1-78e7-4ec1-324fee770702@live.com> <87poca9c7j.fsf@kyleam.com> From: =?UTF-8?Q?Cl=c3=a9ment_Pit--Claudel?= Message-ID: <852633bf-6cb1-3efd-824b-c93e5307b034@live.com> Date: Sat, 5 Aug 2017 19:27:21 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <87poca9c7j.fsf@kyleam.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="1KsoF9row4tcAuk071c6QDvWtxIMX0UWl" X-Provags-ID: V03:K0:bb2G18GIvBM1BGickX0fuElwDgRobi6N9Itc4TvnRuCc+g4zX6m 5Wj3b0eawF+ut845bR8OxMzqt5g9tbCEzR7Cmikg4WHAHB4z00Bf/dJrp62h4XZ5Ly3yCBJ OeTKPT3kHuJ7pW3Z3/mm2FQ/ieGAbDD3/4t/ZOS3JkGbXq4NCa1sPtmFwIWICHR62dKjUmh 2jjuOci0WxVptDgoRlaGw== X-UI-Out-Filterresults: notjunk:1;V01:K0:q13/OfkOQbY=:1Z94XoG8dAkitsZZyCjz3y KNQZfUAPnddOxEBFpTnsrpIilAylNF36odAVv6Wda4k3OzEVPcKJjCpgyxCszhjwlPJ5Xw87h BWbY3bjK6/FeV4B4JB2oz0Z4unJHXsnmzw+ZWwVHW2aZBnoJA3g2K7mduo4+L3WYMPwbeMIzC CjStW9joWgGHzalE3xFjCT+2tEOlcbhe+3hUnH/XR0vyoJCl6sxbd5UXS2nQe2KidFhadpa7I Uko/6bkqubxJSr4n4OcpA73mzPgucSMhfsYD1yAF5UZ0owyGnQIgHxDWSwX9hC72vVAU92v8z cePnXYZvVfPTgegoJRux5//zTwcrrQhG7myeyQfWA/HjkHWE02yWea12UYYMMADCJON4quSwe svwl+dgn2pSre2pVS8iKMpou4C39YTVVuAkteiexZ5YUng7SEFuNd0HtUE3dvSYZK7W2tU7JH uU/ePG5M8isizvWls8CxWZ/X+3E8Cb2D1mToK/lS0Gpu1TmBxFzdNaS9CAJ0vBqnGy8ycZKUx //orh7HywSyC1OXwCeEvyzzP7QRB8BZ554fHfdwdzwaqlCd0v6IvK+Munf8zQUinmA1uRwMdp 0WUwFq7+xFeLSeOXSUNkMLh8JJFus1ef5Fk27YlGMrtr0B7D7DxHE55SleL4j6urT495P9KFK fR3fUHhE6Jc/UzZRW8kv5Yyk8dzM9ivNWU6aD85LH22/7M9V/3y05gMh1zNw9GKBq+VwJvU3d mIrsaut0BZfAknxajFaSxCwKCdXVaf/WQ/J0DQ== X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 27953-done Cc: Andreas Schwab , Stefan Monnier , 27953-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --1KsoF9row4tcAuk071c6QDvWtxIMX0UWl Content-Type: multipart/mixed; boundary="t4dQsTTTmHipN8XGvf0BJ01me6OX3CpVL"; protected-headers="v1" From: =?UTF-8?Q?Cl=c3=a9ment_Pit--Claudel?= To: Kyle Meyer Cc: Stefan Monnier , Andreas Schwab , 27953-done@debbugs.gnu.org Message-ID: <852633bf-6cb1-3efd-824b-c93e5307b034@live.com> Subject: Re: bug#27953: vc-region-history doesn't follow renames References: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> <3eb66411-a4c1-78e7-4ec1-324fee770702@live.com> <87poca9c7j.fsf@kyleam.com> In-Reply-To: <87poca9c7j.fsf@kyleam.com> --t4dQsTTTmHipN8XGvf0BJ01me6OX3CpVL Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: quoted-printable On 2017-08-05 19:05, Kyle Meyer wrote: > Cl=C3=A9ment Pit--Claudel writes: >> On 2017-08-04 19:21, Stefan Monnier wrote: >>>> 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 ment= ion of >>>> the file name). >>> >>> Hmm... what's the difference between >>> >>> git log -p -L5,25:file.c >>> and >>> git log -p -L5,25:file.c file.c >> >> The second one allows --follow; the first one doesn't. I don't know w= hat differences they may be beyond that :/ >=20 > As Andreas mentioned, even though git doesn't throw an error, giving a > pathspec with -L is documented as invalid. Thanks. I'm glad I sent the patch for review. > But you shouldn't need to add --follow here. Renames should be followe= d > by default when -L is used. (At least, that's what I see using Git > v2.13.3.) This seems to be new. Adding --follow appears to make git follow renames = here (2.7.4). Thanks. Cl=C3=A9ment. --t4dQsTTTmHipN8XGvf0BJ01me6OX3CpVL-- --1KsoF9row4tcAuk071c6QDvWtxIMX0UWl 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 iQIcBAEBCAAGBQJZhf/5AAoJEPqg+cTm90wjk1wP/RmL/0BJ+va4GjohTCdapIoR fNhw/xVYpknLUq91cljnQ2YHNQv09ozgSY9pYaeWjAPkzNtRMAh0S0OdGht1aNoq vFY/duOYYXD9iNevKEjqT6HTTKCGeYnOZPjFbuivWnbuBv4c5RJhA803mTcyfefK qHmv3vSMovL3VIm/HpumTuRNGEyg0V78+AhCPAzet/FOVAogPA6MywYTKc74uJrD DJli0N41gRJpgF1BiCsURkCuEfVWO1FYQpHyHMOieFTs9cNJpi12Q663OHEeWksq 40+4/J4/mEWj+SrpM58MKsHrbrtYlud3GBgYLpPLNqkIWY+NvrRDb0DgTlXzL4wa kUsYZvlipJg7h4FhF+aBRxwJGLnnQWkDtcCMyNTvaP4/7JJHsKR6fdeeXMHwbwW0 S9BXbOh5htiHBsyMSyBq/hiAgJfQVUfea5C7ubHijD+7yesNWYthQNJ10B06gH62 /E5M0EI7Qkl9M0Cw2dzYuyeHQGOEuoLS70gDVmXm8He58wYqsTARYBmDHirjw39J 43Z3U1qEe1CM6tmb8APYwAMeh4t5H4B5auY3ZoEKm+8nAVzP+Vhpsxjlf5UxowHZ CWau3HRObQiIpzTfYuCA1PKaShvcnCe/++IiaSWrZ0hTISn5lNczp2CV6rMC2rgj QiE7Q0jlPlzxzMQGVhs/ =fznv -----END PGP SIGNATURE----- --1KsoF9row4tcAuk071c6QDvWtxIMX0UWl-- From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 05 14:03:23 2017 Received: (at 27953) by debbugs.gnu.org; 5 Aug 2017 18:03:23 +0000 Received: from localhost ([127.0.0.1]:43649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1de3Q2-00058c-T6 for submit@debbugs.gnu.org; Sat, 05 Aug 2017 14:03:23 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:52030) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1de3Q1-00058U-8k for 27953@debbugs.gnu.org; Sat, 05 Aug 2017 14:03:21 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3xPs906XNdz1qrsq; Sat, 5 Aug 2017 20:03:16 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3xPs904fbjz3jgYN; Sat, 5 Aug 2017 20:03:16 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id BN7nRVcUOIa3; Sat, 5 Aug 2017 20:03:15 +0200 (CEST) X-Auth-Info: +sQm3li50bvrIthE5CNAg8tqUZvx10Z2y8NediOWtlVQHLZiIBjAI784jiLIYeG0 Received: from igel.home (ppp-88-217-9-22.dynamic.mnet-online.de [88.217.9.22]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Sat, 5 Aug 2017 20:03:15 +0200 (CEST) Received: by igel.home (Postfix, from userid 1000) id 2513E2C4577; Sat, 5 Aug 2017 20:03:15 +0200 (CEST) From: Andreas Schwab To: Eli Zaretskii Subject: Re: bug#27953: vc-region-history doesn't follow renames References: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> <3eb66411-a4c1-78e7-4ec1-324fee770702@live.com> <87poca9c7j.fsf@kyleam.com> <833796udwn.fsf@gnu.org> X-Yow: If I pull this SWITCH I'll be RITA HAYWORTH!! Or a SCIENTOLOGIST! Date: Sat, 05 Aug 2017 20:03:15 +0200 In-Reply-To: <833796udwn.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 05 Aug 2017 20:23:36 +0300") Message-ID: <874ltlj3j0.fsf@linux-m68k.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27953 Cc: clement.pitclaudel@live.com, Kyle Meyer , monnier@IRO.UMontreal.CA, 27953@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On Aug 05 2017, Eli Zaretskii wrote: > I have 2.10 here, so maybe this was fixed later, but I don't see > renames followed when -L is used. E.g., try this: > > git log -L77,83:admin/charsets/Makefile.in > > You will see Git claiming the only version which changed that is the > one in which Makefile.in was created from Makefile. Am I doing > something wrong, or expecting too much? The problem is that admin/charsets/Makefile.in is only similar to admin/charsets/Makefile by 32%, much below the default threshold. Try lisp/obsolete/html2text.el instead, for example. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 05 14:09:07 2017 Received: (at 27953) by debbugs.gnu.org; 5 Aug 2017 18:09:07 +0000 Received: from localhost ([127.0.0.1]:43657 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1de3Va-0005Gn-RE for submit@debbugs.gnu.org; Sat, 05 Aug 2017 14:09:06 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:60306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1de3VY-0005Ge-C8 for 27953@debbugs.gnu.org; Sat, 05 Aug 2017 14:09:04 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3xPsHb5G6Mz1qrfD; Sat, 5 Aug 2017 20:08:59 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3xPsHb3bJQz3jgYN; Sat, 5 Aug 2017 20:08:59 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id pHI9Kp1xptwp; Sat, 5 Aug 2017 20:08:58 +0200 (CEST) X-Auth-Info: B0LTvmqjfD1l64AmN3UHTnXbpShl38fT2utF6qjbFXzZvclSCSIdEEKBQrpwR+Qi Received: from igel.home (ppp-88-217-9-22.dynamic.mnet-online.de [88.217.9.22]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Sat, 5 Aug 2017 20:08:58 +0200 (CEST) Received: by igel.home (Postfix, from userid 1000) id 41AFE2C4577; Sat, 5 Aug 2017 20:08:58 +0200 (CEST) From: Andreas Schwab To: Kyle Meyer Subject: Re: bug#27953: vc-region-history doesn't follow renames References: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> <3eb66411-a4c1-78e7-4ec1-324fee770702@live.com> <87poca9c7j.fsf@kyleam.com> X-Yow: Let me do my TRIBUTE to FISHNET STOCKINGS... Date: Sat, 05 Aug 2017 20:08:58 +0200 In-Reply-To: <87poca9c7j.fsf@kyleam.com> (Kyle Meyer's message of "Sat, 05 Aug 2017 13:05:52 -0400") Message-ID: <87zibdhop1.fsf@linux-m68k.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27953 Cc: =?utf-8?Q?Cl=C3=A9ment?= Pit--Claudel , Stefan Monnier , 27953@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On Aug 05 2017, Kyle Meyer wrote: > But you shouldn't need to add --follow here. Renames should be followed > by default when -L is used. (At least, that's what I see using Git > v2.13.3.) Note that the default for diff.renames has changed in 2.9. Earlier versions may need to add -M. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 05 14:27:28 2017 Received: (at 27953) by debbugs.gnu.org; 5 Aug 2017 18:27:29 +0000 Received: from localhost ([127.0.0.1]:43669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1de3nI-0005gd-2Q for submit@debbugs.gnu.org; Sat, 05 Aug 2017 14:27:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1de3nG-0005gR-IN for 27953@debbugs.gnu.org; Sat, 05 Aug 2017 14:27:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1de3n7-0000G3-Iu for 27953@debbugs.gnu.org; Sat, 05 Aug 2017 14:27:17 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54128) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1de3n7-0000Fu-FG; Sat, 05 Aug 2017 14:27:13 -0400 Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:2754 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1de3n5-0007ly-LM; Sat, 05 Aug 2017 14:27:13 -0400 Date: Sat, 05 Aug 2017 21:26:53 +0300 Message-Id: <83zibduaz6.fsf@gnu.org> From: Eli Zaretskii To: Andreas Schwab In-reply-to: <874ltlj3j0.fsf@linux-m68k.org> (message from Andreas Schwab on Sat, 05 Aug 2017 20:03:15 +0200) Subject: Re: bug#27953: vc-region-history doesn't follow renames References: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> <3eb66411-a4c1-78e7-4ec1-324fee770702@live.com> <87poca9c7j.fsf@kyleam.com> <833796udwn.fsf@gnu.org> <874ltlj3j0.fsf@linux-m68k.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 27953 Cc: clement.pitclaudel@live.com, kyle@kyleam.com, monnier@IRO.UMontreal.CA, 27953@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Eli Zaretskii Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) > From: Andreas Schwab > Cc: Kyle Meyer , clement.pitclaudel@live.com, monnier@IRO.UMontreal.CA, 27953@debbugs.gnu.org > Date: Sat, 05 Aug 2017 20:03:15 +0200 > > > git log -L77,83:admin/charsets/Makefile.in > > > > You will see Git claiming the only version which changed that is the > > one in which Makefile.in was created from Makefile. Am I doing > > something wrong, or expecting too much? > > The problem is that admin/charsets/Makefile.in is only similar to > admin/charsets/Makefile by 32%, much below the default threshold. They look very similar to me... What about doc/emacs/Makefile.in? That should be almost 100% similar to its origin in man/Makefile.in, when it was moved from there, but "git -L" still cannot cross the boundary. From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 05 16:07:14 2017 Received: (at 27953) by debbugs.gnu.org; 5 Aug 2017 20:07:14 +0000 Received: from localhost ([127.0.0.1]:43710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1de5Lt-0001Uo-Vx for submit@debbugs.gnu.org; Sat, 05 Aug 2017 16:07:14 -0400 Received: from pb-smtp2.pobox.com ([64.147.108.71]:63863 helo=sasl.smtp.pobox.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1de5Ls-0001Ug-0C for 27953@debbugs.gnu.org; Sat, 05 Aug 2017 16:07:12 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 6665894C73; Sat, 5 Aug 2017 16:07:10 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:in-reply-to:references:date:message-id:mime-version :content-type; s=sasl; bh=18LcDTH1JRoT+YYrqyv7stq8N1w=; b=H4lXdF NWPAQIDu4sp5APAT087HAIdDWKeqDacuxgI60PHdaF+yTQWkf5KTxKCAouEC4x9y 8fnStFJoxBWaDXq2JyflQHYmJzkpzoPpHkKJlQeMOWKoNaea9aVCGvNEieScHkh8 ika9JOJEbqoPGl4CJyOFb2P5bKsjBuOuF2buo= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 5E25294C72; Sat, 5 Aug 2017 16:07:10 -0400 (EDT) Received: from localhost (unknown [24.60.167.92]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id D50D594C71; Sat, 5 Aug 2017 16:07:09 -0400 (EDT) From: Kyle Meyer To: Eli Zaretskii , Andreas Schwab Subject: Re: bug#27953: vc-region-history doesn't follow renames In-Reply-To: <83zibduaz6.fsf@gnu.org> References: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> <3eb66411-a4c1-78e7-4ec1-324fee770702@live.com> <87poca9c7j.fsf@kyleam.com> <833796udwn.fsf@gnu.org> <874ltlj3j0.fsf@linux-m68k.org> <83zibduaz6.fsf@gnu.org> Date: Sat, 05 Aug 2017 16:06:45 -0400 Message-ID: <87mv7daiei.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: A9C0F14A-7A19-11E7-90F5-9D2B0D78B957-24757444!pb-smtp2.pobox.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:in-reply-to:references:date:message-id:mime-version:content-type; s=mesmtp; bh=P/UZG2CwChQ1WS2SLx3B9J5mH6KwubDlgUNE5YhOclM=; b=Qt2GpBeOuYh7hINosqaGmi8f5PQQjBivgp9TlfnqjvXgoDBRBZKkfO2O0zHhSd+Mjch11gfBcO16KqNBgZIyFUArEEh0z4vShrzwoUFs4kE1VJgVlXMkpVEjkW+WN8dDBch/ClAcXZjtu7m9wD35H+RFa4jBawkRGpJAYD7f938= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27953 Cc: clement.pitclaudel@live.com, monnier@IRO.UMontreal.CA, 27953@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Eli Zaretskii writes: > What about doc/emacs/Makefile.in? That should be almost 100% similar > to its origin in man/Makefile.in, when it was moved from there, but > "git -L" still cannot cross the boundary. I believe the issue here is that the file was deleted in one commit (19e364e29) and then added in another (8cf51b2c2). -- Kyle From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 05 16:56:01 2017 Received: (at 27953-done) by debbugs.gnu.org; 5 Aug 2017 20:56:01 +0000 Received: from localhost ([127.0.0.1]:43757 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1de677-0002dh-1j for submit@debbugs.gnu.org; Sat, 05 Aug 2017 16:56:01 -0400 Received: from pb-smtp1.pobox.com ([64.147.108.70]:51508 helo=sasl.smtp.pobox.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1de675-0002dZ-AI for 27953-done@debbugs.gnu.org; Sat, 05 Aug 2017 16:55:59 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id E429A9DA55; Sat, 5 Aug 2017 16:55:58 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:in-reply-to:references:date:message-id:mime-version :content-type:content-transfer-encoding; s=sasl; bh=Dk0goi0eZqMq vx2qfZ2Ab481lWc=; b=T4opU5fk+ysCl4+zCrr8p+d6wjU0jPBBwDCwVq9WZTbz C1uv1dmYMOBGwURBQNV6gWhPRHdOyZu8JC6riExXiqClDH+m7CWHo8y8JOhrFilH fiyIwspp9joNeR9OT44yEQhqJ+phELwoN2LEmXZcOMtq0C2XOlOS/JjXQkasYcg= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id D4DB29DA54; Sat, 5 Aug 2017 16:55:58 -0400 (EDT) Received: from localhost (unknown [24.60.167.92]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 45BF69DA52; Sat, 5 Aug 2017 16:55:58 -0400 (EDT) From: Kyle Meyer To: =?utf-8?Q?Cl=C3=A9ment?= Pit--Claudel Subject: Re: bug#27953: vc-region-history doesn't follow renames In-Reply-To: <852633bf-6cb1-3efd-824b-c93e5307b034@live.com> References: <428b41c8-3687-2d49-bce8-1ef37ed4186c@live.com> <3eb66411-a4c1-78e7-4ec1-324fee770702@live.com> <87poca9c7j.fsf@kyleam.com> <852633bf-6cb1-3efd-824b-c93e5307b034@live.com> Date: Sat, 05 Aug 2017 16:55:57 -0400 Message-ID: <87k22hag4i.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Pobox-Relay-ID: 7B39D114-7A20-11E7-8886-FE4B1A68708C-24757444!pb-smtp1.pobox.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:in-reply-to:references:date:message-id:mime-version:content-type:content-transfer-encoding; s=mesmtp; bh=9Bf6f++lvDjUbb9h4R9zT5KtOLDeIodAIyz97yxcdjA=; b=cmGYHkiz7qfteO1neOfVd7z+oV62078fM1OESBjbQw75XVbo4oz4wnIwiXfwO643F5dVHle8wgRdPgVGs8fUL929MaBMJ3ezAcwmggilEBuDBdPkCTuACdDd3cE2Cp59amCoaMh6KVerKKohm2wfSprC6U1voBhXrNB1dpordGA= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27953-done Cc: Andreas Schwab , Stefan Monnier , 27953-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Cl=C3=A9ment Pit--Claudel writes: > On 2017-08-05 19:05, Kyle Meyer wrote: [...] >> But you shouldn't need to add --follow here. Renames should be followed >> by default when -L is used. (At least, that's what I see using Git >> v2.13.3.) > > This seems to be new. Adding --follow appears to make git follow renames = here (2.7.4). OK, just to check with a concrete example: When you run git log -L37,57:test/lisp/ls-lisp-tests.el 9df49cddae 565cfd9f6 isn't listed as the earliest commit? When I run that with Git 2.8.5 (and 2.13.3), I see 565cfd9f6 as the earliest commit, indicating that Git does detect the rename (test/lisp/ls-lisp.el =3D> test/lisp/ls-lisp-tests.el). I wasn't able to try with your version, 2.7.4, because I couldn't get it to build. --=20 Kyle From unknown Sat Aug 16 13:47:43 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 03 Sep 2017 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator