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: Fri, 10 Nov 2023 18:49:59 -0800 Message-ID: <66fc4912-6aa5-79da-bd6f-52f068cf1a77@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------r0mWTxxpCVyAoQHXsdzsz4pC" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20619"; mail-complaints-to="usenet@ciao.gmane.io" To: 67062@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Nov 11 03:50:31 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 1r1e4s-00058I-GE for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 11 Nov 2023 03:50:30 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1e4m-0002tf-8o; Fri, 10 Nov 2023 21:50:24 -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 1r1e4l-0002tU-2L for bug-gnu-emacs@gnu.org; Fri, 10 Nov 2023 21:50:23 -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 1r1e4k-0002yS-QS for bug-gnu-emacs@gnu.org; Fri, 10 Nov 2023 21:50:22 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r1e5O-0000Nr-L3 for bug-gnu-emacs@gnu.org; Fri, 10 Nov 2023 21:51:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 11 Nov 2023 02:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67062 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.16996710541460 (code B ref -1); Sat, 11 Nov 2023 02:51:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 11 Nov 2023 02:50:54 +0000 Original-Received: from localhost ([127.0.0.1]:51289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1e5F-0000NT-Ub for submit@debbugs.gnu.org; Fri, 10 Nov 2023 21:50:54 -0500 Original-Received: from lists.gnu.org ([2001:470:142::17]:56528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1e5B-0000NC-JT for submit@debbugs.gnu.org; Fri, 10 Nov 2023 21:50:52 -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 1r1e4R-0002mP-Jx for bug-gnu-emacs@gnu.org; Fri, 10 Nov 2023 21:50:03 -0500 Original-Received: from mail-oa1-x2d.google.com ([2001:4860:4864:20::2d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r1e4P-0002eV-Oh for bug-gnu-emacs@gnu.org; Fri, 10 Nov 2023 21:50:03 -0500 Original-Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-1ef370c2e12so1486366fac.1 for ; Fri, 10 Nov 2023 18:50:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699671000; x=1700275800; darn=gnu.org; h=to:subject:from:content-language:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=CgQo9LdV9iSr+lDPyaKVodRFOlODLlx+u4oAPLA9VLw=; b=izrCyFABj30U2CXMOWo2EAw6QlE2DQDfGTNdUES5cy9cLBuYUwmLBN/0CDDTJqTAW2 iRj6abeDfiWOekCxhvHNuA//+zY64ggTSe+g7ZS+HJbkbjAfncV/Vdamn+HTWIXSyjNh D5r5lSR7kVBndfn6p+ODI78H2cFVhdXr9NTPKwRhv82Rcp41Tm1PPKnWKuRxKMR3/6af hipPg8/EZWnt6KRBbwIsY0RVVVZLLoHI4NRIlH95K+UmoIplqEGjfhtUKvWJ4YVseD0J p7kR6yXTBJZebZZi9Lt3mGw9DqdDrWhFRIlSPVUObCuLO9mhL2IX5mtho0PyrjRRh0CO cFNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699671000; x=1700275800; h=to:subject:from:content-language:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CgQo9LdV9iSr+lDPyaKVodRFOlODLlx+u4oAPLA9VLw=; b=FgHqcomRSkzTYgOnHvoYDUTzNpvWXdbBdJyDxrb9Zl7qP+OLUhDMMLLhHrfr2ciNlt nMpj8Ey6JjNnUOHuzlv5wzP6AOgLSft4RsOzzl4KzY7F1yB2ps8F1AsPD/aU0Kcc3jPG HTXi51B+2CKJsD0wHATyH9o3QkAH3f3lDZNi070CnhbR1O5CGksJ4rF4VyPd2hNzUtVO Q9PXv9So7WucI3gFZImEyDdteOMYhgPXJWit0YvDVQ+COQ0Boo8gF8lfpQaDLtA86PB8 x0Cq0S9OIEqvE5oVpJ54mm2weDidosPFofBj3b7xSd00qZC095t/n0FrJJFug61bUSGb ywUw== X-Gm-Message-State: AOJu0YxH9p0eaduSbdx0sKTOfaPp8UvPi/D/o4cirK4C+USMw5DDi0U5 0UI6LPWPOAHwpPVhJ6NtgYRfQGJfYik= X-Google-Smtp-Source: AGHT+IHJCXk9cnstNODVb6VsXGFPy6IeE4YD6svDnZG8wlprOdZTrayRT2varZNmfsyizRJA2rJE7Q== X-Received: by 2002:a05:6870:d0c6:b0:1bb:509a:824f with SMTP id k6-20020a056870d0c600b001bb509a824fmr1313358oaa.55.1699670999925; Fri, 10 Nov 2023 18:49:59 -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 5-20020a17090a19c500b0026f39c90111sm489817pjj.20.2023.11.10.18.49.58 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Nov 2023 18:49:59 -0800 (PST) X-Mozilla-News-Host: news://news.gmane.io:119 Content-Language: en-US Received-SPF: pass client-ip=2001:4860:4864:20::2d; envelope-from=jporterbugs@gmail.com; helo=mail-oa1-x2d.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-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:274130 Archived-At: This is a multi-part message in MIME format. --------------r0mWTxxpCVyAoQHXsdzsz4pC Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Currently, when running 'vc-annotate' for a Git repo, the buffer name is very long: it has the form "*Annotate FILE (rev REVISION)*", and for Git, REVISION is 40(?) characters long. Seeing the full Git SHA isn't (in my opinion) useful, especially not in a space-limited area like the mode line. At the default width of 80 columns, this pushes much of the mode line information off-screen. Attached is a patch to add a 'short-revision' function for VC backends, and a Git implementation for it. Does this make sense? Should there be an option to restore the previous behavior? (I'm not sure why anyone would *want* the old behavior, but I'm not opposed to adding an option.) --------------r0mWTxxpCVyAoQHXsdzsz4pC 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 RnJvbSA5MTAzYWE2NGI2NGQwYTc5ODM1YzA3MjA4NmQwNDA3MzRkZGYxYzJhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IEZyaSwgMTAgTm92IDIwMjMgMTg6NDI6MjkgLTA4MDAKU3ViamVjdDogW1BB VENIXSBBYmJyZXZpYXRlIHRoZSBWQyByZXZpc2lvbiBpbiB2Yy1hbm5vdGF0ZSdzIGJ1ZmZl ciBuYW1lCgoqIGxpc3AvdmMvdmMtYW5ub3RhdGUuZWwgKHZjLWFubm90YXRlKTogQ2FsbCAn c2hvcnQtcmV2aXNpb24nCgoqIGxpc3AvdmMvdmMtaG9va3MuZWwgKHZjLWRlZmF1bHQtc2hv cnQtcmV2aXNpb24pOiBOZXcgZnVuY3Rpb24uCgoqIGxpc3AvdmMvdmMtZ2l0LmVsICh2Yy1n aXQtc2hvcnQtcmV2aXNpb24pOiBOZXcgZnVuY3Rpb24uCih2Yy1naXQtLXJldi1wYXJzZSk6 IE5ldyBvcHRpb25hbCBhcmd1bWVudCBTSE9SVC4KLS0tCiBsaXNwL3ZjL3ZjLWFubm90YXRl LmVsIHwgIDQgKysrLQogbGlzcC92Yy92Yy1naXQuZWwgICAgICB8IDE0ICsrKysrKysrKysr LS0tCiBsaXNwL3ZjL3ZjLWhvb2tzLmVsICAgIHwgIDUgKysrKysKIDMgZmlsZXMgY2hhbmdl ZCwgMTkgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNw L3ZjL3ZjLWFubm90YXRlLmVsIGIvbGlzcC92Yy92Yy1hbm5vdGF0ZS5lbAppbmRleCBkZTZj M2FkYmJkYi4uODUxNjEzNDdjYmYgMTAwNjQ0Ci0tLSBhL2xpc3AvdmMvdmMtYW5ub3RhdGUu ZWwKKysrIGIvbGlzcC92Yy92Yy1hbm5vdGF0ZS5lbApAQCAtNDA5LDcgKzQwOSw5IEBAIHZj LWFubm90YXRlCiAJCQkJICBuaWwgbmlsICIyMCIpKSkpKSkpCiAgICh2Yy1lbnN1cmUtdmMt YnVmZmVyKQogICAoc2V0cSB2Yy1hbm5vdGF0ZS1kaXNwbGF5LW1vZGUgZGlzcGxheS1tb2Rl KSA7Tm90IHN1cmUgd2h5LiAgLS1TdGVmCi0gIChsZXQqICgodGVtcC1idWZmZXItbmFtZSAo Zm9ybWF0ICIqQW5ub3RhdGUgJXMgKHJldiAlcykqIiAoYnVmZmVyLW5hbWUpIHJldikpCisg IChsZXQqICgodGVtcC1idWZmZXItbmFtZSAoZm9ybWF0ICIqQW5ub3RhdGUgJXMgKHJldiAl cykqIiAoYnVmZmVyLW5hbWUpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICh2Yy1jYWxsLWJhY2tlbmQgKHZjLWJhY2tlbmQgZmlsZSkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnc2hvcnQtcmV2aXNpb24gcmV2 KSkpCiAgICAgICAgICAodGVtcC1idWZmZXItc2hvdy1mdW5jdGlvbiAndmMtYW5ub3RhdGUt ZGlzcGxheS1zZWxlY3QpCiAgICAgICAgICA7OyBJZiBCVUYgaXMgc3BlY2lmaWVkLCB3ZSBw cmVzdW1lIHRoZSBjYWxsZXIgbWFpbnRhaW5zIGN1cnJlbnQgbGluZSwKICAgICAgICAgIDs7 IHNvIHdlIGRvbid0IG5lZWQgdG8gZG8gaXQgaGVyZS4gIFRoaXMgaW1wbGVtZW50YXRpb24g bWF5IGdpdmUKZGlmZiAtLWdpdCBhL2xpc3AvdmMvdmMtZ2l0LmVsIGIvbGlzcC92Yy92Yy1n aXQuZWwKaW5kZXggNzA3ZmM3Y2ZjMDcuLjJmZjZmNTU2NGVkIDEwMDY0NAotLS0gYS9saXNw L3ZjL3ZjLWdpdC5lbAorKysgYi9saXNwL3ZjL3ZjLWdpdC5lbApAQCAtNDAzLDYgKzQwMywx MSBAQCB2Yy1naXQtd29ya2luZy1yZXZpc2lvbgogICAobGV0IChwcm9jZXNzLWZpbGUtc2lk ZS1lZmZlY3RzKQogICAgICh2Yy1naXQtLXJldi1wYXJzZSAiSEVBRCIpKSkKIAorKGRlZnVu IHZjLWdpdC1zaG9ydC1yZXZpc2lvbiAocmV2KQorICAiR2l0LXNwZWNpZmljIHZlcnNpb24g b2YgYHZjLXNob3J0LXJldmlzaW9uJy4iCisgIChsZXQgKHByb2Nlc3MtZmlsZS1zaWRlLWVm ZmVjdHMpCisgICAgKHZjLWdpdC0tcmV2LXBhcnNlIHJldiAnc2hvcnQpKSkKKwogKGRlZnVu IHZjLWdpdC0tc3ltYm9saWMtcmVmIChmaWxlKQogICAob3IKICAgICh2Yy1maWxlLWdldHBy b3AgZmlsZSAndmMtZ2l0LXN5bWJvbGljLXJlZikKQEAgLTE4MzAsMTEgKzE4MzUsMTQgQEAg dmMtZ2l0LXByZXZpb3VzLXJldmlzaW9uCiAgICAgOzsgZG9lcyBub3QgKGFuZCBjYW5ub3Qp IHF1b3RlLgogICAgICh2Yy1naXQtLXJldi1wYXJzZSAoY29uY2F0IHJldiAifjEiKSkpKQog Ci0oZGVmdW4gdmMtZ2l0LS1yZXYtcGFyc2UgKHJldikKKyhkZWZ1biB2Yy1naXQtLXJldi1w YXJzZSAocmV2ICZvcHRpb25hbCBzaG9ydCkKICAgKHdpdGgtdGVtcC1idWZmZXIKICAgICAo YW5kCi0gICAgICh2Yy1naXQtLW91dC1vayAicmV2LXBhcnNlIiByZXYpCi0gICAgIChidWZm ZXItc3Vic3RyaW5nLW5vLXByb3BlcnRpZXMgKHBvaW50LW1pbikgKCsgKHBvaW50LW1pbikg NDApKSkpKQorICAgICAoYXBwbHkgIyd2Yy1naXQtLW91dC1vayAicmV2LXBhcnNlIgorICAg ICAgICAgICAgKGFwcGVuZCAod2hlbiBzaG9ydCAnKCItLXNob3J0IikpCisgICAgICAgICAg ICAgICAgICAgIChsaXN0IHJldikpKQorICAgICAoZ290by1jaGFyIChwb2ludC1taW4pKQor ICAgICAoYnVmZmVyLXN1YnN0cmluZy1uby1wcm9wZXJ0aWVzIChwb2ludCkgKHBvcy1lb2wp KSkpKQogCiAoZGVmdW4gdmMtZ2l0LW5leHQtcmV2aXNpb24gKGZpbGUgcmV2KQogICAiR2l0 LXNwZWNpZmljIHZlcnNpb24gb2YgYHZjLW5leHQtcmV2aXNpb24nLiIKZGlmZiAtLWdpdCBh L2xpc3AvdmMvdmMtaG9va3MuZWwgYi9saXNwL3ZjL3ZjLWhvb2tzLmVsCmluZGV4IGMxNmZi NjNiMmZmLi4zOGM4NGEwY2VlYSAxMDA2NDQKLS0tIGEvbGlzcC92Yy92Yy1ob29rcy5lbAor KysgYi9saXNwL3ZjL3ZjLWhvb2tzLmVsCkBAIC01MDIsNiArNTAyLDExIEBAIHZjLXdvcmtp bmctcmV2aXNpb24KICAgICAgICAgICAgICAgICAgICAgICAgICAgICh2Yy1jYWxsLWJhY2tl bmQKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBiYWNrZW5kICd3b3JraW5nLXJldmlz aW9uIGZpbGUpKSkpKSkKIAorKGRlZnVuIHZjLWRlZmF1bHQtc2hvcnQtcmV2aXNpb24gKF9i YWNrZW5kIHJldikKKyAgIlJldHVybiBhIFwic2hvcnRlbmVkXCIgdmVyc2lvbiBvZiB0aGUg cmV2aXNpb24gUkVWLgorVGhpcyBkZWZhdWx0IGltcGxlbWVudGF0aW9uIHNpbXBseSByZXR1 cm5zIFJFViB1bmNoYW5nZWQuIgorICByZXYpCisKIChkZWZ1biB2Yy1kZWZhdWx0LXJlZ2lz dGVyZWQgKGJhY2tlbmQgZmlsZSkKICAgIkNoZWNrIGlmIEZJTEUgaXMgcmVnaXN0ZXJlZCBp biBCQUNLRU5EIHVzaW5nIHZjLUJBQ0tFTkQtbWFzdGVyLXRlbXBsYXRlcy4iCiAgIChsZXQg KChzeW0gKHZjLW1ha2UtYmFja2VuZC1zeW0gYmFja2VuZCAnbWFzdGVyLXRlbXBsYXRlcykp KQotLSAKMi4yNS4xCgo= --------------r0mWTxxpCVyAoQHXsdzsz4pC--