From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 09 10:32:06 2022 Received: (at submit) by debbugs.gnu.org; 9 Jun 2022 14:32:06 +0000 Received: from localhost ([127.0.0.1]:47247 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nzJCd-0001Ht-2E for submit@debbugs.gnu.org; Thu, 09 Jun 2022 10:32:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:48294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nzEsu-0000jB-6A for submit@debbugs.gnu.org; Thu, 09 Jun 2022 05:55:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzEsk-0000pY-GX for bug-gnu-emacs@gnu.org; Thu, 09 Jun 2022 05:55:18 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:40464) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nzEsi-0005Id-LL for bug-gnu-emacs@gnu.org; Thu, 09 Jun 2022 05:55:14 -0400 Received: by mail-ej1-x634.google.com with SMTP id fu3so44886623ejc.7 for ; Thu, 09 Jun 2022 02:55:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=08J8Qa8/r5yuXybKvXst49xc4DijDZDBCyjw5kQ0bjU=; b=XnSnlBo53OU3oRhqyd/cdi4USlOSzHRR6ixXH4f8m896mhbobF8Ucv5Q9iHfx+k1CT VRYJEj+NeGTC4sOlpySI7g+6oJ/F5rq9RGWW3eFE982KXbVmG9CGT96lrgB1Dbay+TeE saMv8r1nYuc93dXVx4//2gpVPB1qWOn494NH9UJ8BQqW+ClO3jMH3yd4I/JHDy3vnzBA XPrkMeNt0VbBhEfgvsjXBgIUs4uxmWZ7Wup0UBydcdAgblHeqx4W26STduNY410tp5m5 zDN73wghmIdZ9eddfsRyY+s5LL/Vlm9iKkMEr20Wywd9wAdgSp+vTRZsh3foy68Dzk1E 2EsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=08J8Qa8/r5yuXybKvXst49xc4DijDZDBCyjw5kQ0bjU=; b=Pn54ElkNq+MNEhd/qt+Ic+97VpNxsqLshEodum8dqI03jyxBvAR7Gf7h9YiqeQIVv6 ZMgkGjBGf8InX+6htTU5tf2pF8bfaR9R1cafWwx118/xS+dA5fsEJy2iWHKF4CNM6ETR aZVw89u5YvwfPw7mFGRwnvlApB4PBLh1ysKw6sG1wu5S3B2U1t+MpQJt8SUwWTg9ZPX2 8gPglYt3tfetCp5YUkNhow5LIiiwlPQB6opz11uwod+wI0z8YLgaIYEx7zp3X8EEuR29 D0NA8D51buGhCx4a3zhbYcuQ0QP6Uo9nQ0gHVc8udpH+2XB9WsOWvCdYtORYNdJtVEg1 P7WA== X-Gm-Message-State: AOAM531dJ9eSPAhWcprCgxfuMy2Dw3+mYMcgLv6Z5dD71CdML4Yoh+7R BJktkcBkA1d+o1D1hN3/T9ffPUh0ulGmRXRIXgS2A1HQFo8= X-Google-Smtp-Source: ABdhPJyODkrqsRP1QXn1WIb4YmP0SShfSfhQWwMLVU3BDDKFjz1Xz5lLRqs2g4XmQxh7JZlnNmwwP04BLPTMrdqbwxg= X-Received: by 2002:a17:906:d554:b0:6f5:2242:a499 with SMTP id cr20-20020a170906d55400b006f52242a499mr35761535ejc.488.1654768510363; Thu, 09 Jun 2022 02:55:10 -0700 (PDT) MIME-Version: 1.0 From: =?UTF-8?Q?Nicol=C3=A1s_Ojeda_B=C3=A4r?= Date: Thu, 9 Jun 2022 11:54:44 +0200 Message-ID: Subject: 27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames To: bug-gnu-emacs@gnu.org Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=n.oje.bar@gmail.com; helo=mail-ej1-x634.google.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Thu, 09 Jun 2022 10:32:01 -0400 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: -2.3 (--) When pressing 'C-x v l' in a git versioned file that has been renamed, it is possible to get a full history (ie including renames) by setting 'vc-git-print-log-follow' to t. However, if doing this, the functions - 'd' (log-view-diff) - 'f' (log-view-find-revision) - 'a' (log-view-annotate-revision) stop working with revisions "before" the rename. There is a previous discussion of this problem in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=8756 but the discussion ends by suggesting to open a new bug report about this issue, which I am doing here. In GNU Emacs 27.1 (build 1, x86_64-w64-mingw32) of 2020-08-21 built on CIRROCUMULUS Repository revision: 86d8d76aa36037184db0b2897c434cdaab1a9ae8 Repository branch: HEAD Windowing system distributor 'Microsoft Corp.', version 10.0.22000 System Description: Microsoft Windows 10 Pro (v10.0.2009.22000.708) Recent messages: process Mark saved where search started Saving file c:/cygwin64/home/nojebar/mlfi/applications/scheduler/main.mf... Mark set Wrote c:/cygwin64/home/nojebar/mlfi/applications/scheduler/main.mf Wrote c:/cygwin64/home/nojebar/mlfi/applications/scheduler/main.mf (3 pending errors, use C-c C-x to jump) Mark saved where search started [3 times] Mark set Mark saved where search started [13 times] Quit [2 times] Quit Configured using: 'configure --without-dbus --host=x86_64-w64-mingw32 --without-compress-install 'CFLAGS=-O2 -static'' Configured features: XPM JPEG TIFF GIF PNG RSVG SOUND NOTIFY W32NOTIFY ACL GNUTLS LIBXML2 HARFBUZZ ZLIB TOOLKIT_SCROLL_BARS MODULES THREADS JSON PDUMPER LCMS2 GMP Important settings: value of $LANG: fr_FR.UTF-8 locale-coding-system: cp1252 Major mode: caml Minor modes in effect: shell-dirtrack-mode: t merlin-mode: t save-place-mode: t winner-mode: t savehist-mode: t show-paren-mode: t delete-selection-mode: t display-time-mode: t global-auto-revert-mode: t tooltip-mode: t global-eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t size-indication-mode: t column-number-mode: t line-number-mode: t transient-mark-mode: t Load-path shadows: c:/cygwin64/home/nojebar/mlfi/mlfi-ins/share/emacs/site-lisp/ocp-indent hides ~/scripts/install/emacs/ocp-indent c:/cygwin64/home/nojebar/.emacs.d/elpa/jsonrpc-1.0.15/jsonrpc hides c:/Program Files/emacs-27.1/share/emacs/27.1/lisp/jsonrpc c:/cygwin64/home/nojebar/.emacs.d/elpa/xref-1.4.1/xref hides c:/Program Files/emacs-27.1/share/emacs/27.1/lisp/progmodes/xref c:/cygwin64/home/nojebar/.emacs.d/elpa/project-0.8.1/project hides c:/Program Files/emacs-27.1/share/emacs/27.1/lisp/progmodes/project c:/cygwin64/home/nojebar/.emacs.d/elpa/flymake-1.2.2/flymake hides c:/Program Files/emacs-27.1/share/emacs/27.1/lisp/progmodes/flymake c:/cygwin64/home/nojebar/.emacs.d/elpa/seq-2.23/seq hides c:/Program Files/emacs-27.1/share/emacs/27.1/lisp/emacs-lisp/seq c:/cygwin64/home/nojebar/.emacs.d/elpa/eldoc-1.12.0/eldoc hides c:/Program Files/emacs-27.1/share/emacs/27.1/lisp/emacs-lisp/eldoc ~/scripts/install/emacs/cl-lib hides c:/Program Files/emacs-27.1/share/emacs/27.1/lisp/emacs-lisp/cl-lib Features: (shadow sort mail-extr emacsbug message rmc puny format-spec rfc822 mml mml-sec epa epg epg-config gnus-util rmail rmail-loaddefs text-property-search time-date mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils add-log log-view pcvs-util help-fns radix-tree vc-annotate ffap grep thingatpt cl-extra help-mode shell pcomplete smerge-mode diff vc vc-dispatcher misearch multi-isearch merlin-xref xref project merlin-cap merlin pcase caml-types crm caml advice rx compile derived imenu cygwin-mount ange-ftp comint ansi-color ocamlformat ocp-indent caml-font vc-git diff-mode easy-mmode dired-x dired dired-loaddefs saveplace edmacro kmacro winner ring savehist paren delsel time autorevert filenotify info proof-site proof-autoloads package easymenu browse-url url-handlers url-parse auth-source cl-seq eieio eieio-core cl-macs eieio-loaddefs password-cache json subr-x map url-vars seq byte-opt gv bytecomp byte-compile cconv cl-loaddefs cl-lib tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel dos-w32 ls-lisp disp-table term/w32-win w32-win w32-vars term/common-win tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode elisp-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core term/tty-colors frame minibuffer cl-generic cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite charscript charprop case-table epa-hook jka-cmpr-hook help simple abbrev obarray cl-preloaded nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote threads w32notify w32 lcms2 multi-tty make-network-process emacs) Memory information: ((conses 16 298590 19356) (symbols 48 12729 1) (strings 32 40782 1936) (string-bytes 1 1406019) (vectors 16 22528) (vector-slots 8 276819 12620) (floats 8 104 554) (intervals 56 42748 0) (buffers 1000 42)) From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 10 13:59:29 2022 Received: (at 55871) by debbugs.gnu.org; 10 Jun 2022 17:59:29 +0000 Received: from localhost ([127.0.0.1]:51287 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nziuv-0005st-9M for submit@debbugs.gnu.org; Fri, 10 Jun 2022 13:59:29 -0400 Received: from mail-ej1-f41.google.com ([209.85.218.41]:33635) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nziUm-0005Ax-7z for 55871@debbugs.gnu.org; Fri, 10 Jun 2022 13:32:43 -0400 Received: by mail-ej1-f41.google.com with SMTP id bg6so34961256ejb.0 for <55871@debbugs.gnu.org>; Fri, 10 Jun 2022 10:32:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=85TaIDnWC7pSVMPkFTa/ThHfgvPmhcBrx+6xtZdJqlk=; b=AEumoZ9GBrF81AWB9lH5G3l230+nYbbM5dA/0BrZX0n30R7/THTtpet5le3OOx6/+O NTm+8mbCYyFA2bomXXDeOquwzbgOnu7BIU2h4R3gFAvJtbpAJVOn9uBC/zHp2Op9oHYu A37/8GOiWE9urjqQl1AxGobqTlAeElrTHMevpkWMGIMdbmIQTqd87HmeV/s5CjaV3Xu5 vSD7aaoj+6xYOhCIDCrmKs0oHw6fCBzuhTvujq82QZYNtT5UbnLezZOy0YlZ9WCnQQMK KuXbuH/eazMAtNQy4xcbzF6RI19escoFq2lR11O9gmXmNQwXSZsF2HiU5Q9eWIp6O/yh T03Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=85TaIDnWC7pSVMPkFTa/ThHfgvPmhcBrx+6xtZdJqlk=; b=kTvNxbv/+QDd/IKcz/qkoViSURai751EzcbKfZQYYURVx+tCjbrxJZnF1KRk/w4tOl XID/bwFP+7C2gnLO1iI0uOUJSUx1Zr/YGWntOjueEKKvICTEhAdXydf2IBWAVkHvactG h0hrSo5V+n7mWtfvT21wHuEPsC2plCZxlpHrqqODAsIsuAX19j8KdgXwIDIdw3uFAxV8 0qBSN5/3q8Mw9DR2vCS62MEdhgJT6MUhAOYNJbSrljymCVg9yw5FO+1yGVKdMGuStVAU wdfxpog/UiK18qR0DYvvvPK4037oC3tt0Lzzn3E9HN3Zko+gjbDhHZD4P9TqLbmRuj5e Dq7g== X-Gm-Message-State: AOAM533TsU3JXloYdNm8IuOgWIJZlRuXzY6xqNvtDIze+3wenn+Ul7vg ZUo5n5BONweBNwWn1BpTkR613GxhyeEi9DTqP+DcXb1WbPI= X-Google-Smtp-Source: ABdhPJxRwKuJQ4io1vjBTifvapfVer+5W/8xaAzQPiLiyNWJYS0yQrzEhETSZyfjlHWM+NnSFK5vIwwDWluKRR7mtYk= X-Received: by 2002:a17:906:d554:b0:6f5:2242:a499 with SMTP id cr20-20020a170906d55400b006f52242a499mr42263131ejc.488.1654882341712; Fri, 10 Jun 2022 10:32:21 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: =?UTF-8?Q?Nicol=C3=A1s_Ojeda_B=C3=A4r?= Date: Fri, 10 Jun 2022 19:31:55 +0200 Message-ID: Subject: Re: bug#55871: Acknowledgement (27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames) To: 55871@debbugs.gnu.org Content-Type: multipart/mixed; boundary="0000000000001f97c305e11b529a" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 55871 X-Mailman-Approved-At: Fri, 10 Jun 2022 13:59:28 -0400 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 (-) --0000000000001f97c305e11b529a Content-Type: text/plain; charset="UTF-8" Dear all, Attached is a patch that solves some of the problems in this issue (not all). Its main feature is that it should not modify anything if you are not using `vc-git-print-log-follow`. If you are, the patch makes it possible to use `a`, `f` and `d` from inside the `*vc-change-log*` buffer. The patch itself is very much based on the one proposed in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=8756#53, with some changes to make sure that nothing changes if `vc-git-print-log-follow` is not being used. Additionally, a horrible HACK (see commit message) is used to allow `vc-git.el` to discriminate between `d` and `D` in the `*vc-change-log*` buffer, as these two functions require different Git commands to be executed when following renames (this is also discussed in the just linked bug report). Cheers, Nicolas --0000000000001f97c305e11b529a Content-Type: application/octet-stream; name="0001-vc-git.el-better-support-for-follow-mode.patch" Content-Disposition: attachment; filename="0001-vc-git.el-better-support-for-follow-mode.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l48q00ii0 RnJvbSBkNTJmMTY2MDdmY2NhNGY4MGYxNzIwYjg2M2FiOTIwZDE1ZDljMGJiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBub2plYmFyIDxuaWNvbGFzLm9qZWRhLmJhckBsZXhpZmkuY29t PgpEYXRlOiBGcmksIDEwIEp1biAyMDIyIDE2OjE2OjI2ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g dmMtZ2l0LmVsOiBiZXR0ZXIgc3VwcG9ydCBmb3IgImZvbGxvdyIgbW9kZQoKKiBsaXNwL3ZjL3Zj LWdpdC5lbCAodmMtcHJpbnQtbG9nKTogZ2VuZXJhdGUgbWFwIGJldHdlZW4gU0hBLTEncyBhbmQK ZmlsZW5hbWVzIHdoZW4gcHJpbnRpbmcgdGhlIGxvZyBvZiBhIHNpbmdsZSBmaWxlIGluICJmb2xs b3ciIG1vZGUuCih2Yy1naXQtZmluZC1yZXZpc2lvbik6IHVzZSBtYXBwaW5nIHRvIGZpbmQgdGhl IGNvcnJlY3QgZmlsZW5hbWUgdG8KY2hlY2tvdXQgd2hlbiBwcmVzc2luZyAnZicgaW4gJyp2Yy1j aGFuZ2UtbG9nKicuCih2Yy1naXQtZGlmZik6IHVzZSBtYXBwaW5nIHRvIGZpbmQgdGhlIGNvcnJl Y3QgZmlsZW5hbWVzIHRvIGRpZmYgd2hlbgpjb21wdXRpbmcgZGlmZnMgYmV0d2VlbiB0d28gdmVy c2lvbnMgb2YgYSBmaWxlIGZyb20gdGhlCicqdmMtY2hhbmdlLWxvZyonIGJ1ZmZlci4KKHZjLWdp dC1hbm5vdGF0ZS1jb21tYW5kKTogdXNlIG1hcHBpbmcgdG8gcGFzcyB0aGUgcmlnaHQKZmlsZW5h bWUgd2hlbiBwcmVzc2luZyAnYScgaW4gJyp2Yy1jaGFuZ2UtbG9nKicuCih2Yy1naXQtcHJldmlv dXMtcmV2aXNpb24pOiB1c2UgbWFwcGluZyB0byBmaW5kIHByZXZpb3VzIHJldmlzaW9uIG9mIGEK ZmlsZSB0aGF0IGhhcyBiZWVuIHJlbmFtZWQuIEFkZGl0aW9uYWxseSBhIGhvcnJpYmxlIGhhY2sg KHNlZSBuZXh0CnBvaW50KSBpcyBkb25lIHNvIHRoYXQgdGhpcyBmdW5jdGlvbiBjYW4gZGlmZmVy ZW50aWF0ZSBiZXR3ZWVuICdkJyBhbmQKJ0QnICh3aG9sZSBjaGFuZ2VzZXQgZGlmZmluZykgc2lu Y2UgdGhlc2UgdHdvIG9wZXJhdGlvbnMgcmVxdWlyZQpkaWZmZXJlbnQgR2l0IGNvbW1hbmRzIHRv IGJlIGV4ZWN1dGVkLiBUaGlzIG1ha2VzIGl0IHBvc3NpYmxlIHRvIHVzZQp0aGUgJ2QnIGNvbW1h bmQgaW4gJyp2Yy1jaGFuZ2UtbG9nKicgYWZ0ZXIgcmVuYW1pbmcgYSBmaWxlLgoKKiBsaXNwL3Zj L2xvZy12aWV3LmVsIChsb2ctdmlldy1kaWZmLWNvbW1vbik6IHNldCBhIGJ1ZmZlci1sb2NhbAp2 YXJpYWJsZSAnZ2l0LWxvZy12aWV3LWRpZmYtd2hvbGUtY2hhbmdlc2V0JyB0byBsZXQgdmMtZ2l0 LmVsCmRpZmZlcmVudGlhdGUgYmV0d2VlbiAnZCcgYW5kICdEJy4KLS0tCiBsaXNwL3ZjL2xvZy12 aWV3LmVsIHwgICAxICsKIGxpc3AvdmMvdmMtZ2l0LmVsICAgfCAxMDEgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKystLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgODkgaW5zZXJ0 aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC92Yy9sb2ctdmlldy5l bCBiL2xpc3AvdmMvbG9nLXZpZXcuZWwKaW5kZXggNDE1YjE1NjRlZC4uOTY4NTg4MzUwNCAxMDA2 NDQKLS0tIGEvbGlzcC92Yy9sb2ctdmlldy5lbAorKysgYi9saXNwL3ZjL2xvZy12aWV3LmVsCkBA IC02MDEsNiArNjAxLDcgQEAgbG9nLXZpZXctZGlmZi1jaGFuZ2VzZXQKICAgICAobG9nLXZpZXct ZGlmZi1jb21tb24gYmVnIGVuZCB0KSkpCiAKIChkZWZ1biBsb2ctdmlldy1kaWZmLWNvbW1vbiAo YmVnIGVuZCAmb3B0aW9uYWwgd2hvbGUtY2hhbmdlc2V0KQorICAoc2V0cS1sb2NhbCBnaXQtbG9n LXZpZXctZGlmZi13aG9sZS1jaGFuZ2VzZXQgd2hvbGUtY2hhbmdlc2V0KQogICAobGV0KiAoKHRv IChsb2ctdmlldy1jdXJyZW50LXRhZyBiZWcpKQogICAgICAgICAgKGZyLWVudHJ5IChsb2ctdmll dy1jdXJyZW50LWVudHJ5IGVuZCkpCiAgICAgICAgICAoZnIgKGNhZHIgZnItZW50cnkpKSkKZGlm ZiAtLWdpdCBhL2xpc3AvdmMvdmMtZ2l0LmVsIGIvbGlzcC92Yy92Yy1naXQuZWwKaW5kZXggODkz NzQ1NGQxMS4uODYzNDc4NWE5NCAxMDA2NDQKLS0tIGEvbGlzcC92Yy92Yy1naXQuZWwKKysrIGIv bGlzcC92Yy92Yy1naXQuZWwKQEAgLTk2OSwxOCArOTY5LDc3IEBAIHZjLWdpdC1jaGVja2luCiAJ CSAgICAoaWYgb25seSAobGlzdCAiLS1vbmx5IiAiLS0iKSAnKCItYSIpKSkpKQogICAgIChpZiAo YW5kIG1zZy1maWxlIChmaWxlLWV4aXN0cy1wIG1zZy1maWxlKSkgKGRlbGV0ZS1maWxlIG1zZy1m aWxlKSkpKQogCis7OzsgJy0tZm9sbG93JyBIQU5ETElORworCisoZGVmdmFyIHZjLWdpdC0tc2hh bGlzdC1yYXcgbmlsKQorKGRlZnZhciB2Yy1naXQtLXNoYWxpc3QgbmlsKQorCisoZGVmdW4gdmMt Z2l0LS1tYWtlLXNoYWxpc3QgKGJ1ZmZlciBmaWxlcyBzdGFydC1yZXZpc2lvbiBsaW1pdCkKKyAg IlN0b3JlIG5ld2xpbmUtc2VwYXJhdGVkIGxpc3Qgb2YgcmV2aXNpb24gaGFzaGVzIGFuZCBmaWxl IG5hbWVzCitpbiB2Yy1naXQtLXNoYWxpc3QtcmF3IGJ1ZmZlci1sb2NhbCB2YXJpYWJsZS4iCisg IChzZXRxLWxvY2FsIHZjLWdpdC0tc2hhbGlzdC1yYXcgbmlsKQorICAoc2V0cS1sb2NhbCB2Yy1n aXQtLXNoYWxpc3QgbmlsKQorICAod2l0aC10ZW1wLWJ1ZmZlcgorICAgIChzZXQtcHJvY2Vzcy1m aWx0ZXIKKyAgICAgKGFwcGx5ICMndmMtZ2l0LWNvbW1hbmQgbmlsCisgICAgICAgICAgICAnYXN5 bmMgZmlsZXMKKyAgICAgICAgICAgIChhcHBlbmQKKyAgICAgICAgICAgICAnKCJsb2ciCisgICAg ICAgICAgICAgICAiLS1mb2xsb3ciCisgICAgICAgICAgICAgICAiLS1uYW1lLW9ubHkiCisgICAg ICAgICAgICAgICAiLS1wcmV0dHk9dGZvcm1hdDolSCIKKyAgICAgICAgICAgICAgICItLW5vLWNv bG9yIikKKyAgICAgICAgICAgICA7OyBUYWlsIHJldmlzaW9uIG11c3Qgbm93IGl0cyBwYXJlbnQK KyAgICAgICAgICAgICAod2hlbiBsaW1pdCAobGlzdCAiLW4iIChmb3JtYXQgIiVzIiAoMSsgbGlt aXQpKSkpCisgICAgICAgICAgICAgKHdoZW4gc3RhcnQtcmV2aXNpb24gKGxpc3Qgc3RhcnQtcmV2 aXNpb24pKQorICAgICAgICAgICAgICcoIi0tIikpKQorICAgICAobGFtYmRhIChfcCBzKQorICAg ICAgICh3aXRoLWN1cnJlbnQtYnVmZmVyIGJ1ZmZlcgorICAgICAgICAgKHNldHEtbG9jYWwKKyAg ICAgICAgICB2Yy1naXQtLXNoYWxpc3QtcmF3CisgICAgICAgICAgKHJlcGxhY2UtcmVnZXhwLWlu LXN0cmluZworICAgICAgICAgICAiXG5cbiIgIlxuIgorICAgICAgICAgICAoY29uY2F0IHZjLWdp dC0tc2hhbGlzdC1yYXcgcykpKSkpKSkpCisKKyhkZWZ1biB2Yy1naXQtLXNoYWxpc3QgKCkKKyAg IlJldHVybiBhbHRlcm5hdGluZyBsaXN0IG9mIFNIQTEgaGFzaGVzIGFuZCBmaWxlIG5hbWVzLgor VGhlIGxpc3QgY29udGFpbnMgY29tbWl0IGhhc2hlcyBhbmQgaGlzdG9yaWNhbCBuYW1lcyBmb3Ig YSBmaWxlCitpbiB0aGUgY3VycmVudCBjaGFuZ2UgbG9nIGJ1ZmZlci4iCisgIChsZXQgKCh2Yy1j aGFuZ2UtbG9nIChnZXQtYnVmZmVyICIqdmMtY2hhbmdlLWxvZyoiKSkpCisgICAgKHdoZW4gdmMt Y2hhbmdlLWxvZworICAgICAgKHdpdGgtY3VycmVudC1idWZmZXIgdmMtY2hhbmdlLWxvZworICAg ICAgICAoY29uZAorICAgICAgICAgKHZjLWdpdC0tc2hhbGlzdCB2Yy1naXQtLXNoYWxpc3QpCisg ICAgICAgICAodmMtZ2l0LS1zaGFsaXN0LXJhdworICAgICAgICAgIChzZXRxLWxvY2FsIHZjLWdp dC0tc2hhbGlzdAorICAgICAgICAgICAgICAgICAgICAgIChzcGxpdC1zdHJpbmcgdmMtZ2l0LS1z aGFsaXN0LXJhdyAiXG4iKSkpKSkpKSkKKworKGRlZnVuIHZjLWdpdC0tcmV2LXRvLWZpbGVuYW1l IChyZXYpCisgICJSZXR1cm4gYSBoaXN0b3JpY2FsIGZpbGUgbmFtZSBmb3IgdGhlIGZpbGUgaW4g UkVWLiIKKyAgKHdoZW4gcmV2CisgICAgKHNldHEgcmV2ICh2Yy1naXQtLXJldi1wYXJzZSByZXYp KQorICAgIChjYWRyIChtZW1iZXIgcmV2ICh2Yy1naXQtLXNoYWxpc3QpKSkpKQorCisoZGVmdW4g dmMtZ2l0LS1yZXYtdG8tcHJldmlvdXMtcmV2IChyZXYpCisgICJSZXR1cm4gdGhlIHJldmlzaW9u IGJlZm9yZSBSRVYgYWNjb3JkaW5nIHRvIGhpc3RvcmljYWwgZmlsZQorbmFtZSBkYXRhLiIKKyAg KHdoZW4gcmV2CisgICAgKHNldHEgcmV2ICh2Yy1naXQtLXJldi1wYXJzZSByZXYpKQorICAgIChj YXIgKGNkZHIgKG1lbWJlciByZXYgKHZjLWdpdC0tc2hhbGlzdCkpKSkpKQorCiAoZGVmdW4gdmMt Z2l0LWZpbmQtcmV2aXNpb24gKGZpbGUgcmV2IGJ1ZmZlcikKICAgKGxldCogKHByb2Nlc3MtZmls ZS1zaWRlLWVmZmVjdHMKIAkgKGNvZGluZy1zeXN0ZW0tZm9yLXJlYWQgJ2JpbmFyeSkKIAkgKGNv ZGluZy1zeXN0ZW0tZm9yLXdyaXRlICdiaW5hcnkpCiAJIChmdWxsbmFtZQotCSAgKGxldCAoKGZu ICh2Yy1naXQtLXJ1bi1jb21tYW5kLXN0cmluZwotCQkgICAgIGZpbGUgImxzLWZpbGVzIiAiLXoi ICItLWZ1bGwtbmFtZSIgIi0tIikpKQotCSAgICA7OyBscy1maWxlcyBkb2VzIG5vdCByZXR1cm4g YW55dGhpbmcgd2hlbiBsb29raW5nIGZvciBhCi0JICAgIDs7IHJldmlzaW9uIG9mIGEgZmlsZSB0 aGF0IGhhcyBiZWVuIHJlbmFtZWQgb3IgcmVtb3ZlZC4KLQkgICAgKGlmIChzdHJpbmc9IGZuICIi KQotCQkoZmlsZS1yZWxhdGl2ZS1uYW1lIGZpbGUgKHZjLWdpdC1yb290IGRlZmF1bHQtZGlyZWN0 b3J5KSkKLQkgICAgICAoc3Vic3RyaW5nIGZuIDAgLTEpKSkpKQorICAgICAgICAgIChvciAodmMt Z2l0LS1yZXYtdG8tZmlsZW5hbWUgcmV2KQorCSAgICAgIChsZXQgKChmbiAodmMtZ2l0LS1ydW4t Y29tbWFuZC1zdHJpbmcKKwkJICAgICAgICAgZmlsZSAibHMtZmlsZXMiICIteiIgIi0tZnVsbC1u YW1lIiAiLS0iKSkpCisJICAgICAgICA7OyBscy1maWxlcyBkb2VzIG5vdCByZXR1cm4gYW55dGhp bmcgd2hlbiBsb29raW5nIGZvciBhCisJICAgICAgICA7OyByZXZpc2lvbiBvZiBhIGZpbGUgdGhh dCBoYXMgYmVlbiByZW5hbWVkIG9yIHJlbW92ZWQuCisJICAgICAgICAoaWYgKHN0cmluZz0gZm4g IiIpCisJICAgICAgICAgICAgKGZpbGUtcmVsYXRpdmUtbmFtZSBmaWxlICh2Yy1naXQtcm9vdCBk ZWZhdWx0LWRpcmVjdG9yeSkpCisJICAgICAgICAgIChzdWJzdHJpbmcgZm4gMCAtMSkpKSkpKQog ICAgICh2Yy1naXQtY29tbWFuZAogICAgICBidWZmZXIgMAogICAgICBuaWwKQEAgLTExODIsNiAr MTI0MSw3IEBAIHZjLWdpdC1wcmludC1sb2cKICAgICAgICAgICAgICAgICAgIDs7ICItLWZvbGxv dyIgb24gZGlyZWN0b3JpZXMgb3IgbXVsdGlwbGUgZmlsZXMgaXMgYnJva2VuCiAgICAgICAgICAg ICAgICAgICA7OyBodHRwczovL2RlYmJ1Z3MuZ251Lm9yZy9jZ2kvYnVncmVwb3J0LmNnaT9idWc9 ODc1NgogICAgICAgICAgICAgICAgICAgOzsgaHR0cHM6Ly9kZWJidWdzLmdudS5vcmcvY2dpL2J1 Z3JlcG9ydC5jZ2k/YnVnPTE2NDIyCisgICAgICAgICAgICAgICAgICAodmMtZ2l0LS1tYWtlLXNo YWxpc3QgYnVmZmVyIGZpbGVzIHN0YXJ0LXJldmlzaW9uIGxpbWl0KQogICAgICAgICAgICAgICAg ICAgKGxpc3QgIi0tZm9sbG93IikpCiAJCSh3aGVuIHNob3J0bG9nCiAJCSAgYCgiLS1ncmFwaCIg Ii0tZGVjb3JhdGUiICItLWRhdGU9c2hvcnQiCkBAIC0xNDIzLDYgKzE0ODMsMTMgQEAgdmMtZ2l0 LWRpZmYKICAgICAgICAgKHVubGVzcyByZXYxIChzZXRxIHJldjEgIjRiODI1ZGM2NDJjYjZlYjlh MDYwZTU0YmY4ZDY5Mjg4ZmJlZTQ5MDQiKSkKICAgICAgIChzZXRxIGNvbW1hbmQgImRpZmYtaW5k ZXgiKQogICAgICAgKHVubGVzcyByZXYxIChzZXRxIHJldjEgIkhFQUQiKSkpCisgICAgKGxldCAo KGZpbGUxICh2Yy1naXQtLXJldi10by1maWxlbmFtZSByZXYxKSkKKyAgICAgICAgICAoZmlsZTIg KHZjLWdpdC0tcmV2LXRvLWZpbGVuYW1lIHJldjIpKSkKKyAgICAgICh3aGVuIChhbmQgZmlsZTEg ZmlsZTIpCisgICAgICAgIDs7IFJ1biBkaWZmIGZyb20gdGhlIHJlcG9zaXRvcnkgcm9vdCBiZWNh dXNlIG91ciBmaWxlIG5hbWVzIGFyZQorICAgICAgICA7OyByZWxhdGl2ZSB0byBpdAorICAgICAg ICAoc2V0cSBkZWZhdWx0LWRpcmVjdG9yeSAodmMtZ2l0LXJvb3QgZGVmYXVsdC1kaXJlY3Rvcnkp CisgICAgICAgICAgICAgIGZpbGVzIChsaXN0IGZpbGUxIGZpbGUyKSkpKQogICAgIChpZiB2Yy1n aXQtZGlmZi1zd2l0Y2hlcwogICAgICAgICAoYXBwbHkgIyd2Yy1naXQtY29tbWFuZCAob3IgYnVm ZmVyICIqdmMtZGlmZioiKQogCSAgICAgICAxIDsgYnVnIzIxOTY5CkBAIC0xNDU5LDcgKzE1MjYs OSBAQCB2Yy1naXQtcmV2aXNpb24tY29tcGxldGlvbi10YWJsZQogCiAoZGVmdW4gdmMtZ2l0LWFu bm90YXRlLWNvbW1hbmQgKGZpbGUgYnVmICZvcHRpb25hbCByZXYpCiAgICh2Yy1naXQtLWFzY2lp ZnktY29kaW5nLXN5c3RlbSkKLSAgKGxldCAoKG5hbWUgKGZpbGUtcmVsYXRpdmUtbmFtZSBmaWxl KSkpCisgIChsZXQgKChuYW1lICh2Yy1naXQtLXJldi10by1maWxlbmFtZSByZXYpKSkKKyAgICAo aWYgbmFtZSAoc2V0cSBkZWZhdWx0LWRpcmVjdG9yeSAodmMtZ2l0LXJvb3QgZGVmYXVsdC1kaXJl Y3RvcnkpKQorICAgICAgKHNldHEgbmFtZSAoZmlsZS1yZWxhdGl2ZS1uYW1lIGZpbGUpKSkKICAg ICAoYXBwbHkgIyd2Yy1naXQtY29tbWFuZCBidWYgJ2FzeW5jIG5pbCAiYmxhbWUiICItLWRhdGU9 c2hvcnQiCiAJICAgKGFwcGVuZCAodmMtc3dpdGNoZXMgJ2dpdCAnYW5ub3RhdGUpCiAJCSAgIChs aXN0IHJldiAiLS0iIG5hbWUpKSkpKQpAQCAtMTUwNSw2ICsxNTc0LDEwIEBAIHZjLWdpdC1yZXRy aWV2ZS10YWcKIAogOzs7IE1JU0NFTExBTkVPVVMKIAorOzsgSEFDSzogbGV0IGxvZy12aWV3LmVs IGluZm9ybSB2Yy1naXQuZWwgd2hldGhlciB3ZSBhcmUgZG9pbmcgYQorOzsgIndob2xlIGNoYW5n ZXNldCIgZGlmZiBvciBub3QuCisoZGVmdmFyIGdpdC1sb2ctdmlldy1kaWZmLXdob2xlLWNoYW5n ZXNldCBuaWwpCisKIChkZWZ1biB2Yy1naXQtcHJldmlvdXMtcmV2aXNpb24gKGZpbGUgcmV2KQog ICAiR2l0LXNwZWNpZmljIHZlcnNpb24gb2YgYHZjLXByZXZpb3VzLXJldmlzaW9uJy4iCiAgIChp ZiBmaWxlCkBAIC0xNTIwLDExICsxNTkzLDEzIEBAIHZjLWdpdC1wcmV2aW91cy1yZXZpc2lvbgog ICAgICAgICAgICAgICAgICAgICAgICAgICAgKHBvaW50KQogICAgICAgICAgICAgICAgICAgICAg ICAgICAgKDEtIChwb2ludC1tYXgpKSkpKSkpCiAgICAgICAgIChvciAodmMtZ2l0LXN5bWJvbGlj LWNvbW1pdCBwcmV2LXJldikgcHJldi1yZXYpKQotICAgIDs7IFdlIHVzZWQgdG8gdXNlICJeIiBo ZXJlLCBidXQgdGhhdCBmYWlscyBvbiBNUy1XaW5kb3dzIGlmIGdpdCBpcwotICAgIDs7IGludm9r ZWQgdmlhIGEgYmF0Y2ggZmlsZSwgaW4gd2hpY2ggY2FzZSBjbWQuZXhlIHN0cmlwcyB0aGUgIl4i Ci0gICAgOzsgYmVjYXVzZSBpdCBpcyBhIHNwZWNpYWwgY2hhcmFjdGVyIGZvciBjbWQgd2hpY2gg cHJvY2Vzcy1maWxlCi0gICAgOzsgZG9lcyBub3QgKGFuZCBjYW5ub3QpIHF1b3RlLgotICAgICh2 Yy1naXQtLXJldi1wYXJzZSAoY29uY2F0IHJldiAifjEiKSkpKQorICAgIDs7IFVzZSBoaXN0b3Jp Y2FsIGRhdGEgZm9yIHRoZSBmaWxlIGlmIHBvc3NpYmxlLgorICAgIChvciAoYW5kIChub3QgZ2l0 LWxvZy12aWV3LWRpZmYtd2hvbGUtY2hhbmdlc2V0KSAodmMtZ2l0LS1yZXYtdG8tcHJldmlvdXMt cmV2IHJldikpCisgICAgICAgIDs7IFdlIHVzZWQgdG8gdXNlICJeIiBoZXJlLCBidXQgdGhhdCBm YWlscyBvbiBNUy1XaW5kb3dzIGlmIGdpdCBpcworICAgICAgICA7OyBpbnZva2VkIHZpYSBhIGJh dGNoIGZpbGUsIGluIHdoaWNoIGNhc2UgY21kLmV4ZSBzdHJpcHMgdGhlICJeIgorICAgICAgICA7 OyBiZWNhdXNlIGl0IGlzIGEgc3BlY2lhbCBjaGFyYWN0ZXIgZm9yIGNtZCB3aGljaCBwcm9jZXNz LWZpbGUKKyAgICAgICAgOzsgZG9lcyBub3QgKGFuZCBjYW5ub3QpIHF1b3RlLgorICAgICAgICAo dmMtZ2l0LS1yZXYtcGFyc2UgKGNvbmNhdCByZXYgIn4xIikpKSkpCiAKIChkZWZ1biB2Yy1naXQt LXJldi1wYXJzZSAocmV2KQogICAod2l0aC10ZW1wLWJ1ZmZlcgotLSAKMi4xNy4xCgo= --0000000000001f97c305e11b529a-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 28 17:20:47 2022 Received: (at control) by debbugs.gnu.org; 28 Jun 2022 21:20:48 +0000 Received: from localhost ([127.0.0.1]:56507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o6Idb-0006Ex-Kt for submit@debbugs.gnu.org; Tue, 28 Jun 2022 17:20:47 -0400 Received: from mail-pj1-f52.google.com ([209.85.216.52]:35614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o6IdO-0006Dv-HF for control@debbugs.gnu.org; Tue, 28 Jun 2022 17:20:37 -0400 Received: by mail-pj1-f52.google.com with SMTP id x1-20020a17090abc8100b001ec7f8a51f5so17265121pjr.0 for ; Tue, 28 Jun 2022 14:20:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:mime-version:date:message-id:subject:to; bh=4DiYDH3tZXwBGgC4K8icGmq7ZlyIzX+OBU2Z5iDsAaw=; b=rG4WTkny6M0+rAVQ7zpVKg4l1tEZY0cLFwBxi7enu2Dlh7jpZt6OIIludNBfiTKlVz yBraPdJ5pxCO7039sMX2MzqurJWSff85caKlB866wODwIrjgP/Kp0/kq3ntqJmQ2HgUq JS8uImThzrr09abjnQxruhqsyURMwWfmEA7CZT8RTXjrZYG8m6e/JrD07EdWDbCDFAqi wN64eyZ6lxfFIwMKoYYn1+/5iyTz+M/XaBT7MJtm4DFFIK18w4xtfiTuc+tVa3OSkHQB gTofTGYDWPsBCMJY98lVdQ4k11SxIVIAqaQ9H/fgQtmfa/1+p00b6ocB4SdmLMBzPufl 35IA== X-Gm-Message-State: AJIora8WMZBHUBLyT/tKMo316AlOl4csiLBQq024m/NW591o+/Hhrbd1 zjLyU5atm1rJC8csi2gqGFZw+GUbdUIE90uCXuR5Mojk X-Google-Smtp-Source: AGRyM1tNu8cRM5g8Gc3rOIxE0NJ2vE9Zw6tU9jxBr81m5ki5Ak43TVWeI+v777sRUTXOSopP3vcz5o9u5ClEXm+hpKM= X-Received: by 2002:a17:903:2444:b0:16b:917e:3b04 with SMTP id l4-20020a170903244400b0016b917e3b04mr4334011pls.145.1656451228894; Tue, 28 Jun 2022 14:20:28 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Tue, 28 Jun 2022 14:20:28 -0700 From: Stefan Kangas MIME-Version: 1.0 Date: Tue, 28 Jun 2022 14:20:28 -0700 Message-ID: Subject: control message for bug #55871 To: control@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: control 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.5 (/) tags 55871 + patch quit From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 17 22:10:28 2022 Received: (at 55871) by debbugs.gnu.org; 18 Aug 2022 02:10:29 +0000 Received: from localhost ([127.0.0.1]:53334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOUzM-0004nh-Fj for submit@debbugs.gnu.org; Wed, 17 Aug 2022 22:10:28 -0400 Received: from mail-wr1-f43.google.com ([209.85.221.43]:36491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOUzJ-0004nH-20 for 55871@debbugs.gnu.org; Wed, 17 Aug 2022 22:10:26 -0400 Received: by mail-wr1-f43.google.com with SMTP id j7so152207wrh.3 for <55871@debbugs.gnu.org>; Wed, 17 Aug 2022 19:10:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc; bh=Tt+J7JYldQbuykSOurmf4m6J3AjUtNdzPufCitLRHM0=; b=ipv5u9+5kPRN2dnOlfTJ0U/kW7K2J8ge9c1p7wMGTUSdY1TP3P9ymZ4SRSddtvPZlQ WsfA488nAE72/KKA8M9EOCDubM8XtekWaImkMH2peHTIq8zqDRqDnIPG7q8Zk+WOMMW2 8aKDnn0b4C4CORCDj4lBAGBpgmuQaIe4G21QWHASD6KNsWP7Btikc+dPfF6bO4jycZ3T iduFQCQCHDQMP6eyTRpZvfEFDzmevJX0zIjkYzN7DiikjBJJEHr4IQnbcn+WOQId3d7s vWhAKxRC/JN2qK+hVAgQdvnCiw7KZSBm40Mbl2XyTS7eDQABtOhfFn3WKE43wUxe8j7k 84tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc; bh=Tt+J7JYldQbuykSOurmf4m6J3AjUtNdzPufCitLRHM0=; b=bfSTHGh87uBTcEUQpmDBui/lSZih9hpUSsRZapR3AeMx2I4tYoziluk4cahGQm+KK6 xtkxgp4YErSQbe4ZCjNXb3hNTOBlRSyF4ttN1jM1tWqp6g7JNfmkbw3R4l0f/YMh+rWN JGkV0ZW6kSfTtN3yv7+QlyCyM1qGqFDKnawKz5CuTxA83r78xXSUozjL16y1Rl9uP+0Q gfl4aRKPJao1Yix1NzwqF+YIpXQv+AFQvOzCDk2aJwsu7dOoII8lT0GFP/F9dXqTEIdh 0EfPf6FuvzC98Xr5lXjrKkEun1gVFgUU7IS/ueI0wCWL+qEWsWjgd3twf//o07HM3pAU RHIQ== X-Gm-Message-State: ACgBeo0siDDOdBmmqaoLadRBLF+hu0pj4oix/ILH5wcDiZOI+8R0L0N4 EazAMFNdrSbcVyvPGAH7Kbw= X-Google-Smtp-Source: AA6agR6G4TlXQ8nHXZeakJCV14BuOK8jW2VVfm6aFJttVakXqP+eNQ6KukjBtt+ML2UrkWiqHhV6/g== X-Received: by 2002:a5d:4d41:0:b0:21e:a5e3:cb9b with SMTP id a1-20020a5d4d41000000b0021ea5e3cb9bmr287801wru.523.1660788618854; Wed, 17 Aug 2022 19:10:18 -0700 (PDT) Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id g11-20020a5d488b000000b0022377df817fsm57931wrq.58.2022.08.17.19.10.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 17 Aug 2022 19:10:18 -0700 (PDT) Message-ID: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> Date: Thu, 18 Aug 2022 05:10:16 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: bug#55871: Acknowledgement (27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames) Content-Language: en-US To: =?UTF-8?Q?Nicol=c3=a1s_Ojeda_B=c3=a4r?= , 55871@debbugs.gnu.org References: From: Dmitry Gutov In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 55871 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.5 (/) Hi Nicholas, On 10.06.2022 20:31, Nicolás Ojeda Bär wrote: > Dear all, > > Attached is a patch that solves some of the problems in this issue (not all). > > Its main feature is that it should not modify anything if you are not > using `vc-git-print-log-follow`. > > If you are, the patch makes it possible to use `a`, `f` and `d` from > inside the `*vc-change-log*` buffer. > > The patch itself is very much based on the one proposed in > https://debbugs.gnu.org/cgi/bugreport.cgi?bug=8756#53, with some > changes to make sure that nothing changes if `vc-git-print-log-follow` > is not being used. Additionally, a horrible HACK (see commit message) > is used to allow `vc-git.el` to discriminate between `d` and `D` in > the `*vc-change-log*` buffer, as these two functions require different > Git commands to be executed when following renames (this is also > discussed in the just linked bug report). Thanks for your help with updating this patch. I've tried it out, and it seems functional, which is great. First of all, how do you feel about signing copyright assignment for Emacs? AFAICT you haven't done so yet, and this patch borders on our allowed limit without assignment (if I take only the lines that changed substantially from Dmitry Dzhus's version). It would probably be easier to get the assignment going anyway, so you continue to be able to contribute. There are also a few of improvements I'm eyeing here (not requirements for acceptance -- I can do them myself, if you like): 1) vc-git--shalist-raw doesn't seem to serve much of a purpose. It is there only to delay the conversion from the raw string into a list? 2) It would be better to produce shalist entirely lazily. I'm not sure what's stopping us from doing that, given that vc-git--shalist knows how to find the log buffer. Finding the values for all the arguments might be a problem, so we can save the args (start-revision, limit) to a new var. 3) git-log-view-diff-whole-changeset might be unnecessary. vc-git-diff could look up two file names, for both revisions (the current and the one corresponding to the previous revision in the sha list), or log-view-diff-common could pass explicitly the previous revision from the already-printed list, rather than fetch it using (vc-call-backend log-view-vc-backend 'previous-revision nil fr) -- I'm not sure why it's doing it this way. At first I just changed vc-git-diff to do this: (let ((file1 (vc-git--rev-to-filename rev1)) (file2 (vc-git--rev-to-filename rev2))) (when (or file1 file2) ;; Run diff from the repository root because our file names are ;; relative to it (setq default-directory (vc-git-root default-directory)) (when file1 (push file1 files)) (when file2 (push file2 files)))) ...and reverted the change to vc-git-previous-revision, and that almost worked, except a revision that did rename only showed one side (addition, not deletion). WDYT? I experimented with --follow myself in the past, and it is annoying in that it skips commits, some of which are visible in the log when you don't use --follow, details here: https://stackoverflow.com/questions/46487476/git-log-follow-graph-skips-commits So I figured the approach in (3) has something to do with it. But it seems not to be the case. From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 06 06:56:30 2022 Received: (at 55871) by debbugs.gnu.org; 6 Sep 2022 10:56:30 +0000 Received: from localhost ([127.0.0.1]:49695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVWFp-0003fa-Nb for submit@debbugs.gnu.org; Tue, 06 Sep 2022 06:56:29 -0400 Received: from quimby.gnus.org ([95.216.78.240]:55546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVWFo-0003fM-Ht for 55871@debbugs.gnu.org; Tue, 06 Sep 2022 06:56:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID :Date:References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=djuI9MKUqLp+r4PfsCcSXuu11OtRaKcXjUOhtg6b/Yo=; b=rlw42gh/6b27YWsvp7AZyyDqW4 2IOXKxbV/gQyI7RGOjUSMJEDbcS7pxlhNFPqYpmOkhU2H1IeNNAgT2a6svCYCsrSC+c50S8Fb+gAc 9XcHL4gCLYkyzszRwEsE1GdfwQ9JCLqWEVT7PP0TV3lnNmsd0reYfJICsFWrlXtJxkk4=; Received: from [84.212.220.105] (helo=joga) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oVWFg-0003kB-HQ; Tue, 06 Sep 2022 12:56:22 +0200 From: Lars Ingebrigtsen To: Dmitry Gutov Subject: Re: bug#55871: 27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames In-Reply-To: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> (Dmitry Gutov's message of "Thu, 18 Aug 2022 05:10:16 +0300") References: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> X-Now-Playing: David Bowie's _"Heroes"_: ""Heroes"" Date: Tue, 06 Sep 2022 12:56:20 +0200 Message-ID: <874jxkvkiz.fsf_-_@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Dmitry Gutov writes: > First of all, how do you feel about signing copyright assignment for > Emacs? This was a couple of weeks ago, but there wasn't any followup as far as I can tell. Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 55871 Cc: 55871@debbugs.gnu.org, =?utf-8?Q?Nicol=C3=A1s?= Ojeda =?utf-8?Q?B=C3=A4r?= 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.3 (---) Dmitry Gutov writes: > First of all, how do you feel about signing copyright assignment for > Emacs?=20 This was a couple of weeks ago, but there wasn't any followup as far as I can tell. Nicol=C3=A1s, would you be OK with assigning copyright to the FSF? From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 06 06:56:35 2022 Received: (at control) by debbugs.gnu.org; 6 Sep 2022 10:56:35 +0000 Received: from localhost ([127.0.0.1]:49698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVWFv-0003fu-0h for submit@debbugs.gnu.org; Tue, 06 Sep 2022 06:56:35 -0400 Received: from quimby.gnus.org ([95.216.78.240]:55562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVWFt-0003fT-Od for control@debbugs.gnu.org; Tue, 06 Sep 2022 06:56:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=IaNsMa5aE8sceBG9tMR7g1i//uUFvMcyCTDgNs2gtqg=; b=b/W6aV7ow949zG90gF3go9/0Ym vbwU6yDrIaH9kIFAA67pMRyu/Zy24HGOQf4tCVHPJF19BdMQ57YdS0SKqC1b+pkESbQ9tz/d2XSRx /4gwWoMGUmYPsDQzwqnplwaDTV7uJP0xezGsCAcPHwF2GSf9oddMCdTzR9uaJ8trijWI=; Received: from [84.212.220.105] (helo=joga) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oVWFm-0003kK-7k for control@debbugs.gnu.org; Tue, 06 Sep 2022 12:56:28 +0200 Date: Tue, 06 Sep 2022 12:56:23 +0200 Message-Id: <8735d4vkiw.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #55871 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: tags 55871 + moreinfo quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control 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.3 (---) tags 55871 + moreinfo quit From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 06 08:13:01 2022 Received: (at 55871) by debbugs.gnu.org; 6 Sep 2022 12:13:02 +0000 Received: from localhost ([127.0.0.1]:49977 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVXRq-0006O8-A2 for submit@debbugs.gnu.org; Tue, 06 Sep 2022 08:13:01 -0400 Received: from mail-vk1-f172.google.com ([209.85.221.172]:46051) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVXRl-0006Ns-TZ for 55871@debbugs.gnu.org; Tue, 06 Sep 2022 08:12:57 -0400 Received: by mail-vk1-f172.google.com with SMTP id r69so988020vkf.12 for <55871@debbugs.gnu.org>; Tue, 06 Sep 2022 05:12:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date; bh=BPkRZ4GvJx8CoeC2z0ba0EHqq3LKbDE2kltIFsXjbrM=; b=EmeljLPGX8mX0u1tLXBG7jBrIcgKNjVnnQbe+sALUpy37vIdm1VZ9C3fhvMh1c3+2s Tlzr003i2MGary+3Q+/DSfY5Ge9WvPzHfopzi5/KYNVEUuL5uGseq45rUmA829hb1Y29 FY9dwXidg2/OCTlx9dqxIb6SUg3Vznp5tr5N2Y8sM9FRHjrMFc+zTPKgMAbiSmyupltE YwkxcCirLX4cjr8MHal7krQ0xLHZDZAQ/HVp/afwq18Sj9aeDhJhgv+5FWPgXaENTfp4 hq+4SEecjYO3hayiLeZD7avvYFstIKSIw6OCCoUmWbiT62OKeBcnnDBcfNSUOTqlFR4V ICxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date; bh=BPkRZ4GvJx8CoeC2z0ba0EHqq3LKbDE2kltIFsXjbrM=; b=iqB+emgxM6eTd5kb9mkn4b2ydP6Ng9Wv68RibxbXRL13FeA05LhcObfmv7o0s/EUNT V81ZCQEJuY/FxXBuyFUKd5/CeuvsRvC3G41A7G1ObNl71XrKj6lnktVM8ipvUiq36Mtb 74Ejk8nZkSv6BcbZj33jW0r2Eb4+igIFj4JN9+WrWshZUcio8SX2hGOg2DMpzR1ojQMK jXpX2H+Qhj9NQZCwC2NWKfDpB/JsdAyl71e4kyNIirUgjmroP1CM6Wdn+98+3LdPi2ql hzcGpYJPObncGcRVNGJ6eW1XoRD3VbzQhFaY8/Vla8+5K2fcMpSaYOUIMO3s328MegAR 1VUQ== X-Gm-Message-State: ACgBeo3BWGb8p3qks0Bz0zPY8VNFWBWw0+dZRKmNTOS3TzsUFSPkzK2H eyDKR7JJhgnSY5IETvd4+uTzRQD79TYI4r8mKMk= X-Google-Smtp-Source: AA6agR7/4N05JEEIgEtXMvhZd+tXSIB5TFhSyYeo6omO8vVXod9+FRZfXEp73pu7zPHza2YANeJM+Rc4Q7N3Cp0EDyM= X-Received: by 2002:a05:6122:1190:b0:39e:b11c:e655 with SMTP id x16-20020a056122119000b0039eb11ce655mr201217vkn.11.1662466368227; Tue, 06 Sep 2022 05:12:48 -0700 (PDT) MIME-Version: 1.0 References: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> <874jxkvkiz.fsf_-_@gnus.org> In-Reply-To: <874jxkvkiz.fsf_-_@gnus.org> From: =?UTF-8?Q?Nicol=C3=A1s_Ojeda_B=C3=A4r?= Date: Tue, 6 Sep 2022 14:12:21 +0200 Message-ID: Subject: Re: bug#55871: 27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames To: Lars Ingebrigtsen Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 55871 Cc: 55871@debbugs.gnu.org, Dmitry Gutov 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 (-) Hello, Sorry for the delay in getting back to you. No problem with assigning copyright to FSF. I will reply to Dmity separately. Cheers, Nicolas On Tue, Sep 6, 2022 at 12:56 PM Lars Ingebrigtsen wrote: > > Dmitry Gutov writes: > > > First of all, how do you feel about signing copyright assignment for > > Emacs? > > This was a couple of weeks ago, but there wasn't any followup as far as > I can tell. > > Nicol=C3=A1s, would you be OK with assigning copyright to the FSF? > From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 06 08:13:59 2022 Received: (at 55871) by debbugs.gnu.org; 6 Sep 2022 12:13:59 +0000 Received: from localhost ([127.0.0.1]:49984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVXSp-0006QA-BJ for submit@debbugs.gnu.org; Tue, 06 Sep 2022 08:13:59 -0400 Received: from quimby.gnus.org ([95.216.78.240]:56998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVXSd-0006Pf-4W for 55871@debbugs.gnu.org; Tue, 06 Sep 2022 08:13:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID :Date:References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=A2TncvxlHl9Pq3vJG2vT19qityWA1iVWf8l563iif1I=; b=tp9LzbLht+wX9mmauino5pCsya sMyE6bFUmFUSXD74408ykB2cdVaDynSGmzT1rJwDyDRXVpdsOjRY0HVEYlMM1Sja9nGZPHeulUp5J mOWwwhed7jTAcdxR31snjxj17Ae7GJ5oeHh01szQNT4/PfvW8OANQ2I9+0RkSzkvHcNg=; Received: from [84.212.220.105] (helo=joga) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oVXSU-0004SY-Dr; Tue, 06 Sep 2022 14:13:40 +0200 From: Lars Ingebrigtsen To: =?utf-8?Q?Nicol=C3=A1s?= Ojeda =?utf-8?Q?B=C3=A4r?= Subject: Re: bug#55871: 27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames In-Reply-To: (=?utf-8?Q?=22Nicol=C3=A1s?= Ojeda =?utf-8?Q?B=C3=A4r=22's?= message of "Tue, 6 Sep 2022 14:12:21 +0200") References: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> <874jxkvkiz.fsf_-_@gnus.org> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAElBMVEUrGxYKCQleLRyd lYPaXhr///9SE5piAAAAAWJLR0QF+G/pxwAAAAd0SU1FB+YJBgwNEfK2yEkAAAGxSURBVDjLlZPh cSshDISRTAGI5wKAqIK4AZtR/zW9FTrOdiaZTPTD5vSh1aLjUoogOf4LVnV8poRESSLpAElIyuVS GxKlFfG0iBSUkAh/cAcY3PFwRinESKVS0yf3VwBtKQQw+NbkLeqqKHx7k0JwbXBzuZG8A6o1EQD8 rW1aZ99SA66QRkEZqjyp9ABCDlwo37OOKXX6w7/m54hI8wrQs/ZV8QHgDaCg3KiSKcF6xcSiAvY4 Tjd54rf58DzMoFDXFn0c2lHh0nr3pdLwygBLuJj5ZDjPZ0WeSF1tCYotY3gbbhzriry5PhtFBS3J VWCeu/ZTqpK3XmC6EdsgQ6JYBICNDXT0UNLVRQet5q6CidgjT11axhtI7Tj7rDOaPJuP5BU2Rxhu UbGcHz1M18xsS2U8blcAdt9SLG2fw7cQnwf0uYYWVK6TNih+LtkHHHpKifomaA13i6tzgjVpjLf5 bHo9pXBpVGLuhHv3eL6oihsV3anovL+8c525BxgtlA4AS7QALKTXWyLQygvU0d8A5htA9je07+4x k+dH8gQ8EN+BL/EHQD+A8hOgX3vQ93n+D9YubqxqfFL/AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDIy LTA5LTA2VDEyOjEzOjE3KzAwOjAwcflVpQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMi0wOS0wNlQx MjoxMzoxNyswMDowMACk7RkAAAAASUVORK5CYII= X-Now-Playing: Tom Robinson Band's _Power In The Darkness_: "Up Against The Wall" Date: Tue, 06 Sep 2022 14:13:37 +0200 Message-ID: <87bkrssnta.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Nicolás Ojeda Bär writes: > Sorry for the delay in getting back to you. No problem with assigning > copyright to FSF. Great; here's the form to get started: Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 55871 Cc: 55871@debbugs.gnu.org, Dmitry Gutov 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.3 (---) Nicol=C3=A1s Ojeda B=C3=A4r writes: > Sorry for the delay in getting back to you. No problem with assigning > copyright to FSF. Great; here's the form to get started: Please email the following information to assign@gnu.org, and we will send you the assignment form for your past and future changes. Please use your full legal name (in ASCII characters) as the subject line of the message. ---------------------------------------------------------------------- REQUEST: SEND FORM FOR PAST AND FUTURE CHANGES [What is the name of the program or package you're contributing to?] Emacs [Did you copy any files or text written by someone else in these changes? Even if that material is free software, we need to know about it.] [Do you have an employer who might have a basis to claim to own your changes? Do you attend a school which might make such a claim?] [For the copyright registration, what country are you a citizen of?] [What year were you born?] [Please write your email address here.] [Please write your postal address here.] [Which files have you changed so far, and which new files have you written so far?] From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 04 08:22:26 2022 Received: (at control) by debbugs.gnu.org; 4 Oct 2022 12:22:26 +0000 Received: from localhost ([127.0.0.1]:52812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ofgwM-0006iZ-Hd for submit@debbugs.gnu.org; Tue, 04 Oct 2022 08:22:26 -0400 Received: from quimby.gnus.org ([95.216.78.240]:45596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ofgwK-0006iN-TN for control@debbugs.gnu.org; Tue, 04 Oct 2022 08:22:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NaTRo9hfUMs2GOf/WqI5QuKdVfg7SkeiIfjWjD2BcVc=; b=cAq5tXaNG7IW6EDv2W/UDAoER9 kv2wuShSdNTO1EEGVE2o7qIRUJRHXo59RVvbsMEsylPQcHH2rFzKN4GLbt7QbbTQWHxuJfQOdMAE5 su915DTeirm6nskxHi/FSuGmexmblNvp7RguEof1siEm5t91TE9tAv0FqDK2p7g5FN5U=; Received: from [84.212.220.105] (helo=downe) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ofgwD-0003h2-5o for control@debbugs.gnu.org; Tue, 04 Oct 2022 14:22:19 +0200 Date: Tue, 04 Oct 2022 14:22:16 +0200 Message-Id: <878rlv93t3.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #55871 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: tags 55871 - moreinfo quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control 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.3 (---) tags 55871 - moreinfo quit From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 02 21:02:34 2022 Received: (at 55871) by debbugs.gnu.org; 3 Dec 2022 02:02:34 +0000 Received: from localhost ([127.0.0.1]:50205 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1HrO-0002h2-7i for submit@debbugs.gnu.org; Fri, 02 Dec 2022 21:02:34 -0500 Received: from mail-wr1-f42.google.com ([209.85.221.42]:33533) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1HrL-0002gu-PA for 55871@debbugs.gnu.org; Fri, 02 Dec 2022 21:02:33 -0500 Received: by mail-wr1-f42.google.com with SMTP id bx10so10551834wrb.0 for <55871@debbugs.gnu.org>; Fri, 02 Dec 2022 18:02:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=4eN8wtfLC5DmbwafIAQvp9bUcXbXDGwT8Fwvt/Q3Ouc=; b=JmadztDRIOg7A+gdQ/10fy4+1JIlGraYPR1k0EHiZjFJuUO9phvnWxPulopB97+hmX JJfAOnyzUyjr9ahfObM9j5+dgNyth18CTEFeU2iWgmtSPt8DEGgd83rAaUmmnSgd6sp9 zxI2Q+r9dE+AeI0NPprImWGhFTzCBe1UteyxOXMOQzlHA4bPF/1ZC/DyobC6Z6hSwT/x 68AIckZJ651J+16D02LaKhG8X6IAasHpoS313I7Pb24b2qOJ4MXt7N/cLm/7VIbt5h78 TtXPm8n/E67OT7lu23+Xgp2HDlZY85M6/d9U/AJ812ryGAExDLoNcJ4oHu6Qh6Fg4uiP u+1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4eN8wtfLC5DmbwafIAQvp9bUcXbXDGwT8Fwvt/Q3Ouc=; b=eo3Ep1XEIr6Af2a1CrUegJEvhERDTz0/KkpGTre1SctWSv8p0/6mpCj0Db5vNnzHs/ NF07xrmDr6uU/fzTSveTzjk5J6zx+Up3hdlQhkbvV6Ynin+EwqO5VlUokF1KaYZJOvj6 AjdeLE2ntJkhnr4OPKE4xAUDYLcdh2FPWAdZ3nQrnGgx9amOe9wvt1wYrFrOSiOoGcy7 xMVK0QzoPl/AZ3AmzMQGU910XAM+fmfirZLtcH9nAhH8WtuNx08WyHZGp6wLhoP0eZaJ X/yrq7CBswCn4C3iOJ4XVxCrqQYc5O9jDN4WvVyiFUuLJb0YACqz9TzBs2IpPwTWvpml cacQ== X-Gm-Message-State: ANoB5pnqjuAViCRzABvAOYnrbGG69kmvHkz9SyrWrcTB0+vjwDfPsbrO EPmxvGmTXnYGa8HTXecer4Q= X-Google-Smtp-Source: AA0mqf4wiWmitmi2u+ATRFLCojMCD+6XUIFAsEegeFmMNYS1bM4yB2Xc3KKp0J/vgpkgqZTx1Ie98A== X-Received: by 2002:adf:dfd1:0:b0:242:16d2:e394 with SMTP id q17-20020adfdfd1000000b0024216d2e394mr16911061wrn.502.1670032945707; Fri, 02 Dec 2022 18:02:25 -0800 (PST) Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id bg28-20020a05600c3c9c00b003cfa3a12660sm16029015wmb.1.2022.12.02.18.02.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 02 Dec 2022 18:02:25 -0800 (PST) Message-ID: Date: Sat, 3 Dec 2022 04:02:23 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: bug#55871: 27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames Content-Language: en-US To: =?UTF-8?Q?Nicol=c3=a1s_Ojeda_B=c3=a4r?= , Lars Ingebrigtsen References: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> <874jxkvkiz.fsf_-_@gnus.org> From: Dmitry Gutov In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 55871 Cc: 55871@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.8 (/) Hi Nicholas, On 06/09/2022 15:12, Nicolás Ojeda Bär wrote: > Sorry for the delay in getting back to you. No problem with assigning > copyright to FSF. > > I will reply to Dmity separately. How's progress with the copyright assignment or the additional reply? If you got the ball rolling, we can continue the discussion now. If you hit some problems (with your employer or etc), I was thinking of try an alternative patch based on the 2014 one (which has its copyright assigned). Or if maybe you have something newer to share, please do. From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 11 18:02:55 2022 Received: (at 55871) by debbugs.gnu.org; 11 Dec 2022 23:02:55 +0000 Received: from localhost ([127.0.0.1]:48726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4VLT-0004Mu-6I for submit@debbugs.gnu.org; Sun, 11 Dec 2022 18:02:55 -0500 Received: from mail-wr1-f54.google.com ([209.85.221.54]:34451) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4VLR-0004Mk-Fv for 55871@debbugs.gnu.org; Sun, 11 Dec 2022 18:02:54 -0500 Received: by mail-wr1-f54.google.com with SMTP id o5so10405254wrm.1 for <55871@debbugs.gnu.org>; Sun, 11 Dec 2022 15:02:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=AxeFgi7KOb7Ib4fI0ouKi6iAAdqb2Lf9XXKhCHNdyV4=; b=JmxImLGIyVDKhtNW7dCoV9RU9rcYJJoTzlr1hRsOXZ++6iWQoFio6yjf5JnUOkAFwv G3flJ7utuh044aaFd1bcoYZMJAjv0jSqzvk6/n+6ZNFRia2cUDc4b7ggVI/M3NB24Wmi tx0jlranRqpkS48CVuC6YDunT7f4TOTiSHFHPg0HIXZLE8IvjeYlIeGrHOTo4nbOv+gU ctBCORknDLwer6oAAbd1DJYm+bsVQUBXSO0aBk9qBVrL3MuujQ78t6gO9C+b6fOmKQ0z AnPjjB3/TZz3ufLdVuWEYeC0G7xMJw2i0IddFJBZuqPsn2aebB9YhMJRlEJoDFmYZJx2 GjTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AxeFgi7KOb7Ib4fI0ouKi6iAAdqb2Lf9XXKhCHNdyV4=; b=vvwMMQrHZ/96tFq5eCN0L9PkC/JRhd+UnXoXlygs2CtnAPLW8TBRRXsJu+aJ4P08Dl fEPFfU8zFHZT18RMnzkIH8rf+hUHqQ48afcca3TDZdGddI/8Hg/88FbRYyIp3WFOqVVg RTTCJQ5DWONu2Vo4cHpJjGBfQfKGCjFbgHkz3zy4i5qDUew+phQj1WqGEzX1iCCAc1zX 40H/wYTSlY4fvg5m8GF/A7Zj2eqJ2gMv5lPMcpZmrToJKS8VguiFtWFh6ZcbJYThVhW5 NJJeLPlpVah57JChuNFc3klp6oYkwiZoAZ29auF9mCyZQBTnmR90X0WlsKb4CVTNG65v 5jqg== X-Gm-Message-State: ANoB5pnw9vtYINtPPUba/aTrpYbQZzPTM8cEbANHY5PnjHRMTkRccYcK qw/qGhtrMT8fikePSOOqing= X-Google-Smtp-Source: AA0mqf7ppBsw+I0PwH59x++6D9YfRF08oJ6ag5qAr8eN/u6VB5fHXFhupUGgOxmrLKuK2V2CsWgaXg== X-Received: by 2002:a05:6000:1c8:b0:242:701d:3f76 with SMTP id t8-20020a05600001c800b00242701d3f76mr8502448wrx.66.1670799767469; Sun, 11 Dec 2022 15:02:47 -0800 (PST) Received: from [192.168.0.2] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id o5-20020a5d58c5000000b00241da0e018dsm7183188wrf.29.2022.12.11.15.02.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 11 Dec 2022 15:02:46 -0800 (PST) Message-ID: Date: Mon, 12 Dec 2022 01:02:45 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: bug#55871: Acknowledgement (27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames) Content-Language: en-US From: Dmitry Gutov To: =?UTF-8?Q?Nicol=c3=a1s_Ojeda_B=c3=a4r?= , 55871@debbugs.gnu.org References: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> In-Reply-To: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 55871 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.8 (/) On 18/08/2022 05:10, Dmitry Gutov wrote: > I experimented with --follow myself in the past, and it is annoying in > that it skips commits, some of which are visible in the log when you > don't use --follow, details here: > https://stackoverflow.com/questions/46487476/git-log-follow-graph-skips-commits > > So I figured the approach in (3) has something to do with it. But it > seems not to be the case. I've tried another idea: to pre-process the file's history and pass all historical file names to 'git log' inside vc-git-print-log. Unfortunately, that delays the appearance of the log significantly. In the Emacs repo that comes down to several seconds, which seems unacceptable. But that would fix both the problems with a/f/d and the bug described in the SO question above. Looking around for how other software deals with it, it seems GitHub has found a satisfactory solution which adds a new UI element with basically zero performance cost. At first it was implemented in a Chrome extension for it (https://github.com/jeffstieler/github-follow-extension), but then added to the core functionality this summer (https://github.blog/changelog/2022-06-06-view-commit-history-across-file-renames-and-moves/). This gif shows the workflow: https://i0.wp.com/user-images.githubusercontent.com/4021812/171795153-4f327a04-eb27-4d46-acb1-73d2e82ce4c5.gif?ssl=1 We should be able to do something similar. Step 1: Drop the '--follow' argument in all cases. Step 2: After the log is finished printing, we detect somehow that the last commit was a rename one. Perhaps using an additional process call, or perhaps by adding some output to the process which we'll hide through font-lock or process filter. When it is a rename, we print a message at the end, saying the file has been renamed. And a button saying e.g. "Print Previous Log", which would print the history for the previous name. That history should also include the missing commits from the SO question. Not sure how to deal with duplicating file names best (like etc/NEWS has been the name of many files in the Emacs repo): either limiting the first revision to start from -- but that keep bring back the missing commit problem, oh well -- or some other way. Can't exactly check what GitHub is doing, because they don't actually provide this for NEWS.24, guess because it was not a straight rename: https://github.com/emacs-mirror/emacs/commits/master/etc/NEWS.24 But git log -M50% -C --stat 5f8947c7007d1d8 -n 1 at least detects it as a copy if not a rename. Guess they didn't adopt the whole follow-renames logic, and we can do better. I don't have any code to show, but it shouldn't require too many changes. From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 12 11:45:00 2022 Received: (at 55871) by debbugs.gnu.org; 12 Dec 2022 16:45:00 +0000 Received: from localhost ([127.0.0.1]:54022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4lvI-0000gE-9A for submit@debbugs.gnu.org; Mon, 12 Dec 2022 11:45:00 -0500 Received: from mail-yw1-f180.google.com ([209.85.128.180]:35741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4lvG-0000g7-Pr for 55871@debbugs.gnu.org; Mon, 12 Dec 2022 11:44:59 -0500 Received: by mail-yw1-f180.google.com with SMTP id 00721157ae682-3b5d9050e48so154842457b3.2 for <55871@debbugs.gnu.org>; Mon, 12 Dec 2022 08:44:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=aCs4K3CkrOcHNjJ4VEJTMk0y7zXij380Y1ciUsVzDUs=; b=B4OGxcsUvEHl6AKUsYbgbYIfPDJ8UI8E+oCBRG7sNF3dquwllTCmLfQgoGew6ZDEOS FkSa9sa1hiNQdRslfCxyIXvKRyGegcSSGioyiyAy9A0LuqohSvr240k/lT8Sf3//oSGD UgQwUyPrHrK+oaysUMbUxyhngHGCdLlw6dpRClB4zEdaI/jBzqrcbRhvMns7pmN8LAJD H0CHUOUmGntQ6mt+cFviiTtWH9wIaQUD7qZLXQd6viS82dX21/0G9f2tDJMOuAIqOYUH 1zCIwBNoTr0Q3tR9fOPxcx7K0atig9UBLdfcrVg4iDq3gROOVEZqxPIXZgVh3VNzpagA F3iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=aCs4K3CkrOcHNjJ4VEJTMk0y7zXij380Y1ciUsVzDUs=; b=03W3hI10kBbEBV6ZI8vVOCDYkiwueB3KjZQ+X4xsBMzSKSLmgCXXz2/Xle3s6b6mOg +7U+ut/POBTOECy42X2/i4AHg6WMciPpyZBvpak1WE7scXkCUOkQh91r762UMPhzqR0h ybVsj+q93ztvKUgkMucfc6ZstuwwU4BwjYhaO2iw5A6osVXUt2o2lMTrnGqn9Bb9XStf etM8jsNcnNHrTVFYNxseegBcjTRgkCCeq6vZnTiGk0p3qbxA2WiS6JUYKoDXBc6vEHPh taeiOup0OobklkPYngvA5W+CNJN0TOIhEcLuC6dlKPB4NLpvB3CyJ0teWUzgL7ni04T1 3CRw== X-Gm-Message-State: ANoB5plm6eSYP6OJR1E5xtZxpsuM91qvz/3LtDcZUVT5EPVQbgxM6vH0 hgrufkAlErLsZrRuvywkGrg0etOhEiMGhj9mClM= X-Google-Smtp-Source: AA0mqf6pcwaDS1ff3v0TsRFbbhd89eIUuM7fyscZp1SmtvPBaqMW2kXA1l2+tnX9WqvlO9aQPQKCLGRPuMVDAOQixDM= X-Received: by 2002:a81:1044:0:b0:3d4:9cd5:353c with SMTP id 65-20020a811044000000b003d49cd5353cmr37782691ywq.394.1670863493085; Mon, 12 Dec 2022 08:44:53 -0800 (PST) MIME-Version: 1.0 References: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> In-Reply-To: From: =?UTF-8?Q?Nicol=C3=A1s_Ojeda_B=C3=A4r?= Date: Mon, 12 Dec 2022 17:44:27 +0100 Message-ID: Subject: Re: bug#55871: Acknowledgement (27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames) To: Dmitry Gutov Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 55871 Cc: 55871@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 (-) Dear Dmitry, Apologies for the delay in getting back to you; I have been submerged in my day job and haven't had any time to look at the code again (the copyright assignment is done, by the way). I read your message, and I think immitating GitHub's UI is a great idea, as it liberates us from having to do any kind of "pretreatment" of the git log (which can be expensive for large repos). We should focus in this direction to fix this issue. If I get some spare time over the holidays I will try to take a look (sadly, I cannot promise that will be the case...). Cheers, Nicolas On Mon, Dec 12, 2022 at 12:02 AM Dmitry Gutov wrote: > > On 18/08/2022 05:10, Dmitry Gutov wrote: > > I experimented with --follow myself in the past, and it is annoying in > > that it skips commits, some of which are visible in the log when you > > don't use --follow, details here: > > https://stackoverflow.com/questions/46487476/git-log-follow-graph-skips-commits > > > > So I figured the approach in (3) has something to do with it. But it > > seems not to be the case. > > I've tried another idea: to pre-process the file's history and pass all > historical file names to 'git log' inside vc-git-print-log. > > Unfortunately, that delays the appearance of the log significantly. In > the Emacs repo that comes down to several seconds, which seems > unacceptable. But that would fix both the problems with a/f/d and the > bug described in the SO question above. > > Looking around for how other software deals with it, it seems GitHub has > found a satisfactory solution which adds a new UI element with basically > zero performance cost. > > At first it was implemented in a Chrome extension for it > (https://github.com/jeffstieler/github-follow-extension), but then added > to the core functionality this summer > (https://github.blog/changelog/2022-06-06-view-commit-history-across-file-renames-and-moves/). > > This gif shows the workflow: > https://i0.wp.com/user-images.githubusercontent.com/4021812/171795153-4f327a04-eb27-4d46-acb1-73d2e82ce4c5.gif?ssl=1 > > We should be able to do something similar. > > Step 1: Drop the '--follow' argument in all cases. > > Step 2: After the log is finished printing, we detect somehow that the > last commit was a rename one. Perhaps using an additional process call, > or perhaps by adding some output to the process which we'll hide through > font-lock or process filter. When it is a rename, we print a message at > the end, saying the file has been renamed. And a button saying e.g. > "Print Previous Log", which would print the history for the previous > name. That history should also include the missing commits from the SO > question. > > Not sure how to deal with duplicating file names best (like etc/NEWS has > been the name of many files in the Emacs repo): either limiting the > first revision to start from -- but that keep bring back the missing > commit problem, oh well -- or some other way. > > Can't exactly check what GitHub is doing, because they don't actually > provide this for NEWS.24, guess because it was not a straight rename: > https://github.com/emacs-mirror/emacs/commits/master/etc/NEWS.24 > > But > > git log -M50% -C --stat 5f8947c7007d1d8 -n 1 > > at least detects it as a copy if not a rename. Guess they didn't adopt > the whole follow-renames logic, and we can do better. > > I don't have any code to show, but it shouldn't require too many changes. From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 12 20:23:39 2022 Received: (at 55871) by debbugs.gnu.org; 13 Dec 2022 01:23:39 +0000 Received: from localhost ([127.0.0.1]:56911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4u1C-0006HY-Rv for submit@debbugs.gnu.org; Mon, 12 Dec 2022 20:23:39 -0500 Received: from mail-wm1-f52.google.com ([209.85.128.52]:52092) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4u1B-0006HR-Ih for 55871@debbugs.gnu.org; Mon, 12 Dec 2022 20:23:38 -0500 Received: by mail-wm1-f52.google.com with SMTP id bg10so7215442wmb.1 for <55871@debbugs.gnu.org>; Mon, 12 Dec 2022 17:23:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=hLUbOjlR894NuzqOtl46SYbHNMn8w8h0qh16b2fbLLc=; b=BawymIawdBCriRBnxia4zneBw70AE3UnvenpbrOcuwSEUC90TDvvQgfoaHAPEJrgUL AJFO/9ht4ljL2pb+xOwz7zkkdmTR0aFiBhksSyyNE7F+HNO95HtX3Z7TvrjSwe9a9EcZ ZLXjwmipY3ACjji+aWgYQjRXpMyEUVI5yJxaJuzq8oZAbh5oG0SRdJmPipEco2Ezo0qC dAhEHEyG/4w1S2oDf/HSSgTXka7W9olvxpq3mKdJ0Crr79yYvyXAQTz5gWM+OhyVC5Hv x/ty26BkDNp11rHU10icw3+TAnDf4iCEsGwLpDOr/zBM5ftmVhlOt2eUg1qD/SDJyVpf W84Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hLUbOjlR894NuzqOtl46SYbHNMn8w8h0qh16b2fbLLc=; b=4km7SarKFY1xKxLgOa7R5ftxDXjisALI0ucQHe8nsK1/5BdZRv95oTSZyJNaZwVpUX Yr/H+x3mE+AXW5mvQXX2Qu7/GWeZv2BISMdMKzCqck/skLiq2ri3iAfD1VOaHRwcDK14 F0PVGkf109D6ykbbmKh5ph0Uvb83iWVWkt9v/JRhnNb2HNsXME/vZh7QNb2b9wdx/uoe R21Z4pkutulRq3l7jX1fiW32Igqd88kwJXaDFXW9Llp8cfVZpQ7zPCGWGoWARBstXRhH /t+c9pb5UbRG6EuBtQ+nqzwdcqBjSM314EnqYifbg8Izj2Ch7ycqRLQigGesAdhm8xyt jVmw== X-Gm-Message-State: ANoB5pkA+aPJVpF63/NLw1gf9C0mpWcKtXmG/dc5nQNtjYm8NjbeCmB2 RaDAYZlYf9qON0wl6niOgXQ= X-Google-Smtp-Source: AA0mqf6tL2F8KK1Am/IhZZHK50jA8YkP604OYkYM/s4OgxjBzRS6TTE38MYwFUkEOrZH01cIwasI8Q== X-Received: by 2002:a05:600c:3d06:b0:3c6:e60f:3f55 with SMTP id bh6-20020a05600c3d0600b003c6e60f3f55mr14287486wmb.12.1670894611789; Mon, 12 Dec 2022 17:23:31 -0800 (PST) Received: from [192.168.0.2] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id m4-20020a05600c090400b003cf4d99fd2asm10576114wmp.6.2022.12.12.17.23.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 Dec 2022 17:23:31 -0800 (PST) Message-ID: Date: Tue, 13 Dec 2022 03:23:29 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: bug#55871: Acknowledgement (27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames) Content-Language: en-US To: =?UTF-8?Q?Nicol=c3=a1s_Ojeda_B=c3=a4r?= References: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> From: Dmitry Gutov In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 55871 Cc: 55871@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.8 (/) Dear Nicolas, On 12/12/2022 18:44, Nicolás Ojeda Bär wrote: > Apologies for the delay in getting back to you; I have been submerged > in my day job and haven't had any time to look at the code again (the > copyright assignment is done, by the way). Good to hear about the copyright assignment. No problem about delayed replies, I first of all wanted to experiment with an alternative and see how others deal with it. > I read your message, and I think immitating GitHub's UI is a great > idea, as it liberates us from having to do any kind of "pretreatment" > of the git log (which can be expensive for large repos). Indeed. I suppose we'll lose out in some more complex cases (e.g. if --follow tracks copies, it might track the cases when several files had been copied into one, including when that action spanned several commits; and thus --follow could show the history of each such file), but we should win in the most common cases (single-file copies and renames) OOtB, which we don't have any good support for still. > We should focus in this direction to fix this issue. If I get some > spare time over the holidays I will try to take a look (sadly, I > cannot promise that will be the case...). We won't be able to put the improvement into Emacs 29 anyway (the release branch has been cut, it's now bugfix-only), so there is no hurry. Let's see who gets to this first. If you wanted to finish up your patch instead, I'm not going to say no either. But GitHub's approach seems like it should require less (and less complex) code. Best, Dmitry. From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 13 19:53:00 2023 Received: (at 55871) by debbugs.gnu.org; 14 Dec 2023 00:53:00 +0000 Received: from localhost ([127.0.0.1]:59892 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDZyG-0008Sg-3N for submit@debbugs.gnu.org; Wed, 13 Dec 2023 19:53:00 -0500 Received: from forward502b.mail.yandex.net ([2a02:6b8:c02:900:1:45:d181:d502]:50118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDZyB-0008SI-G0 for 55871@debbugs.gnu.org; Wed, 13 Dec 2023 19:52:58 -0500 Received: from mail-nwsmtp-smtp-production-main-39.myt.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-39.myt.yp-c.yandex.net [IPv6:2a02:6b8:c12:4a27:0:640:499d:0]) by forward502b.mail.yandex.net (Yandex) with ESMTP id AD8525F0FD; Thu, 14 Dec 2023 03:52:30 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-39.myt.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id SqXALE6OqOs0-VbzEV8bn; Thu, 14 Dec 2023 03:52:30 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1702515150; bh=va+9k4N1Jx7uqOK89GJPPyovqXYwn6MrraHYYfw2fAo=; h=In-Reply-To:From:Message-ID:Cc:References:Date:Subject:To; b=j5Vq0Vpm5SqVW/k1YM3WhWVSDkYVR10/QI5tSx+1UJRplzYvH7B9m6FbMHACM3RE+ OiQgLjpIDtmn2elInvNHxR2eC0E+7XrvkBqdbe00+XGB1KbtQEEcYjr7j+osCuGZUQ 5yWYm1TfqUFlHGTVYGVRWnLNvi3tJU6rWYwoXd/I= Authentication-Results: mail-nwsmtp-smtp-production-main-39.myt.yp-c.yandex.net; dkim=pass header.i=@yandex.ru Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailauth.nyi.internal (Postfix) with ESMTP id EDCB627C0054; Wed, 13 Dec 2023 19:52:27 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 13 Dec 2023 19:52:27 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudelkedgvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpegtkfffgggfuffhvfevfhgjsehmtd erredtfeejnecuhfhrohhmpeffmhhithhrhicuifhuthhovhcuoegughhuthhovheshigr nhguvgigrdhruheqnecuggftrfgrthhtvghrnhepkeeuudeuudeujeffhedugeevhfettd egkeeigeejvdehueeufeegvedukeeljeelnecuvehluhhsthgvrhfuihiivgeptdenucfr rghrrghmpehmrghilhhfrhhomhepughguhhtohhvodhmvghsmhhtphgruhhthhhpvghrsh honhgrlhhithihqddufeeffeelleehhedvqddvleegjeejjeejiedqughguhhtohhvpeep higrnhguvgigrdhruhesfhgrshhtmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: ib1d9465d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 13 Dec 2023 19:52:26 -0500 (EST) Content-Type: multipart/mixed; boundary="------------0mhzjhcCkA6q7Ctc1pZT7cEu" Message-ID: Date: Thu, 14 Dec 2023 02:52:23 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: bug#55871: Acknowledgement (27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames) Content-Language: en-US From: Dmitry Gutov To: =?UTF-8?Q?Nicol=c3=a1s_Ojeda_B=c3=a4r?= References: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> In-Reply-To: X-Spam-Score: -2.9 (--) X-Debbugs-Envelope-To: 55871 Cc: 55871@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: -3.9 (---) This is a multi-part message in MIME format. --------------0mhzjhcCkA6q7Ctc1pZT7cEu Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 13/12/2022 03:23, Dmitry Gutov wrote: >> I read your message, and I think immitating GitHub's UI is a great >> idea, as it liberates us from having to do any kind of "pretreatment" >> of the git log (which can be expensive for large repos). > > Indeed. I suppose we'll lose out in some more complex cases (e.g. if > --follow tracks copies, it might track the cases when several files had > been copied into one, including when that action spanned several > commits; and thus --follow could show the history of each such file), > but we should win in the most common cases (single-file copies and > renames) OOtB, which we don't have any good support for still. > >> We should focus in this direction to fix this issue. If I get some >> spare time over the holidays I will try to take a look (sadly, I >> cannot promise that will be the case...). > > We won't be able to put the improvement into Emacs 29 anyway (the > release branch has been cut, it's now bugfix-only), so there is no hurry. > > Let's see who gets to this first. If you wanted to finish up your patch > instead, I'm not going to say no either. But GitHub's approach seems > like it should require less (and less complex) code. Attached is the implementation for this alternative approach. It's Git-only, but otherwise seems to function well (with potential for future additions). The look of the message and the button could use some work, but this is the best I came up thus far. As far as testing, it allowed following all files in Emacs's repo (that I have tried) to their original creation. Including etc/NEWS.29, and most other NEWS.*, with NEWS.28 being an exception (apparently because on that occasion NEWS was truncated before NEWS.28 was created). Also important: set vc-git-print-log-follow to nil. Otherwise logs don't end on renames, and this feature doesn't get a chance to work. Cheers, Dmitry. --------------0mhzjhcCkA6q7Ctc1pZT7cEu Content-Type: text/x-patch; charset=UTF-8; name="vc-git-file-name-changes.diff" Content-Disposition: attachment; filename="vc-git-file-name-changes.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2V0Yy9ORVdTIGIvZXRjL05FV1MKaW5kZXggMWZmMmY4YTE0OWYuLjRk ZDExYzk5OTI3IDEwMDY0NAotLS0gYS9ldGMvTkVXUworKysgYi9ldGMvTkVXUwpAQCAtNDU3 LDYgKzQ1NywxNCBAQCBXaXRoIHRoaXMgdmFsdWUgb25seSB0aGUgcmV2aXNpb24gbnVtYmVy IGlzIGRpc3BsYXllZCBvbiB0aGUgbW9kZS1saW5lLgogKioqIE9ic29sZXRlIGNvbW1hbmQg J3ZjLXN3aXRjaC1iYWNrZW5kJyByZS1hZGRlZCBhcyAndmMtY2hhbmdlLWJhY2tlbmQnLgog VGhlIGNvbW1hbmQgd2FzIHByZXZpb3VzbHkgb2Jzb2xldGVkIGFuZCB1bmJvdW5kIGluIEVt YWNzIDI4LgogCisqKiogU3VwcG9ydCBmb3Igdmlld2luZyBmaWxlIGNoYW5nZSBoaXN0b3J5 IGFjcm9zcyByZW5hbWVzLgorV2hlbiBhIGZpbGVzZXQncyBWQyBjaGFuZ2UgaGlzdG9yeSBl bmRzIGF0IGEgcmVuYW1lLCB3ZSBub3cgcHJpbnQgdGhlCitvbGQgbmFtZShzKSBhbmQgYSBi dXR0b24gd2hpY2gganVtcHMgdG8gdGhlaXIgaGlzdG9yeS4gIE9ubHkgc3VwcG9ydGVkCit3 aXRoIEdpdCBhdCB0aGUgbW9tZW50LgorCisqKiogTmV3IG9wdGlvbiAndmMtZ2l0LWZpbGUt bmFtZS1jaGFuZ2VzLXN3aXRjaGVzJy4KK0l0IGFsbG93cyB0d2Vha2luZyB0aGUgdGhyZXNo b2xkcyBmb3IgcmVuYW1lIGFuZCBjb3B5IGRldGVjdGlvbi4KKwogKiogRGlmZiBtb2RlCiAK ICsrKwpkaWZmIC0tZ2l0IGEvbGlzcC92Yy92Yy1naXQuZWwgYi9saXNwL3ZjL3ZjLWdpdC5l bAppbmRleCAyZTA1N2VjZmFhNy4uZTJjMmVkNWM3OWMgMTAwNjQ0Ci0tLSBhL2xpc3AvdmMv dmMtZ2l0LmVsCisrKyBiL2xpc3AvdmMvdmMtZ2l0LmVsCkBAIC04OSw2ICs4OSw3IEBACiA7 OyAtIG1ha2UtdmVyc2lvbi1iYWNrdXBzLXAgKGZpbGUpICAgICAgICAgICAgICAgICBOT1Qg TkVFREVECiA7OyAtIHByZXZpb3VzLXJldmlzaW9uIChmaWxlIHJldikgICAgICAgICAgICAg ICAgICBPSwogOzsgLSBuZXh0LXJldmlzaW9uIChmaWxlIHJldikgICAgICAgICAgICAgICAg ICAgICAgT0sKKzs7IC0gZmlsZS1uYW1lLWNoYW5nZXMgKHJldikgICAgICAgICAgICAgICAg ICAgICAgIE9LCiA7OyAtIGNoZWNrLWhlYWRlcnMgKCkgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBDT1VMRCBCRSBTVVBQT1JURUQKIDs7IC0gZGVsZXRlLWZpbGUgKGZpbGUpICAg ICAgICAgICAgICAgICAgICAgICAgICAgIE9LCiA7OyAtIHJlbmFtZS1maWxlIChvbGQgbmV3 KSAgICAgICAgICAgICAgICAgICAgICAgICBPSwpAQCAtMTUyLDYgKzE1MywyMCBAQCB2Yy1n aXQtc2hvcnRsb2ctc3dpdGNoZXMKICAgICAgICAgICAgICAgICAgKHJlcGVhdCA6dGFnICJB cmd1bWVudCBMaXN0IiA6dmFsdWUgKCIiKSBzdHJpbmcpKQogICA6dmVyc2lvbiAiMzAuMSIp CiAKKzs7IFhYWDogKHNldHEgdmMtZ2l0LWxvZy1zd2l0Y2hlcyAnKCItLXNpbXBsaWZ5LW1l cmdlcyIpKSBjYW4gYWxzbworOzsgY3JlYXRlIGZ1bGxlciBoaXN0b3J5IHdoZW4gdXNpbmcg dGhpcyBmZWF0dXJlLiAgTm90IHN1cmUgd2h5LgorKGRlZmN1c3RvbSB2Yy1naXQtZmlsZS1u YW1lLWNoYW5nZXMtc3dpdGNoZXMgJygiLU0iICItQyIpCisgICJTdHJpbmcgb3IgbGlzdCBv ZiBzdHJpbmcgdG8gcGFzcyB0byBHaXQgd2hlbiBmaW5kaW5nIHByZXZpb3VzIG5hbWVzLgor CitUaGlzIG9wdGlvbiBzaG91bGQgdXN1YWxseSBhdCBsZWFzdCBjb250YWluICctTScuICBZ b3UgY2FuIGFkanVzdAordGhlIGZsYWdzIHRvIGNoYW5nZSB0aGUgc2ltaWxhcml0eSB0aHJl c2hvbGRzIChkZWZhdWx0IDUwJSkuICBPcgorYWRkIGAtLWZpbmQtY29waWVzLWhhcmRlcicg KHNsb3dlciBpbiBsYXJnZSBwcm9qZWN0cywgc2luY2UgaXQKK3VzZXMgYSBmdWxsIHNjYW4p LiIKKyAgOnR5cGUgJyhjaG9pY2UgKGNvbnN0IDp0YWcgIk5vbmUiIG5pbCkKKyAgICAgICAg ICAgICAgICAgKHN0cmluZyA6dGFnICJBcmd1bWVudCBTdHJpbmciKQorICAgICAgICAgICAg ICAgICAocmVwZWF0IDp0YWcgIkFyZ3VtZW50IExpc3QiIDp2YWx1ZSAoIiIpIHN0cmluZykp CisgIDp2ZXJzaW9uICIzMC4xIikKKwogKGRlZmN1c3RvbSB2Yy1naXQtcmVzb2x2ZS1jb25m bGljdHMgdAogICAiV2hlbiBub24tbmlsLCBtYXJrIGNvbmZsaWN0ZWQgZmlsZSBhcyByZXNv bHZlZCB1cG9uIHNhdmluZy4KIFRoYXQgaXMgcGVyZm9ybWVkIGFmdGVyIGFsbCBjb25mbGlj dCBtYXJrZXJzIGluIGl0IGhhdmUgYmVlbgpAQCAtMTIzOSw2ICsxMjU0LDMwIEBAIHZjLWdp dC1maW5kLXJldmlzaW9uCiAgICAgIG5pbAogICAgICAiY2F0LWZpbGUiICJibG9iIiAoY29u Y2F0IChpZiByZXYgcmV2ICJIRUFEIikgIjoiIGZ1bGxuYW1lKSkpKQogCisoZGVmdW4gdmMt Z2l0LWZpbGUtbmFtZS1jaGFuZ2VzIChyZXYpCisgICh3aXRoLXRlbXAtYnVmZmVyCisgICAg KGxldCAoKHJvb3QgKHZjLWdpdC1yb290IGRlZmF1bHQtZGlyZWN0b3J5KSkpCisgICAgICAo YXBwbHkgIyd2Yy1naXQtY29tbWFuZCAoY3VycmVudC1idWZmZXIpIHQgbmlsCisgICAgICAg ICAgICAgImRpZmYiCisgICAgICAgICAgICAgIi0tbmFtZS1zdGF0dXMiCisgICAgICAgICAg ICAgIi0tZGlmZi1maWx0ZXI9QURDUiIKKyAgICAgICAgICAgICAoY29uY2F0IHJldiAiXiIp IHJldgorICAgICAgICAgICAgICh2Yy1zd2l0Y2hlcyAnZ2l0ICdmaWxlLW5hbWUtY2hhbmdl cykpCisgICAgICAobGV0IChyZXMpCisgICAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1pbikp CisgICAgICAgICh3aGlsZSAocmUtc2VhcmNoLWZvcndhcmQgIl5cXChbQ01SXVxcKVswLTld Klx0XFwoW15cblx0XStcXClcXCg/Olx0XFwoW15cblx0XStcXClcXCk/IiBuaWwgdCkKKyAg ICAgICAgICAocGNhc2UgKG1hdGNoLXN0cmluZyAxKQorICAgICAgICAgICAgKCJBIiAocHVz aCAoY29ucyBuaWwgKG1hdGNoLXN0cmluZyAyKSkgcmVzKSkKKyAgICAgICAgICAgICgiRCIg KHB1c2ggKGNvbnMgKG1hdGNoLXN0cmluZyAyKSBuaWwpIHJlcykpCisgICAgICAgICAgICAo KG9yICJDIiAiUiIpIChwdXNoIChjb25zIChtYXRjaC1zdHJpbmcgMikgKG1hdGNoLXN0cmlu ZyAzKSkgcmVzKSkKKyAgICAgICAgICAgIDs7ICgiTSIgKHB1c2ggKGNvbnMgKG1hdGNoLXN0 cmluZyAxKSAobWF0Y2gtc3RyaW5nIDEpKSByZXMpKQorICAgICAgICAgICAgKSkKKyAgICAg ICAgKG1hcGMgKGxhbWJkYSAoYykKKyAgICAgICAgICAgICAgICAoaWYgKGNhciBjKSAoc2V0 Y2FyIGMgKGV4cGFuZC1maWxlLW5hbWUgKGNhciBjKSByb290KSkpCisgICAgICAgICAgICAg ICAgKGlmIChjZHIgYykgKHNldGNkciBjIChleHBhbmQtZmlsZS1uYW1lIChjZHIgYykgcm9v dCkpKSkKKyAgICAgICAgICAgICAgICByZXMpCisgICAgICAgIChucmV2ZXJzZSByZXMpKSkp KQorCiAoZGVmdW4gdmMtZ2l0LWZpbmQtaWdub3JlLWZpbGUgKGZpbGUpCiAgICJSZXR1cm4g dGhlIGdpdCBpZ25vcmUgZmlsZSB0aGF0IGNvbnRyb2xzIEZJTEUuIgogICAoZXhwYW5kLWZp bGUtbmFtZSAiLmdpdGlnbm9yZSIKQEAgLTE0MTYsNyArMTQ1NSwxNSBAQCB2Yy1naXQtY2xv bmUKIDs7IExvbmcgZXhwbGFuYXRpb24gaGVyZToKIDs7IGh0dHBzOi8vc3RhY2tvdmVyZmxv dy5jb20vcXVlc3Rpb25zLzQ2NDg3NDc2L2dpdC1sb2ctZm9sbG93LWdyYXBoLXNraXBzLWNv bW1pdHMKIChkZWZjdXN0b20gdmMtZ2l0LXByaW50LWxvZy1mb2xsb3cgbmlsCi0gICJJZiB0 cnVlLCBmb2xsb3cgcmVuYW1lcyBpbiBHaXQgbG9ncyBmb3IgYSBzaW5nbGUgZmlsZS4iCisg ICJJZiB0cnVlLCB1c2UgdGhlIGZsYWcgYC0tZm9sbG93JyB3aGVuIHByb2R1Y2luZyBzaW5n bGUgZmlsZSBsb2dzLgorCitJdCB3aWxsIG1ha2UgdGhlIHByaW50ZWQgbG9nIGF1dG9tYXRp Y2FsbHkgZm9sbG93IHRoZSByZW5hbWVzLgorVGhlIGRvd25zaWRlcyBpcyB0aGF0IHRoZSBs b2cgcHJvZHVjZWQgdGhpcyB3YXkgbWF5IG9taXQKK2NlcnRhaW4gKG1lcmdlKSBjb21taXRz LCBhbmQgdGhhdCBgbG9nLXZpZXctZGlmZicgZmFpbHMgb24KK2NvbW1pdHMgdGhhdCB1c2Vk IHRoZSBwcmV2aW91cyBuYW1lLCBpbiB0aGF0IGxvZyBidWZmZXIuCisKK1doZW4gdGhpcyB2 YXJpYWJsZSBpcyBuaWwsIGFuZCB0aGUgbG9nIGVuZHMgd2l0aCBhIHJlbmFtZSwgd2UKK3By aW50IGEgYnV0dG9uIHRoYXQgc2hvd3MgdGhlIGxvZyBmb3IgdGhlIHByZXZpb3VzIG5hbWUu IgogICA6dHlwZSAnYm9vbGVhbgogICA6dmVyc2lvbiAiMjYuMSIpCiAKZGlmZiAtLWdpdCBh L2xpc3AvdmMvdmMuZWwgYi9saXNwL3ZjL3ZjLmVsCmluZGV4IDk1ODkyOWZlNGM2Li5lNjI2 ZDcyZDU5YSAxMDA2NDQKLS0tIGEvbGlzcC92Yy92Yy5lbAorKysgYi9saXNwL3ZjL3ZjLmVs CkBAIC01MTcsNiArNTE3LDEzIEBACiA7OyAgIFJldHVybiB0aGUgcmV2aXNpb24gbnVtYmVy IHRoYXQgcHJlY2VkZXMgUkVWIGZvciBGSUxFLCBvciBuaWwgaWYgbm8gc3VjaAogOzsgICBy ZXZpc2lvbiBleGlzdHMuCiA7OworOzsgLSBmaWxlLW5hbWUtY2hhbmdlcyAocmV2KQorOzsK Kzs7ICAgUmV0dXJuIHRoZSBsaXN0IG9mIHBhaXJzIHdpdGggY2hhbmdlcyBpbiBmaWxlIG5h bWVzIGluIFJFVi4gIFdoZW4KKzs7ICAgYSBmaWxlIHdhcyBhZGRlZCwgaXQgc2hvdWxkIGJl IGEgY29ucyB3aXRoIG5pbCBjYXIuICBXaGVuCis7OyAgIGRlbGV0ZWQsIGEgY29ucyB3aXRo IG5pbCBjZHIuICBXaGVuIGNvcGllZCBvciByZW5hbWVkLCBhIGNvbnMKKzs7ICAgd2l0aCB0 aGUgc291cmNlIG5hbWUgYXMgY2FyIGFuZCBkZXN0aW5hdGlvbiBuYW1lIGFzIGNkci4KKzs7 CiA7OyAtIG5leHQtcmV2aXNpb24gKGZpbGUgcmV2KQogOzsKIDs7ICAgUmV0dXJuIHRoZSBy ZXZpc2lvbiBudW1iZXIgdGhhdCBmb2xsb3dzIFJFViBmb3IgRklMRSwgb3IgbmlsIGlmIG5v IHN1Y2gKQEAgLTI2OTUsOSArMjcwMiw0MiBAQCB2Yy1wcmludC1sb2ctc2V0dXAtYnV0dG9u cwogICAgICAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkKICAgICAgICh3aGlsZSAocmUtc2Vh cmNoLWZvcndhcmQgbG9nLXZpZXctbWVzc2FnZS1yZSBuaWwgdCkKICAgICAgICAgKGNsLWlu Y2YgZW50cmllcykpCi0gICAgICA7OyBJZiB3ZSBnb3QgZmV3ZXIgZW50cmllcyB0aGFuIHdl IGFza2VkIGZvciwgdGhlbiBkaXNwbGF5aW5nCi0gICAgICA7OyB0aGUgIm1vcmUiIGJ1dHRv bnMgaXNuJ3QgdXNlZnVsLgotICAgICAgKHdoZW4gKD49IGVudHJpZXMgbGltaXQpCisgICAg ICAoaWYgKDwgZW50cmllcyBsaW1pdCkKKyAgICAgICAgICA7OyBUaGUgbG9nIGhhcyBiZWVu IHByaW50ZWQgaW4gZnVsbC4gIFBlcmhhcHMgaXQgc3RhcnRlZAorICAgICAgICAgIDs7IHdp dGggYSBjb3B5IG9yIHJlbmFtZT8KKyAgICAgICAgICAobGV0KiAoKGxhc3QtcmV2aXNpb24g KGxvZy12aWV3LWN1cnJlbnQtdGFnIChwb2ludC1tYXgpKSkKKyAgICAgICAgICAgICAgICAg OzsgQ291bGQgc2tpcCB0aGlzIHdoZW4gdmMtZ2l0LXByaW50LWxvZy1mb2xsb3cgPSB0Lgor ICAgICAgICAgICAgICAgICAobmFtZS1jaGFuZ2VzCisgICAgICAgICAgICAgICAgICAoY29u ZGl0aW9uLWNhc2UgbmlsCisgICAgICAgICAgICAgICAgICAgICAgKHZjLWNhbGwtYmFja2Vu ZCBsb2ctdmlldy12Yy1iYWNrZW5kCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAnZmlsZS1uYW1lLWNoYW5nZXMgbGFzdC1yZXZpc2lvbikKKyAgICAgICAgICAg ICAgICAgICAgKHZjLW5vdC1zdXBwb3J0ZWQgbmlsKSkpCisgICAgICAgICAgICAgICAgICht YXRjaGluZy1jaGFuZ2VzCisgICAgICAgICAgICAgICAgICAoY2wtZGVsZXRlLWlmLW5vdCAo bGFtYmRhIChmKSAobWVtYmVyIGYgbG9nLXZpZXctdmMtZmlsZXNldCkpCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBuYW1lLWNoYW5nZXMgOmtleSAjJ2NkcikpCisg ICAgICAgICAgICAgICAgIChvbGQtbmFtZXMgKG1hcGNhciAjJ2NhciBtYXRjaGluZy1jaGFu Z2VzKSkKKyAgICAgICAgICAgICAgICAgKHJlbGF0aXZlcyAobWFwY2FyICMnZmlsZS1yZWxh dGl2ZS1uYW1lIG9sZC1uYW1lcykpKQorICAgICAgICAgICAgKHdoZW4gb2xkLW5hbWVzCisg ICAgICAgICAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1heCkpCisgICAgICAgICAgICAgIChp bnNlcnQgIlxuIikKKyAgICAgICAgICAgICAgKGluc2VydAorICAgICAgICAgICAgICAgKGZv cm1hdAorICAgICAgICAgICAgICAgICJSZW5hbWVkIGZyb20gJXMiCisgICAgICAgICAgICAg ICAgKG1hcGNvbmNhdCAobGFtYmRhIChzKQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAocHJvcGVydGl6ZSBzICdmb250LWxvY2stZmFjZQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAnbG9nLXZpZXctZmlsZSkpCisgICAgICAgICAgICAgICAg ICAgICAgICAgICByZWxhdGl2ZXMgIiwgIikpCisgICAgICAgICAgICAgICAiICIpCisgICAg ICAgICAgICAgIDs7IFRPRE86IEFsc28gcHJpbnQgYSAiTmV4dCBsb2ciIGJ1dHRvbiBhYm92 ZSB0aGUgYnVmZmVyCisgICAgICAgICAgICAgIDs7IGNyZWF0ZWQgYnkgdGhpcyBidXR0b24g dG8gYmUgYWJsZSB0byBnbyBiYWNrIHF1aWNrbHkuCisgICAgICAgICAgICAgIChpbnNlcnQt dGV4dC1idXR0b24KKyAgICAgICAgICAgICAgICJWaWV3IGxvZyIKKyAgICAgICAgICAgICAg ICdhY3Rpb24gKGxhbWJkYSAoJnJlc3QgX2lnbm9yZSkKKyAgICAgICAgICAgICAgICAgICAg ICAgICAodmMtcHJpbnQtbG9nLWludGVybmFsIGxvZy12aWV3LXZjLWJhY2tlbmQgb2xkLW5h bWVzCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBs YXN0LXJldmlzaW9uIG5pbCBsaW1pdCkpCisgICAgICAgICAgICAgICAnaGVscC1lY2hvCisg ICAgICAgICAgICAgICAiU2hvdyB0aGUgbG9nIGZvciB0aGUgZmlsZSBuYW1lKHMpIGJlZm9y ZSB0aGUgcmVuYW1lIikpKQorICAgICAgICA7OyBQZXJoYXBzIHRoZXJlIGFyZSBtb3JlIGVu dHJpZXMgaW4gdGhlIGxvZy4KICAgICAgICAgKGdvdG8tY2hhciAocG9pbnQtbWF4KSkKICAg ICAgICAgKGluc2VydCAiXG4iKQogICAgICAgICAoaW5zZXJ0LXRleHQtYnV0dG9uCg== --------------0mhzjhcCkA6q7Ctc1pZT7cEu-- From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 13 20:23:41 2023 Received: (at 55871) by debbugs.gnu.org; 14 Dec 2023 01:23:41 +0000 Received: from localhost ([127.0.0.1]:59917 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDaRw-0000rL-UA for submit@debbugs.gnu.org; Wed, 13 Dec 2023 20:23:41 -0500 Received: from forward502c.mail.yandex.net ([2a02:6b8:c03:500:1:45:d181:d502]:50586) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDaRq-0000qy-Q0 for 55871@debbugs.gnu.org; Wed, 13 Dec 2023 20:23:39 -0500 Received: from mail-nwsmtp-smtp-production-main-57.myt.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-57.myt.yp-c.yandex.net [IPv6:2a02:6b8:c12:2612:0:640:2e49:0]) by forward502c.mail.yandex.net (Yandex) with ESMTP id 23A0461487; Thu, 14 Dec 2023 04:23:10 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-57.myt.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id 8NYsKT6OvmI0-SpjQhDaV; Thu, 14 Dec 2023 04:23:09 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1702516989; bh=l2vBEjEWBhy+VCqKdBskyKSh4ehzPfzKL/0HYAKYK3A=; h=In-Reply-To:From:Subject:Message-ID:Cc:References:Date:To; b=Vf1erz7jsFZA8pk0apcquHUMmjmToS+Xi74sGYxqengeCJep0Hw+xrK20f8st10be R9BAsSeCQPliC6+oMr1/WuuTjRDAJ/IsBeMrK2/8at6YAuEs3vBi8v4dWQ3G5Hqrzm aN6ar5xTxM/FnsBxgI73npidpeayOiCAXwzEKinY= Authentication-Results: mail-nwsmtp-smtp-production-main-57.myt.yp-c.yandex.net; dkim=pass header.i=@yandex.ru Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailauth.nyi.internal (Postfix) with ESMTP id 1038E27C005B; Wed, 13 Dec 2023 20:23:07 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 13 Dec 2023 20:23:08 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudelkedgfeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefkffggfgfuhffvvehfjggtgfesth ejredttdefjeenucfhrhhomhepffhmihhtrhihucfiuhhtohhvuceoughguhhtohhvseih rghnuggvgidrrhhuqeenucggtffrrghtthgvrhhnpeffleettdekffdtudffiedutedtve eiffegieegjeegleefteevteduheefveevfeenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpegughhuthhovhdomhgvshhmthhprghuthhhphgvrh hsohhnrghlihhthidqudeffeefleelheehvddqvdelgeejjeejjeeiqdgughhuthhovhep peihrghnuggvgidrrhhusehfrghsthhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: ib1d9465d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 13 Dec 2023 20:23:06 -0500 (EST) Message-ID: <1b16a642-8a85-e693-66fc-41c37df24908@yandex.ru> Date: Thu, 14 Dec 2023 03:23:05 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: bug#55871: Acknowledgement (27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames) Content-Language: en-US From: Dmitry Gutov To: =?UTF-8?Q?Nicol=c3=a1s_Ojeda_B=c3=a4r?= References: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -2.9 (--) X-Debbugs-Envelope-To: 55871 Cc: 55871@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: -3.9 (---) On 14/12/2023 02:52, Dmitry Gutov wrote: > but otherwise seems to function well (with potential for future additions) To clarify: this version only makes 'd' work (not 'f' or 'a'), but the other two are fixed more easily. From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 14 21:02:12 2023 Received: (at 55871) by debbugs.gnu.org; 15 Dec 2023 02:02:13 +0000 Received: from localhost ([127.0.0.1]:51366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDxWm-0005GH-9q for submit@debbugs.gnu.org; Thu, 14 Dec 2023 21:02:12 -0500 Received: from forward500a.mail.yandex.net ([178.154.239.80]:58160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDxWi-0005G2-5C for 55871@debbugs.gnu.org; Thu, 14 Dec 2023 21:02:10 -0500 Received: from mail-nwsmtp-smtp-production-main-84.vla.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-84.vla.yp-c.yandex.net [IPv6:2a02:6b8:c2b:7a7:0:640:3f88:0]) by forward500a.mail.yandex.net (Yandex) with ESMTP id CBEA260E30; Fri, 15 Dec 2023 05:02:05 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-84.vla.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id 32a3j77OqGk0-9DeQe9rl; Fri, 15 Dec 2023 05:02:05 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1702605725; bh=o2CvQKXv8eCR5IXgDERP+Wr3VmjaykcB5HJDzqxlk0k=; h=In-Reply-To:From:Message-ID:Cc:References:Date:Subject:To; b=WC6fsSgvB6Ofmpeo7CfuGJQZUeUVtC1re1krPm7cUN1pLhP9YsK3aVHsCWpN/CFm4 QCEsiNBLJzA18lyevX+oa8r/3+6WCJVfgDiGSVB70Cp1dpaRsljMe0oDA5Y+KSL43s KmgP2xRFAg3pAcYw9e/r3DMvhLV5NLEC3/arpweQ= Authentication-Results: mail-nwsmtp-smtp-production-main-84.vla.yp-c.yandex.net; dkim=pass header.i=@yandex.ru Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailauth.nyi.internal (Postfix) with ESMTP id 8783027C0054; Thu, 14 Dec 2023 21:02:03 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 14 Dec 2023 21:02:03 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvddttddggeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpegtkfffgggfuffhvfevfhgjsehmtd erredtfeejnecuhfhrohhmpeffmhhithhrhicuifhuthhovhcuoegughhuthhovheshigr nhguvgigrdhruheqnecuggftrfgrthhtvghrnhepkeeuudeuudeujeffhedugeevhfettd egkeeigeejvdehueeufeegvedukeeljeelnecuvehluhhsthgvrhfuihiivgeptdenucfr rghrrghmpehmrghilhhfrhhomhepughguhhtohhvodhmvghsmhhtphgruhhthhhpvghrsh honhgrlhhithihqddufeeffeelleehhedvqddvleegjeejjeejiedqughguhhtohhvpeep higrnhguvgigrdhruhesfhgrshhtmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: ib1d9465d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 14 Dec 2023 21:02:02 -0500 (EST) Content-Type: multipart/mixed; boundary="------------9U2AGPSI9Hkf4vqNo0d64qFX" Message-ID: <36b48587-a723-73ae-fefb-886d69d04ec8@yandex.ru> Date: Fri, 15 Dec 2023 04:01:59 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: bug#55871: Acknowledgement (27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames) Content-Language: en-US From: Dmitry Gutov To: =?UTF-8?Q?Nicol=c3=a1s_Ojeda_B=c3=a4r?= References: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> <1b16a642-8a85-e693-66fc-41c37df24908@yandex.ru> In-Reply-To: <1b16a642-8a85-e693-66fc-41c37df24908@yandex.ru> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 55871 Cc: 55871@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.7 (-) This is a multi-part message in MIME format. --------------9U2AGPSI9Hkf4vqNo0d64qFX Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 14/12/2023 03:23, Dmitry Gutov wrote: > On 14/12/2023 02:52, Dmitry Gutov wrote: >> but otherwise seems to function well (with potential for future >> additions) > > To clarify: this version only makes 'd' work (not 'f' or 'a'), but the > other two are fixed more easily. Attached is the new revision with combined fix. --------------9U2AGPSI9Hkf4vqNo0d64qFX Content-Type: text/x-patch; charset=UTF-8; name="vc-git-file-name-changes-v2.diff" Content-Disposition: attachment; filename="vc-git-file-name-changes-v2.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2V0Yy9ORVdTIGIvZXRjL05FV1MKaW5kZXggMWZmMmY4YTE0OWYuLjRk ZDExYzk5OTI3IDEwMDY0NAotLS0gYS9ldGMvTkVXUworKysgYi9ldGMvTkVXUwpAQCAtNDU3 LDYgKzQ1NywxNCBAQCBXaXRoIHRoaXMgdmFsdWUgb25seSB0aGUgcmV2aXNpb24gbnVtYmVy IGlzIGRpc3BsYXllZCBvbiB0aGUgbW9kZS1saW5lLgogKioqIE9ic29sZXRlIGNvbW1hbmQg J3ZjLXN3aXRjaC1iYWNrZW5kJyByZS1hZGRlZCBhcyAndmMtY2hhbmdlLWJhY2tlbmQnLgog VGhlIGNvbW1hbmQgd2FzIHByZXZpb3VzbHkgb2Jzb2xldGVkIGFuZCB1bmJvdW5kIGluIEVt YWNzIDI4LgogCisqKiogU3VwcG9ydCBmb3Igdmlld2luZyBmaWxlIGNoYW5nZSBoaXN0b3J5 IGFjcm9zcyByZW5hbWVzLgorV2hlbiBhIGZpbGVzZXQncyBWQyBjaGFuZ2UgaGlzdG9yeSBl bmRzIGF0IGEgcmVuYW1lLCB3ZSBub3cgcHJpbnQgdGhlCitvbGQgbmFtZShzKSBhbmQgYSBi dXR0b24gd2hpY2gganVtcHMgdG8gdGhlaXIgaGlzdG9yeS4gIE9ubHkgc3VwcG9ydGVkCit3 aXRoIEdpdCBhdCB0aGUgbW9tZW50LgorCisqKiogTmV3IG9wdGlvbiAndmMtZ2l0LWZpbGUt bmFtZS1jaGFuZ2VzLXN3aXRjaGVzJy4KK0l0IGFsbG93cyB0d2Vha2luZyB0aGUgdGhyZXNo b2xkcyBmb3IgcmVuYW1lIGFuZCBjb3B5IGRldGVjdGlvbi4KKwogKiogRGlmZiBtb2RlCiAK ICsrKwpkaWZmIC0tZ2l0IGEvbGlzcC92Yy9sb2ctdmlldy5lbCBiL2xpc3AvdmMvbG9nLXZp ZXcuZWwKaW5kZXggYWYyNGZjZmQzOTguLjZjM2FiZDE1ZDhkIDEwMDY0NAotLS0gYS9saXNw L3ZjL2xvZy12aWV3LmVsCisrKyBiL2xpc3AvdmMvbG9nLXZpZXcuZWwKQEAgLTUxNiw3ICs1 MTYsOCBAQCBsb2ctdmlldy1maW5kLXJldmlzaW9uCiAgICAgKHN3aXRjaC10by1idWZmZXIg KHZjLWZpbmQtcmV2aXNpb24gKGlmIGxvZy12aWV3LXBlci1maWxlLWxvZ3MKIAkJCQkJICAg IChsb2ctdmlldy1jdXJyZW50LWZpbGUpCiAJCQkJCSAgKGNhciBsb2ctdmlldy12Yy1maWxl c2V0KSkKLQkJCQkJKGxvZy12aWV3LWN1cnJlbnQtdGFnKSkpKSkKKwkJCQkJKGxvZy12aWV3 LWN1cnJlbnQtdGFnKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGxvZy12aWV3LXZjLWJhY2tlbmQpKSkpCiAKIAogKGRlZnVuIGxvZy12aWV3LWV4dHJhY3Qt Y29tbWVudCAoKQpAQCAtNTYyLDcgKzU2Myw4IEBAIGxvZy12aWV3LWFubm90YXRlLXZlcnNp b24KICAgICAodmMtYW5ub3RhdGUgKGlmIGxvZy12aWV3LXBlci1maWxlLWxvZ3MKIAkJICAg ICAobG9nLXZpZXctY3VycmVudC1maWxlKQogCQkgICAoY2FyIGxvZy12aWV3LXZjLWZpbGVz ZXQpKQotCQkgKGxvZy12aWV3LWN1cnJlbnQtdGFnKSkpKQorCQkgKGxvZy12aWV3LWN1cnJl bnQtdGFnKQorICAgICAgICAgICAgICAgICBuaWwgbmlsIG5pbCBsb2ctdmlldy12Yy1iYWNr ZW5kKSkpCiAKIDs7CiA7OyBkaWZmCmRpZmYgLS1naXQgYS9saXNwL3ZjL3ZjLWdpdC5lbCBi L2xpc3AvdmMvdmMtZ2l0LmVsCmluZGV4IDJlMDU3ZWNmYWE3Li5mMWQwZmZkOWI0NCAxMDA2 NDQKLS0tIGEvbGlzcC92Yy92Yy1naXQuZWwKKysrIGIvbGlzcC92Yy92Yy1naXQuZWwKQEAg LTg5LDYgKzg5LDcgQEAKIDs7IC0gbWFrZS12ZXJzaW9uLWJhY2t1cHMtcCAoZmlsZSkgICAg ICAgICAgICAgICAgIE5PVCBORUVERUQKIDs7IC0gcHJldmlvdXMtcmV2aXNpb24gKGZpbGUg cmV2KSAgICAgICAgICAgICAgICAgIE9LCiA7OyAtIG5leHQtcmV2aXNpb24gKGZpbGUgcmV2 KSAgICAgICAgICAgICAgICAgICAgICBPSworOzsgLSBmaWxlLW5hbWUtY2hhbmdlcyAocmV2 KSAgICAgICAgICAgICAgICAgICAgICAgT0sKIDs7IC0gY2hlY2staGVhZGVycyAoKSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIENPVUxEIEJFIFNVUFBPUlRFRAogOzsgLSBkZWxl dGUtZmlsZSAoZmlsZSkgICAgICAgICAgICAgICAgICAgICAgICAgICAgT0sKIDs7IC0gcmVu YW1lLWZpbGUgKG9sZCBuZXcpICAgICAgICAgICAgICAgICAgICAgICAgIE9LCkBAIC0xNTIs NiArMTUzLDIwIEBAIHZjLWdpdC1zaG9ydGxvZy1zd2l0Y2hlcwogICAgICAgICAgICAgICAg ICAocmVwZWF0IDp0YWcgIkFyZ3VtZW50IExpc3QiIDp2YWx1ZSAoIiIpIHN0cmluZykpCiAg IDp2ZXJzaW9uICIzMC4xIikKIAorOzsgWFhYOiAoc2V0cSB2Yy1naXQtbG9nLXN3aXRjaGVz ICcoIi0tc2ltcGxpZnktbWVyZ2VzIikpIGNhbiBhbHNvCis7OyBjcmVhdGUgZnVsbGVyIGhp c3Rvcnkgd2hlbiB1c2luZyB0aGlzIGZlYXR1cmUuICBOb3Qgc3VyZSB3aHkuCisoZGVmY3Vz dG9tIHZjLWdpdC1maWxlLW5hbWUtY2hhbmdlcy1zd2l0Y2hlcyAnKCItTSIgIi1DIikKKyAg IlN0cmluZyBvciBsaXN0IG9mIHN0cmluZyB0byBwYXNzIHRvIEdpdCB3aGVuIGZpbmRpbmcg cHJldmlvdXMgbmFtZXMuCisKK1RoaXMgb3B0aW9uIHNob3VsZCB1c3VhbGx5IGF0IGxlYXN0 IGNvbnRhaW4gJy1NJy4gIFlvdSBjYW4gYWRqdXN0Cit0aGUgZmxhZ3MgdG8gY2hhbmdlIHRo ZSBzaW1pbGFyaXR5IHRocmVzaG9sZHMgKGRlZmF1bHQgNTAlKS4gIE9yCithZGQgYC0tZmlu ZC1jb3BpZXMtaGFyZGVyJyAoc2xvd2VyIGluIGxhcmdlIHByb2plY3RzLCBzaW5jZSBpdAor dXNlcyBhIGZ1bGwgc2NhbikuIgorICA6dHlwZSAnKGNob2ljZSAoY29uc3QgOnRhZyAiTm9u ZSIgbmlsKQorICAgICAgICAgICAgICAgICAoc3RyaW5nIDp0YWcgIkFyZ3VtZW50IFN0cmlu ZyIpCisgICAgICAgICAgICAgICAgIChyZXBlYXQgOnRhZyAiQXJndW1lbnQgTGlzdCIgOnZh bHVlICgiIikgc3RyaW5nKSkKKyAgOnZlcnNpb24gIjMwLjEiKQorCiAoZGVmY3VzdG9tIHZj LWdpdC1yZXNvbHZlLWNvbmZsaWN0cyB0CiAgICJXaGVuIG5vbi1uaWwsIG1hcmsgY29uZmxp Y3RlZCBmaWxlIGFzIHJlc29sdmVkIHVwb24gc2F2aW5nLgogVGhhdCBpcyBwZXJmb3JtZWQg YWZ0ZXIgYWxsIGNvbmZsaWN0IG1hcmtlcnMgaW4gaXQgaGF2ZSBiZWVuCkBAIC0xMjM5LDYg KzEyNTQsMzAgQEAgdmMtZ2l0LWZpbmQtcmV2aXNpb24KICAgICAgbmlsCiAgICAgICJjYXQt ZmlsZSIgImJsb2IiIChjb25jYXQgKGlmIHJldiByZXYgIkhFQUQiKSAiOiIgZnVsbG5hbWUp KSkpCiAKKyhkZWZ1biB2Yy1naXQtZmlsZS1uYW1lLWNoYW5nZXMgKHJldikKKyAgKHdpdGgt dGVtcC1idWZmZXIKKyAgICAobGV0ICgocm9vdCAodmMtZ2l0LXJvb3QgZGVmYXVsdC1kaXJl Y3RvcnkpKSkKKyAgICAgIChhcHBseSAjJ3ZjLWdpdC1jb21tYW5kIChjdXJyZW50LWJ1ZmZl cikgdCBuaWwKKyAgICAgICAgICAgICAiZGlmZiIKKyAgICAgICAgICAgICAiLS1uYW1lLXN0 YXR1cyIKKyAgICAgICAgICAgICAiLS1kaWZmLWZpbHRlcj1BRENSIgorICAgICAgICAgICAg IChjb25jYXQgcmV2ICJeIikgcmV2CisgICAgICAgICAgICAgKHZjLXN3aXRjaGVzICdnaXQg J2ZpbGUtbmFtZS1jaGFuZ2VzKSkKKyAgICAgIChsZXQgKHJlcykKKyAgICAgICAgKGdvdG8t Y2hhciAocG9pbnQtbWluKSkKKyAgICAgICAgKHdoaWxlIChyZS1zZWFyY2gtZm9yd2FyZCAi XlxcKFtBRENSXVxcKVswLTldKlx0XFwoW15cblx0XStcXClcXCg/Olx0XFwoW15cblx0XStc XClcXCk/IiBuaWwgdCkKKyAgICAgICAgICAocGNhc2UgKG1hdGNoLXN0cmluZyAxKQorICAg ICAgICAgICAgKCJBIiAocHVzaCAoY29ucyBuaWwgKG1hdGNoLXN0cmluZyAyKSkgcmVzKSkK KyAgICAgICAgICAgICgiRCIgKHB1c2ggKGNvbnMgKG1hdGNoLXN0cmluZyAyKSBuaWwpIHJl cykpCisgICAgICAgICAgICAoKG9yICJDIiAiUiIpIChwdXNoIChjb25zIChtYXRjaC1zdHJp bmcgMikgKG1hdGNoLXN0cmluZyAzKSkgcmVzKSkKKyAgICAgICAgICAgIDs7ICgiTSIgKHB1 c2ggKGNvbnMgKG1hdGNoLXN0cmluZyAxKSAobWF0Y2gtc3RyaW5nIDEpKSByZXMpKQorICAg ICAgICAgICAgKSkKKyAgICAgICAgKG1hcGMgKGxhbWJkYSAoYykKKyAgICAgICAgICAgICAg ICAoaWYgKGNhciBjKSAoc2V0Y2FyIGMgKGV4cGFuZC1maWxlLW5hbWUgKGNhciBjKSByb290 KSkpCisgICAgICAgICAgICAgICAgKGlmIChjZHIgYykgKHNldGNkciBjIChleHBhbmQtZmls ZS1uYW1lIChjZHIgYykgcm9vdCkpKSkKKyAgICAgICAgICAgICAgICByZXMpCisgICAgICAg IChucmV2ZXJzZSByZXMpKSkpKQorCiAoZGVmdW4gdmMtZ2l0LWZpbmQtaWdub3JlLWZpbGUg KGZpbGUpCiAgICJSZXR1cm4gdGhlIGdpdCBpZ25vcmUgZmlsZSB0aGF0IGNvbnRyb2xzIEZJ TEUuIgogICAoZXhwYW5kLWZpbGUtbmFtZSAiLmdpdGlnbm9yZSIKQEAgLTE0MTYsNyArMTQ1 NSwxNSBAQCB2Yy1naXQtY2xvbmUKIDs7IExvbmcgZXhwbGFuYXRpb24gaGVyZToKIDs7IGh0 dHBzOi8vc3RhY2tvdmVyZmxvdy5jb20vcXVlc3Rpb25zLzQ2NDg3NDc2L2dpdC1sb2ctZm9s bG93LWdyYXBoLXNraXBzLWNvbW1pdHMKIChkZWZjdXN0b20gdmMtZ2l0LXByaW50LWxvZy1m b2xsb3cgbmlsCi0gICJJZiB0cnVlLCBmb2xsb3cgcmVuYW1lcyBpbiBHaXQgbG9ncyBmb3Ig YSBzaW5nbGUgZmlsZS4iCisgICJJZiB0cnVlLCB1c2UgdGhlIGZsYWcgYC0tZm9sbG93JyB3 aGVuIHByb2R1Y2luZyBzaW5nbGUgZmlsZSBsb2dzLgorCitJdCB3aWxsIG1ha2UgdGhlIHBy aW50ZWQgbG9nIGF1dG9tYXRpY2FsbHkgZm9sbG93IHRoZSByZW5hbWVzLgorVGhlIGRvd25z aWRlcyBpcyB0aGF0IHRoZSBsb2cgcHJvZHVjZWQgdGhpcyB3YXkgbWF5IG9taXQKK2NlcnRh aW4gKG1lcmdlKSBjb21taXRzLCBhbmQgdGhhdCBgbG9nLXZpZXctZGlmZicgZmFpbHMgb24K K2NvbW1pdHMgdGhhdCB1c2VkIHRoZSBwcmV2aW91cyBuYW1lLCBpbiB0aGF0IGxvZyBidWZm ZXIuCisKK1doZW4gdGhpcyB2YXJpYWJsZSBpcyBuaWwsIGFuZCB0aGUgbG9nIGVuZHMgd2l0 aCBhIHJlbmFtZSwgd2UKK3ByaW50IGEgYnV0dG9uIHRoYXQgc2hvd3MgdGhlIGxvZyBmb3Ig dGhlIHByZXZpb3VzIG5hbWUuIgogICA6dHlwZSAnYm9vbGVhbgogICA6dmVyc2lvbiAiMjYu MSIpCiAKZGlmZiAtLWdpdCBhL2xpc3AvdmMvdmMuZWwgYi9saXNwL3ZjL3ZjLmVsCmluZGV4 IDk1ODkyOWZlNGM2Li5mYWI0NTQ5OTRlMSAxMDA2NDQKLS0tIGEvbGlzcC92Yy92Yy5lbAor KysgYi9saXNwL3ZjL3ZjLmVsCkBAIC01MTcsNiArNTE3LDEzIEBACiA7OyAgIFJldHVybiB0 aGUgcmV2aXNpb24gbnVtYmVyIHRoYXQgcHJlY2VkZXMgUkVWIGZvciBGSUxFLCBvciBuaWwg aWYgbm8gc3VjaAogOzsgICByZXZpc2lvbiBleGlzdHMuCiA7OworOzsgLSBmaWxlLW5hbWUt Y2hhbmdlcyAocmV2KQorOzsKKzs7ICAgUmV0dXJuIHRoZSBsaXN0IG9mIHBhaXJzIHdpdGgg Y2hhbmdlcyBpbiBmaWxlIG5hbWVzIGluIFJFVi4gIFdoZW4KKzs7ICAgYSBmaWxlIHdhcyBh ZGRlZCwgaXQgc2hvdWxkIGJlIGEgY29ucyB3aXRoIG5pbCBjYXIuICBXaGVuCis7OyAgIGRl bGV0ZWQsIGEgY29ucyB3aXRoIG5pbCBjZHIuICBXaGVuIGNvcGllZCBvciByZW5hbWVkLCBh IGNvbnMKKzs7ICAgd2l0aCB0aGUgc291cmNlIG5hbWUgYXMgY2FyIGFuZCBkZXN0aW5hdGlv biBuYW1lIGFzIGNkci4KKzs7CiA7OyAtIG5leHQtcmV2aXNpb24gKGZpbGUgcmV2KQogOzsK IDs7ICAgUmV0dXJuIHRoZSByZXZpc2lvbiBudW1iZXIgdGhhdCBmb2xsb3dzIFJFViBmb3Ig RklMRSwgb3IgbmlsIGlmIG5vIHN1Y2gKQEAgLTI2OTUsOSArMjcwMiw0NiBAQCB2Yy1wcmlu dC1sb2ctc2V0dXAtYnV0dG9ucwogICAgICAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkKICAg ICAgICh3aGlsZSAocmUtc2VhcmNoLWZvcndhcmQgbG9nLXZpZXctbWVzc2FnZS1yZSBuaWwg dCkKICAgICAgICAgKGNsLWluY2YgZW50cmllcykpCi0gICAgICA7OyBJZiB3ZSBnb3QgZmV3 ZXIgZW50cmllcyB0aGFuIHdlIGFza2VkIGZvciwgdGhlbiBkaXNwbGF5aW5nCi0gICAgICA7 OyB0aGUgIm1vcmUiIGJ1dHRvbnMgaXNuJ3QgdXNlZnVsLgotICAgICAgKHdoZW4gKD49IGVu dHJpZXMgbGltaXQpCisgICAgICAoaWYgKDwgZW50cmllcyBsaW1pdCkKKyAgICAgICAgICA7 OyBUaGUgbG9nIGhhcyBiZWVuIHByaW50ZWQgaW4gZnVsbC4gIFBlcmhhcHMgaXQgc3RhcnRl ZAorICAgICAgICAgIDs7IHdpdGggYSBjb3B5IG9yIHJlbmFtZT8KKyAgICAgICAgICAobGV0 KiAoKGxhc3QtcmV2aXNpb24gKGxvZy12aWV3LWN1cnJlbnQtdGFnIChwb2ludC1tYXgpKSkK KyAgICAgICAgICAgICAgICAgOzsgWFhYOiBDb3VsZCBza2lwIHRoaXMgd2hlbiB2Yy1naXQt cHJpbnQtbG9nLWZvbGxvdyA9IHQuCisgICAgICAgICAgICAgICAgIChuYW1lLWNoYW5nZXMK KyAgICAgICAgICAgICAgICAgIChjb25kaXRpb24tY2FzZSBuaWwKKyAgICAgICAgICAgICAg ICAgICAgICAodmMtY2FsbC1iYWNrZW5kIGxvZy12aWV3LXZjLWJhY2tlbmQKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdmaWxlLW5hbWUtY2hhbmdlcyBsYXN0 LXJldmlzaW9uKQorICAgICAgICAgICAgICAgICAgICAodmMtbm90LXN1cHBvcnRlZCBuaWwp KSkKKyAgICAgICAgICAgICAgICAgKG1hdGNoaW5nLWNoYW5nZXMKKyAgICAgICAgICAgICAg ICAgIChjbC1kZWxldGUtaWYtbm90IChsYW1iZGEgKGYpIChtZW1iZXIgZiBsb2ctdmlldy12 Yy1maWxlc2V0KSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5hbWUt Y2hhbmdlcyA6a2V5ICMnY2RyKSkKKyAgICAgICAgICAgICAgICAgKG9sZC1uYW1lcyAobWFw Y2FyICMnY2FyIG1hdGNoaW5nLWNoYW5nZXMpKQorICAgICAgICAgICAgICAgICAocmVsYXRp dmVzIChtYXBjYXIgIydmaWxlLXJlbGF0aXZlLW5hbWUgb2xkLW5hbWVzKSkpCisgICAgICAg ICAgICAod2hlbiBvbGQtbmFtZXMKKyAgICAgICAgICAgICAgKGdvdG8tY2hhciAocG9pbnQt bWF4KSkKKyAgICAgICAgICAgICAgKGluc2VydCAiXG4iKQorICAgICAgICAgICAgICAoaW5z ZXJ0CisgICAgICAgICAgICAgICAoZm9ybWF0CisgICAgICAgICAgICAgICAgIlJlbmFtZWQg ZnJvbSAlcyIKKyAgICAgICAgICAgICAgICAobWFwY29uY2F0IChsYW1iZGEgKHMpCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIChwcm9wZXJ0aXplIHMgJ2ZvbnQtbG9jay1mYWNl CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdsb2ctdmlldy1m aWxlKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlbGF0aXZlcyAiLCAiKSkKKyAg ICAgICAgICAgICAgICIgIikKKyAgICAgICAgICAgICAgOzsgVE9ETzogQWxzbyBwcmludCBh IGRpZmZlcmVudCBidXR0b24gc29tZXdoZXJlIGluIHRoZQorICAgICAgICAgICAgICA7OyBj cmVhdGVkIGJ1ZmZlciB0byBiZSBhYmxlIHRvIGdvIGJhY2sgZWFzaWx5LiAgKFRoZXJlCisg ICAgICAgICAgICAgIDs7IGFyZSBkaWZmZXJlbnQgd2F5cyB0byBkbyB0aGF0LikKKyAgICAg ICAgICAgICAgKGluc2VydC10ZXh0LWJ1dHRvbgorICAgICAgICAgICAgICAgIlZpZXcgbG9n IgorICAgICAgICAgICAgICAgJ2FjdGlvbiAobGFtYmRhICgmcmVzdCBfaWdub3JlKQorICAg ICAgICAgICAgICAgICAgICAgICAgIChsZXQgKChiYWNrZW5kIGxvZy12aWV3LXZjLWJhY2tl bmQpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgKHdpdGgtY3VycmVudC1idWZmZXIg dmMtcGFyZW50LWJ1ZmZlcgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBUbyBz ZXQgdXAgcGFyZW50IGJ1ZmZlciBpbiB0aGUgbmV3IHZpZXdlci4KKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKHZjLXByaW50LWxvZy1pbnRlcm5hbCBiYWNrZW5kIG9sZC1uYW1l cworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGxhc3QtcmV2aXNpb24gbmlsIGxpbWl0KSkpKQorICAgICAgICAgICAgICAgJ2hlbHAtZWNo bworICAgICAgICAgICAgICAgIlNob3cgdGhlIGxvZyBmb3IgdGhlIGZpbGUgbmFtZShzKSBi ZWZvcmUgdGhlIHJlbmFtZSIpKSkKKyAgICAgICAgOzsgUGVyaGFwcyB0aGVyZSBhcmUgbW9y ZSBlbnRyaWVzIGluIHRoZSBsb2cuCiAgICAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1heCkp CiAgICAgICAgIChpbnNlcnQgIlxuIikKICAgICAgICAgKGluc2VydC10ZXh0LWJ1dHRvbgo= --------------9U2AGPSI9Hkf4vqNo0d64qFX-- From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 15 08:05:12 2023 Received: (at 55871) by debbugs.gnu.org; 15 Dec 2023 13:05:12 +0000 Received: from localhost ([127.0.0.1]:51750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rE7sO-0000ix-8L for submit@debbugs.gnu.org; Fri, 15 Dec 2023 08:05:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rE7sL-0000ij-V0 for 55871@debbugs.gnu.org; Fri, 15 Dec 2023 08:05:10 -0500 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 ) id 1rE7sG-0008Ui-4H; Fri, 15 Dec 2023 08:05:04 -0500 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=p92bzxue4LeuzCUaqsLez+edweyYEMoPBhkGhGzxpik=; b=V2qdjqfVUvK/ 0UPGuoaS6TCERfZFs+HwH6DZTipXLZz2UW5FgHBH9valVNNS+Bs9/5EYrtrevbxQduDIRK7aZ2Rri hpF73W8ZrGv0AKFqDn+GkHUDg0JOz3AHfghBfxw3aXhTzpjtRGZCI69fR79oYWddCT9QTIirqjSFI ecax6KL+EGNtMgiUwUGRuSrvffsYr7xnmSL+6FYpI3M1/3tAmInz/1qwTNWGDaDtqAvnJzR6E5xfb VD5+ej0jjLUd16fw6NwwHSGffAJUcQBjLVabw/oCzM47Vp0hBl7csA++qVQWBK/3TRhkLLunTHYev V5PnCdVqmtPqLYJE7x2KXQ==; Date: Fri, 15 Dec 2023 15:05:04 +0200 Message-Id: <83y1dvobun.fsf@gnu.org> From: Eli Zaretskii To: Dmitry Gutov In-Reply-To: <36b48587-a723-73ae-fefb-886d69d04ec8@yandex.ru> (message from Dmitry Gutov on Fri, 15 Dec 2023 04:01:59 +0200) Subject: Re: bug#55871: Acknowledgement (27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames) References: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> <1b16a642-8a85-e693-66fc-41c37df24908@yandex.ru> <36b48587-a723-73ae-fefb-886d69d04ec8@yandex.ru> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 55871 Cc: 55871@debbugs.gnu.org, n.oje.bar@gmail.com 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.3 (---) > Cc: 55871@debbugs.gnu.org > Date: Fri, 15 Dec 2023 04:01:59 +0200 > From: Dmitry Gutov > > On 14/12/2023 03:23, Dmitry Gutov wrote: > > On 14/12/2023 02:52, Dmitry Gutov wrote: > >> but otherwise seems to function well (with potential for future > >> additions) > > > > To clarify: this version only makes 'd' work (not 'f' or 'a'), but the > > other two are fixed more easily. > > Attached is the new revision with combined fix. FYI: 'd' and 'f' work with bzr without any changes. 'a' doesn't work (evidently, "bzr annotate -r REVISION FILE" doesn't work when FILE did not exist in REVISION, but was renamed by a later revision, and one needs to run "bzr status -Sr REVISION" and look for the "renamed" report in the result, which will then provide the previous name). (FTR: I used src/unexcoff.c file to test this.) > +*** Support for viewing file change history across renames. > +When a fileset's VC change history ends at a rename, we now print the > +old name(s) and a button which jumps to their history. Only supported > +with Git at the moment. I think this should at least tell that for files under Bazaar, the VC change history will always include the renames. Looks like Mercurial is in the same department as Git? If so, I think the text should say that this is not supported for Mercurial yet, and that Bazaar shows the entire history, including renames, by default. Or something like that. I also think this entry should mention the relevant VC commands ("C-x v l" and what else?), since otherwise "VC change history" is not concrete enough to tell users which command(s) is/are affected. Thanks. From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 15 09:39:20 2023 Received: (at 55871) by debbugs.gnu.org; 15 Dec 2023 14:39:20 +0000 Received: from localhost ([127.0.0.1]:51814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rE9LT-0001Vz-T9 for submit@debbugs.gnu.org; Fri, 15 Dec 2023 09:39:20 -0500 Received: from forward501c.mail.yandex.net ([178.154.239.209]:37914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rE9LP-0001Vk-Fx for 55871@debbugs.gnu.org; Fri, 15 Dec 2023 09:39:17 -0500 Received: from mail-nwsmtp-smtp-production-main-78.myt.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-78.myt.yp-c.yandex.net [IPv6:2a02:6b8:c12:5c92:0:640:faf9:0]) by forward501c.mail.yandex.net (Yandex) with ESMTP id BE2F760C7E; Fri, 15 Dec 2023 17:39:12 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-78.myt.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id AdmNsL9JhW20-ldRCQCL9; Fri, 15 Dec 2023 17:39:12 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1702651152; bh=tRXm3Znf0RSjvtWqnoxU6isxttAQo624MrR5D7Salzg=; h=In-Reply-To:From:Subject:Message-ID:Cc:References:Date:To; b=j37ahjdaSztoA+V/Mu8Y15rCjmyKrRAscM57+HVTNlQIEm81Gyp6N8PhqH+mJKvPO Ej/vTuJ89FkHL6tG1zKfHS9Dc7JZHQ7ph2xf0s1FJlsY7YzIsQXJKHj6Xbn7Wcbe8E jPsEoGdXP5YryPiN/HSk6cl/VHxESa1nITbuBR4I= Authentication-Results: mail-nwsmtp-smtp-production-main-78.myt.yp-c.yandex.net; dkim=pass header.i=@yandex.ru Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailauth.nyi.internal (Postfix) with ESMTP id D21E627C0054; Fri, 15 Dec 2023 09:39:09 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 15 Dec 2023 09:39:09 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvddtvddgieejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtjeertddtfeejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegughhuthhovheshigrnhguvgigrdhruheqnecuggftrfgrth htvghrnhepudfhfeeuudevfefgtdeigeetudetgfehleeugeefgfekhefhleejgfehffdt lefhnecuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepughguhhtohhvodhmvghsmhhtphgruhhthhhpvghr shhonhgrlhhithihqddufeeffeelleehhedvqddvleegjeejjeejiedqughguhhtohhvpe ephigrnhguvgigrdhruhesfhgrshhtmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: ib1d9465d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 15 Dec 2023 09:39:08 -0500 (EST) Message-ID: Date: Fri, 15 Dec 2023 16:39:04 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: bug#55871: Acknowledgement (27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames) Content-Language: en-US To: Eli Zaretskii References: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> <1b16a642-8a85-e693-66fc-41c37df24908@yandex.ru> <36b48587-a723-73ae-fefb-886d69d04ec8@yandex.ru> <83y1dvobun.fsf@gnu.org> From: Dmitry Gutov In-Reply-To: <83y1dvobun.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 55871 Cc: 55871@debbugs.gnu.org, n.oje.bar@gmail.com 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.7 (-) On 15/12/2023 15:05, Eli Zaretskii wrote: >> Cc: 55871@debbugs.gnu.org >> Date: Fri, 15 Dec 2023 04:01:59 +0200 >> From: Dmitry Gutov >> >> On 14/12/2023 03:23, Dmitry Gutov wrote: >>> On 14/12/2023 02:52, Dmitry Gutov wrote: >>>> but otherwise seems to function well (with potential for future >>>> additions) >>> >>> To clarify: this version only makes 'd' work (not 'f' or 'a'), but the >>> other two are fixed more easily. >> >> Attached is the new revision with combined fix. > > FYI: 'd' and 'f' work with bzr without any changes. To my understanding, Bazaar doesn't really exist in this day and age, so should we pay extra attention to it in this NEWS entry? We could say that the problem is relevant to Git and Hg, and the current solution only helps Git. I'm not sure what's the best phrasing, however, which won't bloat the NEWS entry too much. Though by the time 30 is released someone might implement the 'file-name-changes' handler for Hg too: it might be easy enough with the rest of the solution already in place. One will have to see whether Hg has any special caveats, though, like the one you noted for Bzr below. > 'a' doesn't work > (evidently, "bzr annotate -r REVISION FILE" doesn't work when FILE did > not exist in REVISION, but was renamed by a later revision, and one > needs to run "bzr status -Sr REVISION" and look for the "renamed" > report in the result, which will then provide the previous name). But when we're asking for 'annotate' for a file in some old revision (under old name), it won't be the same revision where it had been renamed, 99% of the time. > (FTR: I used src/unexcoff.c file to test this.) > >> +*** Support for viewing file change history across renames. >> +When a fileset's VC change history ends at a rename, we now print the >> +old name(s) and a button which jumps to their history. Only supported >> +with Git at the moment. > > I think this should at least tell that for files under Bazaar, the VC > change history will always include the renames. Looks like Mercurial > is in the same department as Git? More or less, yes, here's an even older bug report: https://debbugs.gnu.org/13004 > If so, I think the text should say > that this is not supported for Mercurial yet, and that Bazaar shows > the entire history, including renames, by default. Or something like > that. I don't want to make it a sticking point, but according to the wiki entry Monotone also tracks renames. We won't be mentioning it here, will we? I don't think we're going to persuade anybody new to use Bazaar here, and those who currently use it, probably don't pay this issue (the lack of it) much attention. > I also think this entry should mention the relevant VC commands > ("C-x v l" and what else?), since otherwise "VC change history" > is not concrete enough to tell users which command(s) is/are affected. Ok. Just 'C-x v l', with one or more files selected. The remaining 2 vc-print-* commands print the history for all files, so all renames are naturally included. One cannot use 'f' or 'a' on their output, though. From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 15 10:10:47 2023 Received: (at 55871) by debbugs.gnu.org; 15 Dec 2023 15:10:47 +0000 Received: from localhost ([127.0.0.1]:53348 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rE9pu-0007pW-Sm for submit@debbugs.gnu.org; Fri, 15 Dec 2023 10:10:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36010) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rE9ps-0007pI-DS for 55871@debbugs.gnu.org; Fri, 15 Dec 2023 10:10:45 -0500 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 ) id 1rE9pm-0000yL-2W; Fri, 15 Dec 2023 10:10:38 -0500 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=ZQpl6CbzOQVSpWKvW2TzrZXpSvKeeU0JnLcXqBRhlxc=; b=GgqqPd5SdsCz 9eQT6RmfX7iCEin1Anoyswa2LauOXVysUxQkUVGl93DUtlrE6U31tWkkEG+oUvEQ8BOWFMQ/vDFVC eP8m78VIFHT+7qlp52qNlmmjiYa7Zm1YXqmIY0c52S0UElZvauRe6ef6V1a3/8z//tEbBav0L3ial 6lo7aFeMAJBJe+SQcBUdT79E7aChtnch39u8dSv3+hf/+ByWHaeghQ6eFJVoLkiPdVpHDQkSHtDdF m/N1zKaHd/7OK+/hOJztEmTHtl62FfcTQanlkXwhR45uz5aMPClk0Fj0rmdde3wV7mmQEmAC7n6hh CCdQAiaJ9e8bBbV8NpLNIw==; Date: Fri, 15 Dec 2023 17:10:22 +0200 Message-Id: <83o7ero61t.fsf@gnu.org> From: Eli Zaretskii To: Dmitry Gutov In-Reply-To: (message from Dmitry Gutov on Fri, 15 Dec 2023 16:39:04 +0200) Subject: Re: bug#55871: Acknowledgement (27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames) References: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> <1b16a642-8a85-e693-66fc-41c37df24908@yandex.ru> <36b48587-a723-73ae-fefb-886d69d04ec8@yandex.ru> <83y1dvobun.fsf@gnu.org> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 55871 Cc: 55871@debbugs.gnu.org, n.oje.bar@gmail.com 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.3 (---) > Date: Fri, 15 Dec 2023 16:39:04 +0200 > Cc: 55871@debbugs.gnu.org, n.oje.bar@gmail.com > From: Dmitry Gutov > > > FYI: 'd' and 'f' work with bzr without any changes. > > To my understanding, Bazaar doesn't really exist in this day and age, so > should we pay extra attention to it in this NEWS entry? Bazaar is still being developed, but I don't know how important it is nowadays. I do use it here, FWIW (and keep the old repository under Bazaar, from before the switch, for the rare occasion I need to look up or try something there). > We could say that the problem is relevant to Git and Hg, and the current > solution only helps Git. I'm not sure what's the best phrasing, however, > which won't bloat the NEWS entry too much. That'd be fine, and the wording could just use what you say above. > > 'a' doesn't work > > (evidently, "bzr annotate -r REVISION FILE" doesn't work when FILE did > > not exist in REVISION, but was renamed by a later revision, and one > > needs to run "bzr status -Sr REVISION" and look for the "renamed" > > report in the result, which will then provide the previous name). > > But when we're asking for 'annotate' for a file in some old revision > (under old name), it won't be the same revision where it had been > renamed, 99% of the time. It doesn't matter. The above-mentioned bzr command will show the telltale "RM old => new" status. Keep in mind that "-r REVISION" in bzr means "since REVISION till the current head". > > (FTR: I used src/unexcoff.c file to test this.) > > > >> +*** Support for viewing file change history across renames. > >> +When a fileset's VC change history ends at a rename, we now print the > >> +old name(s) and a button which jumps to their history. Only supported > >> +with Git at the moment. > > > > I think this should at least tell that for files under Bazaar, the VC > > change history will always include the renames. Looks like Mercurial > > is in the same department as Git? > > More or less, yes, here's an even older bug report: > https://debbugs.gnu.org/13004 > > > If so, I think the text should say > > that this is not supported for Mercurial yet, and that Bazaar shows > > the entire history, including renames, by default. Or something like > > that. > > I don't want to make it a sticking point, but according to the wiki > entry Monotone also tracks renames. We won't be mentioning it here, will we? vc-monotone is not part of Emacs, right? It is okay to say "is not yet supported for Hg". From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 15 15:45:38 2023 Received: (at 55871-done) by debbugs.gnu.org; 15 Dec 2023 20:45:38 +0000 Received: from localhost ([127.0.0.1]:53617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEF3y-0007lf-1s for submit@debbugs.gnu.org; Fri, 15 Dec 2023 15:45:38 -0500 Received: from forward501c.mail.yandex.net ([178.154.239.209]:49502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEF3u-0007ZE-DJ for 55871-done@debbugs.gnu.org; Fri, 15 Dec 2023 15:45:36 -0500 Received: from mail-nwsmtp-smtp-production-main-91.iva.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-91.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:8193:0:640:59c7:0]) by forward501c.mail.yandex.net (Yandex) with ESMTP id A1FD26104C; Fri, 15 Dec 2023 23:45:31 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-91.iva.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id TjsFhjGOm4Y0-TNUI1zUR; Fri, 15 Dec 2023 23:45:31 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1702673131; bh=sePrBRgr0cQUhugwjDMJlVlJ5gLnMizQqvsJIZMIqwU=; h=In-Reply-To:From:Subject:Message-ID:Cc:References:Date:To; b=eATK/U4zY7Kjuaz+8tq727zyKcoWQ3j+AkeqFnXGQibGTIGi1ADcnJ2TNGpN807tL aT2/VWufBBT4iITaHE1aB204x9FviK9meODwUcygAbwPJsMsm3JBohPoId6f3ZXB7t m3SIlh8W1nluGUfF3Z6qAcfkxZlleOJSk79m1F5U= Authentication-Results: mail-nwsmtp-smtp-production-main-91.iva.yp-c.yandex.net; dkim=pass header.i=@yandex.ru Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailauth.nyi.internal (Postfix) with ESMTP id D544B27C0054; Fri, 15 Dec 2023 15:45:28 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Fri, 15 Dec 2023 15:45:28 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvddtvddgudeflecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefkffggfgfuvfevfhfhjggtgfesthejredttdefjeenucfhrhhomhepffhm ihhtrhihucfiuhhtohhvuceoughguhhtohhvseihrghnuggvgidrrhhuqeenucggtffrrg htthgvrhhnpeduhfefueduveefgfdtieegtedutefgheelueegfefgkeehhfeljefgheff tdelhfenucffohhmrghinhepghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpegughhuthhovhdomhgvshhmthhprghuthhhphgv rhhsohhnrghlihhthidqudeffeefleelheehvddqvdelgeejjeejjeeiqdgughhuthhovh eppeihrghnuggvgidrrhhusehfrghsthhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: ib1d9465d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 15 Dec 2023 15:45:27 -0500 (EST) Message-ID: <91c5ddd8-f351-8762-abca-a577acdb942d@yandex.ru> Date: Fri, 15 Dec 2023 22:45:24 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: bug#55871: Acknowledgement (27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames) Content-Language: en-US To: Eli Zaretskii References: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> <1b16a642-8a85-e693-66fc-41c37df24908@yandex.ru> <36b48587-a723-73ae-fefb-886d69d04ec8@yandex.ru> <83y1dvobun.fsf@gnu.org> <83o7ero61t.fsf@gnu.org> From: Dmitry Gutov In-Reply-To: <83o7ero61t.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 55871-done Cc: 55871-done@debbugs.gnu.org, n.oje.bar@gmail.com 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.7 (-) Version: 30.1 On 15/12/2023 17:10, Eli Zaretskii wrote: >> Date: Fri, 15 Dec 2023 16:39:04 +0200 >> Cc: 55871@debbugs.gnu.org, n.oje.bar@gmail.com >> From: Dmitry Gutov >> >>> FYI: 'd' and 'f' work with bzr without any changes. >> >> To my understanding, Bazaar doesn't really exist in this day and age, so >> should we pay extra attention to it in this NEWS entry? > > Bazaar is still being developed, but I don't know how important it is > nowadays. I do use it here, FWIW (and keep the old repository under > Bazaar, from before the switch, for the rare occasion I need to look > up or try something there). I'm hoping this change will make it easier to investigate old changesets, so you won't need to keep a separate repository (I do have several worktrees for Emacs around, but they're all managed by Git). >> We could say that the problem is relevant to Git and Hg, and the current >> solution only helps Git. I'm not sure what's the best phrasing, however, >> which won't bloat the NEWS entry too much. > > That'd be fine, and the wording could just use what you say above. Ah well, while investigating what Hg does and does not, I ended up implementing the change for it as well. Problem is, while it "natively tracks renames", it likewise requires a "--follow" flag, which is only supported in "hg log" but not "hg diff". So we just as well have to dig around to find what were the previous names. That's what the new vc-hg-file-name-changes does, except in a less reliable way than the Git solution (WRT odd file names). >>> 'a' doesn't work >>> (evidently, "bzr annotate -r REVISION FILE" doesn't work when FILE did >>> not exist in REVISION, but was renamed by a later revision, and one >>> needs to run "bzr status -Sr REVISION" and look for the "renamed" >>> report in the result, which will then provide the previous name). >> >> But when we're asking for 'annotate' for a file in some old revision >> (under old name), it won't be the same revision where it had been >> renamed, 99% of the time. > > It doesn't matter. The above-mentioned bzr command will show the > telltale "RM old => new" status. Keep in mind that "-r REVISION" in > bzr means "since REVISION till the current head". Ah, you mean some code will need to search through the changes up until revision to find all renames anyway? I suppose that could be implemented in vc-bzr-annotate (independent of this changeset). >>> (FTR: I used src/unexcoff.c file to test this.) >>> >>>> +*** Support for viewing file change history across renames. >>>> +When a fileset's VC change history ends at a rename, we now print the >>>> +old name(s) and a button which jumps to their history. Only supported >>>> +with Git at the moment. >>> >>> I think this should at least tell that for files under Bazaar, the VC >>> change history will always include the renames. Looks like Mercurial >>> is in the same department as Git? >> >> More or less, yes, here's an even older bug report: >> https://debbugs.gnu.org/13004 >> >>> If so, I think the text should say >>> that this is not supported for Mercurial yet, and that Bazaar shows >>> the entire history, including renames, by default. Or something like >>> that. >> >> I don't want to make it a sticking point, but according to the wiki >> entry Monotone also tracks renames. We won't be mentioning it here, will we? > > vc-monotone is not part of Emacs, right? We do have vc-mtn.el in lisp/obsolete. Anyway... I've pushed the change to master (5b80894d0a7) to encourage wider testing. There are some potential follow-ups remaining (e.g. the question whether the "old" log should start with the exact same revision as the one that the "new" log ended at -- that makes a difference in some edge cases), but they should be small enough. Either way, looking forward to the feedback (and if you want to do any edits to the NEWS entry, please go ahead). From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 16 02:22:11 2023 Received: (at 55871-done) by debbugs.gnu.org; 16 Dec 2023 07:22:11 +0000 Received: from localhost ([127.0.0.1]:53872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEOzy-0008QO-Vh for submit@debbugs.gnu.org; Sat, 16 Dec 2023 02:22:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEOzx-0008QB-8O for 55871-done@debbugs.gnu.org; Sat, 16 Dec 2023 02:22:10 -0500 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 ) id 1rEOzr-0004H0-0G; Sat, 16 Dec 2023 02:22:03 -0500 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=pyT8bjRPM8rYAkxow3Esq8xtCRilUnsmYUcT9WOVWeY=; b=C+EyUVgjDjaV YR2Tujs3oOr3RqG/O/8TSk8dv6YXZh6+pqbS6Yym+NfvTGWSweAZY4Yc5+ZpGClrMF9J4tTKRpMZj zYOo//r1WCN7vrzIrahN2AnmEc+8/wXoGPokD7FTb3yswhA+X1wFt0kprWLh2u+2iJtNJWr9UZtok +d8yS5v00e7lncQeyl60aX9b5ZS4zbMKAvgh9QIS2xDcuq9Eu2L6R9i35X7m/KN6oygb1Z7KFzKSw TA1AzD/fYhTSgGEfZK7zpqOSmKemHb34/YCdfu9p/Lqm5o+RQrHtycF6mLCSAnzIB3UpQ8GAgcuFV gpSny8CX17pmPz5URWqz2g==; Date: Sat, 16 Dec 2023 09:21:43 +0200 Message-Id: <83cyv6obnc.fsf@gnu.org> From: Eli Zaretskii To: Dmitry Gutov In-Reply-To: <91c5ddd8-f351-8762-abca-a577acdb942d@yandex.ru> (message from Dmitry Gutov on Fri, 15 Dec 2023 22:45:24 +0200) Subject: Re: bug#55871: Acknowledgement (27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames) References: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> <1b16a642-8a85-e693-66fc-41c37df24908@yandex.ru> <36b48587-a723-73ae-fefb-886d69d04ec8@yandex.ru> <83y1dvobun.fsf@gnu.org> <83o7ero61t.fsf@gnu.org> <91c5ddd8-f351-8762-abca-a577acdb942d@yandex.ru> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 55871-done Cc: 55871-done@debbugs.gnu.org, n.oje.bar@gmail.com 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.3 (---) > Date: Fri, 15 Dec 2023 22:45:24 +0200 > Cc: 55871-done@debbugs.gnu.org, n.oje.bar@gmail.com > From: Dmitry Gutov > > >> We could say that the problem is relevant to Git and Hg, and the current > >> solution only helps Git. I'm not sure what's the best phrasing, however, > >> which won't bloat the NEWS entry too much. > > > > That'd be fine, and the wording could just use what you say above. > > Ah well, while investigating what Hg does and does not, I ended up > implementing the change for it as well. Thanks. > >>> 'a' doesn't work > >>> (evidently, "bzr annotate -r REVISION FILE" doesn't work when FILE did > >>> not exist in REVISION, but was renamed by a later revision, and one > >>> needs to run "bzr status -Sr REVISION" and look for the "renamed" > >>> report in the result, which will then provide the previous name). > >> > >> But when we're asking for 'annotate' for a file in some old revision > >> (under old name), it won't be the same revision where it had been > >> renamed, 99% of the time. > > > > It doesn't matter. The above-mentioned bzr command will show the > > telltale "RM old => new" status. Keep in mind that "-r REVISION" in > > bzr means "since REVISION till the current head". > > Ah, you mean some code will need to search through the changes up until > revision to find all renames anyway? Yes, similar to what vc-git/hg-file-name-changes do. > I suppose that could be implemented in vc-bzr-annotate (independent > of this changeset). Yes, most probably. From unknown Tue Jun 17 21:50:22 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 13 Jan 2024 12:24:08 +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