From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter Newsgroups: gmane.emacs.bugs Subject: bug#67062: 30.0.50; [PATCH] Abbreviate the revision in 'vc-annotate' (for Git) Date: Sat, 11 Nov 2023 16:31:43 -0800 Message-ID: <2f7f9967-496c-163a-fa46-58b255a7e8a0@gmail.com> References: <66fc4912-6aa5-79da-bd6f-52f068cf1a77@gmail.com> <83y1f4wxby.fsf@gnu.org> <2eb31324-ae24-db4b-4f62-a0140bfb9f81@gutov.dev> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------804uT0Llz0kr8Zurueu6Xc2O" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="16580"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 67062@debbugs.gnu.org To: Dmitry Gutov , Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Nov 12 01:32:36 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r1yOx-00049j-O2 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 12 Nov 2023 01:32:35 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1yOl-0003vI-VS; Sat, 11 Nov 2023 19:32:23 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r1yOj-0003uu-UK for bug-gnu-emacs@gnu.org; Sat, 11 Nov 2023 19:32:21 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r1yOj-000186-MI for bug-gnu-emacs@gnu.org; Sat, 11 Nov 2023 19:32:21 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r1yPN-0004b8-Uy for bug-gnu-emacs@gnu.org; Sat, 11 Nov 2023 19:33:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 12 Nov 2023 00:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67062 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 67062-submit@debbugs.gnu.org id=B67062.169974915417641 (code B ref 67062); Sun, 12 Nov 2023 00:33:01 +0000 Original-Received: (at 67062) by debbugs.gnu.org; 12 Nov 2023 00:32:34 +0000 Original-Received: from localhost ([127.0.0.1]:54681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1yOv-0004aT-U8 for submit@debbugs.gnu.org; Sat, 11 Nov 2023 19:32:34 -0500 Original-Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]:48275) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1yOt-0004aE-Ov for 67062@debbugs.gnu.org; Sat, 11 Nov 2023 19:32:32 -0500 Original-Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-5b980391d70so2487463a12.0 for <67062@debbugs.gnu.org>; Sat, 11 Nov 2023 16:31:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699749105; x=1700353905; darn=debbugs.gnu.org; h=in-reply-to:from:references:cc:to:content-language:subject :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=PSW5PvJyAqLNO9GUYlMaXdUfb88KSBpZUzmX2EdSO2Y=; b=Lu0+hE86hxYOZINkDpvmub75iXIINN2s8ZyQ0El3tKs8xF/RrnlZC/xuHINCLp4tya /SCOgPTZxwqv8q08gx4wd/44CKKR6jMZYH2A8v3kou4cJLpg6xbvmEgCPn+xfLcQkVy/ nGufzKCx2mrb3Cpxe25U8sKOe/yFcL1c1VQTMLg0tvFPBPnJtsytSU/p+sv7Jk8+JWEd uIQRjZZrbYW4oEeb9hzZZxwZWsu+NHSdsc+n8uUAiX+CfsaFa6/RHKzTFJVPjpufNpoM geSs0ySQ4Qno/ESRYGLEgpKIn6cEHuIu0bKjqGzJV1et/LzIMhoGViRjs7Aa9tobgVIM k95Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699749105; x=1700353905; h=in-reply-to:from:references:cc:to:content-language:subject :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=PSW5PvJyAqLNO9GUYlMaXdUfb88KSBpZUzmX2EdSO2Y=; b=se/syjns8Q38DycrmtrLerd1TAYn5/wHOdR1RWFuJRDbmje3WdH6GOjOjypN5qWhJ3 3HBOv4cL3PhAfUHdb+TyO+4QtWsDvkfQa8klPWF8cLR0Y57iUn7UEQMv0FqaKtc53ZMb 4aB0OoJcBfF8xvrEC6DXr4WKfMtwGL0r1GCrRTZSVRkRkFijG5MdX+HEinYwwxE6DYMR 7JwlM4u1HQy0lQVPP91yAp+MyhftLubtrIlIHmbkOb48HedeLkigwy4yttn38FEAUXoh IRR2E0Usb403Sxhx5SbNJ6uUx+lZ67I9FvJQgrqVvFAsKvjIaokh/3KcSE+I/xBw9jkq jlsg== X-Gm-Message-State: AOJu0YxyJpoTWM+Asg2tvnpS3pfNxz0V1nXRAdHMNlYc67rhHGLCFXdU nWj1URFfTg7KBtZf9iPYtjo= X-Google-Smtp-Source: AGHT+IG2h/6kgf9450HDqvEA7gbfESPURmtCSmDRHPSAv+HVhRjao/gqcvXuR3xwPoIJrooIK/nhDQ== X-Received: by 2002:a05:6a21:7782:b0:154:3f13:1bb7 with SMTP id bd2-20020a056a21778200b001543f131bb7mr3894138pzc.49.1699749104839; Sat, 11 Nov 2023 16:31:44 -0800 (PST) Original-Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id c64-20020a17090a494600b0027cf8869ee7sm4169052pjh.0.2023.11.11.16.31.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 11 Nov 2023 16:31:44 -0800 (PST) Content-Language: en-US In-Reply-To: <2eb31324-ae24-db4b-4f62-a0140bfb9f81@gutov.dev> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:274179 Archived-At: This is a multi-part message in MIME format. --------------804uT0Llz0kr8Zurueu6Xc2O Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/11/2023 2:00 PM, Dmitry Gutov wrote: > On 11/11/2023 09:41, Eli Zaretskii wrote: >> If this is a Git-only issue, perhaps it would be better to have a >> Git-only option, instead of defining a whole new VC method? > > Our general approach is to prefer global options and dynamic dispatch on > backends, resorting to using per-backend options when it's much easier > to do. > > In this case it might actually be more difficult to go the second route > since the intention is to only use the short hash in this particular > place. vc-annotate is common code and it will need to indicate that > intention to the backend somehow. Thanks for taking a look. It sounds like the strategy I went with is at least approximately right, so here's an updated patch with a NEWS entry. I looked through the manuals and didn't see anywhere to add a mention of this though. There's a section about 'vc-annotate', but it's written for an Emacs user, rather than an Elisp programmer, and I think trying to explain "short revisions" in that section would just add unnecessary detail. If we still want to add some mention of this to a manual, I guess it would make the most sense in some section about how to use the VC package as an Elisp programmer. I didn't see much about that though... --------------804uT0Llz0kr8Zurueu6Xc2O Content-Type: text/plain; charset=UTF-8; name="0001-Abbreviate-the-VC-revision-in-vc-annotate-s-buffer-n.patch" Content-Disposition: attachment; filename*0="0001-Abbreviate-the-VC-revision-in-vc-annotate-s-buffer-n.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAzZGQ5NDM0MTYxYjM2ZjAxMzk3YzMyNjljYTgzOWJjYTNkYjBkNTllIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IEZyaSwgMTAgTm92IDIwMjMgMTg6NDI6MjkgLTA4MDAKU3ViamVjdDogW1BB VENIXSBBYmJyZXZpYXRlIHRoZSBWQyByZXZpc2lvbiBpbiB2Yy1hbm5vdGF0ZSdzIGJ1ZmZl ciBuYW1lCgoqIGxpc3AvdmMvdmMtYW5ub3RhdGUuZWwgKHZjLWFubm90YXRlKTogQ2FsbCAn c2hvcnQtcmV2aXNpb24nCgoqIGxpc3AvdmMvdmMtaG9va3MuZWwgKHZjLWRlZmF1bHQtc2hv cnQtcmV2aXNpb24pOiBOZXcgZnVuY3Rpb24uCgoqIGxpc3AvdmMvdmMtZ2l0LmVsICh2Yy1n aXQtc2hvcnQtcmV2aXNpb24pOiBOZXcgZnVuY3Rpb24uCih2Yy1naXQtLXJldi1wYXJzZSk6 IE5ldyBvcHRpb25hbCBhcmd1bWVudCBTSE9SVC4KCiogZXRjL05FV1M6IEFubm91bmNlIHRo aXMgY2hhbmdlIChidWcjNjcwNjIpLgotLS0KIGV0Yy9ORVdTICAgICAgICAgICAgICAgfCAg NiArKysrKysKIGxpc3AvdmMvdmMtYW5ub3RhdGUuZWwgfCAgNCArKystCiBsaXNwL3ZjL3Zj LWdpdC5lbCAgICAgIHwgMTQgKysrKysrKysrKystLS0KIGxpc3AvdmMvdmMtaG9va3MuZWwg ICAgfCAgNSArKysrKwogNCBmaWxlcyBjaGFuZ2VkLCAyNSBpbnNlcnRpb25zKCspLCA0IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2V0Yy9ORVdTIGIvZXRjL05FV1MKaW5kZXggNzY3 ZTRjMjdiNDMuLjA2MzIwMDE2NDhjIDEwMDY0NAotLS0gYS9ldGMvTkVXUworKysgYi9ldGMv TkVXUwpAQCAtMzk2LDYgKzM5NiwxMiBAQCBzd2l0Y2hlcyBmb3Igc2hvcnRsb2dzLCBzdWNo IGFzIHRoZSBvbmUgcHJvZHVjZWQgYnkgJ0MteCB2IEwnLgogKioqIE9ic29sZXRlIGNvbW1h bmQgJ3ZjLXN3aXRjaC1iYWNrZW5kJyByZS1hZGRlZCBhcyAndmMtY2hhbmdlLWJhY2tlbmQn LgogVGhlIGNvbW1hbmQgd2FzIHByZXZpb3VzbHkgb2Jzb2xldGVkIGFuZCB1bmJvdW5kIGlu IEVtYWNzIDI4LgogCistLS0KKyoqKiAndmMtYW5ub3RhdGUnIGNhbiBub3cgYWJicmV2aWF0 ZSB0aGUgcmV2aXNpb24gaW4gdGhlIGJ1ZmZlciBuYW1lLgorVkMgYmFja2VuZHMgd2l0aCBh ICd2Yy1CQUNLRU5ELXNob3J0LXJldmlzaW9uJyBmdW5jdGlvbnMgY2FuIGNvbnZlcnQgYQor cmV2aXNpb24gdG8gYSBzaG9ydGVyIGZvcm0sIGFuZCAndmMtYW5ub3RhdGUnIHdpbGwgdXNl IHRoaXMgZm9ybSBpbgoraXRzIGJ1ZmZlciBuYW1lLiAgQ3VycmVudGx5LCB0aGUgR2l0IGJh Y2tlbmQgc3VwcG9ydHMgdGhpcy4KKwogKiogRGlmZiBtb2RlCiAKICsrKwpkaWZmIC0tZ2l0 IGEvbGlzcC92Yy92Yy1hbm5vdGF0ZS5lbCBiL2xpc3AvdmMvdmMtYW5ub3RhdGUuZWwKaW5k ZXggZGU2YzNhZGJiZGIuLjg1MTYxMzQ3Y2JmIDEwMDY0NAotLS0gYS9saXNwL3ZjL3ZjLWFu bm90YXRlLmVsCisrKyBiL2xpc3AvdmMvdmMtYW5ub3RhdGUuZWwKQEAgLTQwOSw3ICs0MDks OSBAQCB2Yy1hbm5vdGF0ZQogCQkJCSAgbmlsIG5pbCAiMjAiKSkpKSkpKQogICAodmMtZW5z dXJlLXZjLWJ1ZmZlcikKICAgKHNldHEgdmMtYW5ub3RhdGUtZGlzcGxheS1tb2RlIGRpc3Bs YXktbW9kZSkgO05vdCBzdXJlIHdoeS4gIC0tU3RlZgotICAobGV0KiAoKHRlbXAtYnVmZmVy LW5hbWUgKGZvcm1hdCAiKkFubm90YXRlICVzIChyZXYgJXMpKiIgKGJ1ZmZlci1uYW1lKSBy ZXYpKQorICAobGV0KiAoKHRlbXAtYnVmZmVyLW5hbWUgKGZvcm1hdCAiKkFubm90YXRlICVz IChyZXYgJXMpKiIgKGJ1ZmZlci1uYW1lKQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAodmMtY2FsbC1iYWNrZW5kICh2Yy1iYWNrZW5kIGZpbGUpCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3Nob3J0LXJldmlz aW9uIHJldikpKQogICAgICAgICAgKHRlbXAtYnVmZmVyLXNob3ctZnVuY3Rpb24gJ3ZjLWFu bm90YXRlLWRpc3BsYXktc2VsZWN0KQogICAgICAgICAgOzsgSWYgQlVGIGlzIHNwZWNpZmll ZCwgd2UgcHJlc3VtZSB0aGUgY2FsbGVyIG1haW50YWlucyBjdXJyZW50IGxpbmUsCiAgICAg ICAgICA7OyBzbyB3ZSBkb24ndCBuZWVkIHRvIGRvIGl0IGhlcmUuICBUaGlzIGltcGxlbWVu dGF0aW9uIG1heSBnaXZlCmRpZmYgLS1naXQgYS9saXNwL3ZjL3ZjLWdpdC5lbCBiL2xpc3Av dmMvdmMtZ2l0LmVsCmluZGV4IDcwN2ZjN2NmYzA3Li4yZmY2ZjU1NjRlZCAxMDA2NDQKLS0t IGEvbGlzcC92Yy92Yy1naXQuZWwKKysrIGIvbGlzcC92Yy92Yy1naXQuZWwKQEAgLTQwMyw2 ICs0MDMsMTEgQEAgdmMtZ2l0LXdvcmtpbmctcmV2aXNpb24KICAgKGxldCAocHJvY2Vzcy1m aWxlLXNpZGUtZWZmZWN0cykKICAgICAodmMtZ2l0LS1yZXYtcGFyc2UgIkhFQUQiKSkpCiAK KyhkZWZ1biB2Yy1naXQtc2hvcnQtcmV2aXNpb24gKHJldikKKyAgIkdpdC1zcGVjaWZpYyB2 ZXJzaW9uIG9mIGB2Yy1zaG9ydC1yZXZpc2lvbicuIgorICAobGV0IChwcm9jZXNzLWZpbGUt c2lkZS1lZmZlY3RzKQorICAgICh2Yy1naXQtLXJldi1wYXJzZSByZXYgJ3Nob3J0KSkpCisK IChkZWZ1biB2Yy1naXQtLXN5bWJvbGljLXJlZiAoZmlsZSkKICAgKG9yCiAgICAodmMtZmls ZS1nZXRwcm9wIGZpbGUgJ3ZjLWdpdC1zeW1ib2xpYy1yZWYpCkBAIC0xODMwLDExICsxODM1 LDE0IEBAIHZjLWdpdC1wcmV2aW91cy1yZXZpc2lvbgogICAgIDs7IGRvZXMgbm90IChhbmQg Y2Fubm90KSBxdW90ZS4KICAgICAodmMtZ2l0LS1yZXYtcGFyc2UgKGNvbmNhdCByZXYgIn4x IikpKSkKIAotKGRlZnVuIHZjLWdpdC0tcmV2LXBhcnNlIChyZXYpCisoZGVmdW4gdmMtZ2l0 LS1yZXYtcGFyc2UgKHJldiAmb3B0aW9uYWwgc2hvcnQpCiAgICh3aXRoLXRlbXAtYnVmZmVy CiAgICAgKGFuZAotICAgICAodmMtZ2l0LS1vdXQtb2sgInJldi1wYXJzZSIgcmV2KQotICAg ICAoYnVmZmVyLXN1YnN0cmluZy1uby1wcm9wZXJ0aWVzIChwb2ludC1taW4pICgrIChwb2lu dC1taW4pIDQwKSkpKSkKKyAgICAgKGFwcGx5ICMndmMtZ2l0LS1vdXQtb2sgInJldi1wYXJz ZSIKKyAgICAgICAgICAgIChhcHBlbmQgKHdoZW4gc2hvcnQgJygiLS1zaG9ydCIpKQorICAg ICAgICAgICAgICAgICAgICAobGlzdCByZXYpKSkKKyAgICAgKGdvdG8tY2hhciAocG9pbnQt bWluKSkKKyAgICAgKGJ1ZmZlci1zdWJzdHJpbmctbm8tcHJvcGVydGllcyAocG9pbnQpIChw b3MtZW9sKSkpKSkKIAogKGRlZnVuIHZjLWdpdC1uZXh0LXJldmlzaW9uIChmaWxlIHJldikK ICAgIkdpdC1zcGVjaWZpYyB2ZXJzaW9uIG9mIGB2Yy1uZXh0LXJldmlzaW9uJy4iCmRpZmYg LS1naXQgYS9saXNwL3ZjL3ZjLWhvb2tzLmVsIGIvbGlzcC92Yy92Yy1ob29rcy5lbAppbmRl eCBjMTZmYjYzYjJmZi4uMzhjODRhMGNlZWEgMTAwNjQ0Ci0tLSBhL2xpc3AvdmMvdmMtaG9v a3MuZWwKKysrIGIvbGlzcC92Yy92Yy1ob29rcy5lbApAQCAtNTAyLDYgKzUwMiwxMSBAQCB2 Yy13b3JraW5nLXJldmlzaW9uCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAodmMtY2Fs bC1iYWNrZW5kCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmFja2VuZCAnd29ya2lu Zy1yZXZpc2lvbiBmaWxlKSkpKSkpCiAKKyhkZWZ1biB2Yy1kZWZhdWx0LXNob3J0LXJldmlz aW9uIChfYmFja2VuZCByZXYpCisgICJSZXR1cm4gYSBcInNob3J0ZW5lZFwiIHZlcnNpb24g b2YgdGhlIHJldmlzaW9uIFJFVi4KK1RoaXMgZGVmYXVsdCBpbXBsZW1lbnRhdGlvbiBzaW1w bHkgcmV0dXJucyBSRVYgdW5jaGFuZ2VkLiIKKyAgcmV2KQorCiAoZGVmdW4gdmMtZGVmYXVs dC1yZWdpc3RlcmVkIChiYWNrZW5kIGZpbGUpCiAgICJDaGVjayBpZiBGSUxFIGlzIHJlZ2lz dGVyZWQgaW4gQkFDS0VORCB1c2luZyB2Yy1CQUNLRU5ELW1hc3Rlci10ZW1wbGF0ZXMuIgog ICAobGV0ICgoc3ltICh2Yy1tYWtlLWJhY2tlbmQtc3ltIGJhY2tlbmQgJ21hc3Rlci10ZW1w bGF0ZXMpKSkKLS0gCjIuMjUuMQoK --------------804uT0Llz0kr8Zurueu6Xc2O--