From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#55871: Acknowledgement (27.1; vc-git.el log view 'a', 'f', 'd' do not work when following renames) Date: Fri, 15 Dec 2023 04:01:59 +0200 Message-ID: <36b48587-a723-73ae-fefb-886d69d04ec8@yandex.ru> References: <78f97339-2aca-0dbd-4cb4-3532af78a895@yandex.ru> <1b16a642-8a85-e693-66fc-41c37df24908@yandex.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------9U2AGPSI9Hkf4vqNo0d64qFX" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4130"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Cc: 55871@debbugs.gnu.org To: =?UTF-8?Q?Nicol=C3=A1s?= Ojeda =?UTF-8?Q?B=C3=A4r?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Dec 15 03:03:32 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 1rDxY4-0000tP-6E for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 15 Dec 2023 03:03:32 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDxXd-0001IT-KM; Thu, 14 Dec 2023 21:03:05 -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 1rDxXb-0001II-5e for bug-gnu-emacs@gnu.org; Thu, 14 Dec 2023 21:03:03 -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 1rDxXa-0007ya-T5 for bug-gnu-emacs@gnu.org; Thu, 14 Dec 2023 21:03:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDxXZ-0005HL-Qo for bug-gnu-emacs@gnu.org; Thu, 14 Dec 2023 21:03:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 15 Dec 2023 02:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55871 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 55871-submit@debbugs.gnu.org id=B55871.170260573320233 (code B ref 55871); Fri, 15 Dec 2023 02:03:01 +0000 Original-Received: (at 55871) by debbugs.gnu.org; 15 Dec 2023 02:02:13 +0000 Original-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 Original-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 Original-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) Original-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 Original-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) Original-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 Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 14 Dec 2023 21:02:02 -0500 (EST) Content-Language: en-US In-Reply-To: <1b16a642-8a85-e693-66fc-41c37df24908@yandex.ru> 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:276248 Archived-At: 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--