From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Justin Schell Newsgroups: gmane.emacs.bugs Subject: bug#52172: Fix vc-git--program-version to support Git for macOS version string Date: Sun, 28 Nov 2021 18:44:21 -0700 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000ff7cee05d1e395cc" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11337"; mail-complaints-to="usenet@ciao.gmane.io" To: 52172@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Nov 29 02:45:49 2021 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 1mrVjo-0002kV-Ng for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 29 Nov 2021 02:45:48 +0100 Original-Received: from localhost ([::1]:52230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrVjn-0007Rp-HJ for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 28 Nov 2021 20:45:47 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:53076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrVj4-0007QU-F6 for bug-gnu-emacs@gnu.org; Sun, 28 Nov 2021 20:45:05 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:53274) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrVj4-0005rr-6i for bug-gnu-emacs@gnu.org; Sun, 28 Nov 2021 20:45:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mrVj3-0002jM-Sq for bug-gnu-emacs@gnu.org; Sun, 28 Nov 2021 20:45:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Justin Schell Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 29 Nov 2021 01:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52172 X-GNU-PR-Package: emacs X-Debbugs-Original-To: "Andrea Corallo via Bug reports for GNU Emacs, the Swiss army knife of text editors" Original-Received: via spool by submit@debbugs.gnu.org id=B.163815029810468 (code B ref -1); Mon, 29 Nov 2021 01:45:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 29 Nov 2021 01:44:58 +0000 Original-Received: from localhost ([127.0.0.1]:36587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrVj0-0002il-6k for submit@debbugs.gnu.org; Sun, 28 Nov 2021 20:44:58 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:53826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrViv-0002iZ-L1 for submit@debbugs.gnu.org; Sun, 28 Nov 2021 20:44:56 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:53056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrViu-0007OA-Bx for bug-gnu-emacs@gnu.org; Sun, 28 Nov 2021 20:44:53 -0500 Original-Received: from [2a00:1450:4864:20::22c] (port=40891 helo=mail-lj1-x22c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrVis-0005rG-MA for bug-gnu-emacs@gnu.org; Sun, 28 Nov 2021 20:44:52 -0500 Original-Received: by mail-lj1-x22c.google.com with SMTP id u22so31377829lju.7 for ; Sun, 28 Nov 2021 17:44:49 -0800 (PST) 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=DdzzFGRdedk1XQHvqfWoFWgkw22SKV3OmgW29GRB6Xo=; b=e1JlJGF8h7UN+ve4G8NoOFUf1Oo2Crq3yTQQlAPputp8P60wOzdjflsnKwjc5dRDRU JW6Wxm+yxkvh7rBb1dq0Qy88sG79GKuP8bNas3GPfmX2ZJrhV2mLh9f4dt2yODGecVmX EC0rzlTbRUMPO+xKnG7VL7owtqX/GYJIVbSgLdBVHfpiyY9045DvTKBplL6see68L+z9 yRGRoNfUYIAmKOldDzuIVmbER6DFPjQg/y6cj4SG3MGaZJESjdk3S2qGWuPNUXShegSg 2baLAEy/NjKrfa+hNKpj5WJfhguixV4i+3ifbPCLCPe+HeFmRIbIVVvYIhhbKWM8CYqM JrUA== 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=DdzzFGRdedk1XQHvqfWoFWgkw22SKV3OmgW29GRB6Xo=; b=aT5BKUeN/CpDEipqHHQu/HfhO9wTHtRCl+jDaUaANccliVxUp9AQjKYjtC28zuLya0 tNZq0As47zEd875LZL7v5KFjWxUal436dmcNLX0/MSh5AvKF1WTtNk+KVqW2A2kIxe/N wN6S0r5RtHhek0Wovj4UjYHQUoSu5+/6m10iVEV+iHznC/7xTnsiBfSfa5Ygp/wFMNZx xoFKXiycWqC18R25YtNotVbnVhNL0Asgn4k/hwErhysnILe33ouNRwUQdU35F1qSjSQT 6dQgQnpMAJxcyllcTqJd2Y9DrB7ibZ0vGU+hwkABmkOybFY1PsqhYYJiCH+iSJmAqtcg Ko4Q== X-Gm-Message-State: AOAM531T5chpPT80I8FngSW5Z7gnA+L5xVOdLFkjh8uU7h5bQaR5v1F8 lqvvxsvpZd9RwcJLotrw/CLjuoC3ZFIMaOtxC2fLRro7dXI= X-Google-Smtp-Source: ABdhPJxBQCgfFi573pOHKBrCsUlK4IDVaPYRfvO4kX7kehkTsPjmgF3sGmq1rQKKx89KV9tCuIa10d8TqOgvLyLElZ0= X-Received: by 2002:a2e:7d15:: with SMTP id y21mr12351161ljc.113.1638150287875; Sun, 28 Nov 2021 17:44:47 -0800 (PST) X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::22c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::22c; envelope-from=justinmschell@gmail.com; helo=mail-lj1-x22c.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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" Xref: news.gmane.io gmane.emacs.bugs:220983 Archived-At: --000000000000ff7cee05d1e395cc Content-Type: text/plain; charset="UTF-8" The current `vc-git.el` `vc-git--program-version` function doesn't support the version string returned by Git on macOS. `git version` on macOS returns e.g., "git version 2.30.1 (Apple Git-130)" and `vc-git--program-version` currently returns "0" instead of "2.30.1". I've attached patches for two options for a fix. `topic.fix-vc-git--program-version.ignore-trailing.patch` updates the regexp used to match numeric version strings that are a combination of digits and dots (starting with a digit), ignoring anything else that comes after. Any trailing dots are then stripped. This is more general than the current approach of supporting a numeric version string only, or a numeric version string followed by the specific additional strings that some Git versions append (currently only the additional string appended by Git for Windows is supported) and supports reasonable version strings that I can think of that potential other versions of Git might return. I'm unaware of why this approach wasn't used in the previous fix used for Git for Windows support. As such, I've also attached `topic.fix-vc-git--program-version.support-macos`, which adds to the current approach, adding support for the specific additional string that Git for macOS returns, if that is preferred. Also included are unit tests for each approach. Thanks, Justin Schell --000000000000ff7cee05d1e395cc Content-Type: application/octet-stream; name="topic.fix-vc-git--program-version.ignore-trailing.patch" Content-Disposition: attachment; filename="topic.fix-vc-git--program-version.ignore-trailing.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kwk0cz6o0 ZGlmZiAtLWdpdCBhL2xpc3AvdmMvdmMtZ2l0LmVsIGIvbGlzcC92Yy92Yy1naXQuZWwKaW5kZXgg MmQzNTA2MWIyNi4uM2FhZjk5NWQxYiAxMDA2NDQKLS0tIGEvbGlzcC92Yy92Yy1naXQuZWwKKysr IGIvbGlzcC92Yy92Yy1naXQuZWwKQEAgLTI5OCwxMiArMjk4LDE1IEBAIGluY2x1ZGVkIGluIHRo ZSBjb21wbGV0aW9ucy4iCiAgICAgICAgICAgICAgKHZjLWdpdC0tcnVuLWNvbW1hbmQtc3RyaW5n IG5pbCAidmVyc2lvbiIpKSkKICAgICAgICAgKHNldHEgdmMtZ2l0LS1wcm9ncmFtLXZlcnNpb24K ICAgICAgICAgICAgICAgKGlmIChhbmQgdmVyc2lvbi1zdHJpbmcKLSAgICAgICAgICAgICAgICAg ICAgICAgOzsgR2l0IGZvciBXaW5kb3dzIGFwcGVuZHMgIi53aW5kb3dzLk4iIHRvIHRoZQotICAg ICAgICAgICAgICAgICAgICAgICA7OyBudW1lcmljYWwgdmVyc2lvbiByZXBvcnRlZCBieSBHaXQu CisgICAgICAgICAgICAgICAgICAgICAgIDs7IFNvbWUgR2l0IHZlcnNpb25zIGFwcGVuZCBhZGRp dGlvbmFsIHN0cmluZ3MKKyAgICAgICAgICAgICAgICAgICAgICAgOzsgdG8gdGhlIG51bWVyaWNh bCB2ZXJzaW9uIHN0cmluZy4gRS5nLiwgR2l0CisgICAgICAgICAgICAgICAgICAgICAgIDs7IGZv ciBXaW5kb3dzIGFwcGVuZHMgIi53aW5kb3dzLk4iLCB3aGlsZSBHaXQKKyAgICAgICAgICAgICAg ICAgICAgICAgOzsgZm9yIE1hYyBhcHBlbmRzICIgKEFwcGxlIEdpdC1OKSIuIENhcHR1cmUKKyAg ICAgICAgICAgICAgICAgICAgICAgOzsgbnVtZXJpY2FsIHZlcnNpb24gYW5kIGlnbm9yZSB0aGUg cmVzdC4KICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1tYXRjaAotICAgICAgICAgICAg ICAgICAgICAgICAgImdpdCB2ZXJzaW9uIFxcKFswLTkuXStcXClcXChcXC53aW5kb3dzXFwuWzAt OV0rXFwpPyQiCisgICAgICAgICAgICAgICAgICAgICAgICAiZ2l0IHZlcnNpb24gXFwoWzAtOV1b MC05Ll0rXFwpIgogICAgICAgICAgICAgICAgICAgICAgICAgdmVyc2lvbi1zdHJpbmcpKQotICAg ICAgICAgICAgICAgICAgKG1hdGNoLXN0cmluZyAxIHZlcnNpb24tc3RyaW5nKQorICAgICAgICAg ICAgICAgICAgKHN0cmluZy10cmltLXJpZ2h0IChtYXRjaC1zdHJpbmcgMSB2ZXJzaW9uLXN0cmlu ZykgIlxcLiIpCiAgICAgICAgICAgICAgICAgIjAiKSkpKSkKIAogKGRlZnVuIHZjLWdpdC0tZ2l0 LXN0YXR1cy10by12Yy1zdGF0ZSAoY29kZS1saXN0KQpkaWZmIC0tZ2l0IGEvdGVzdC9saXNwL3Zj L3ZjLWdpdC10ZXN0cy5lbCBiL3Rlc3QvbGlzcC92Yy92Yy1naXQtdGVzdHMuZWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMC4uOTk3YWIzYzRiNQotLS0gL2Rldi9udWxsCisr KyBiL3Rlc3QvbGlzcC92Yy92Yy1naXQtdGVzdHMuZWwKQEAgLTAsMCArMSw2NyBAQAorOzs7IHZj LWdpdC10ZXN0cy5lbCAtLS0gdGVzdHMgZm9yIHZjL3ZjLWdpdC5lbCAgLSotIGxleGljYWwtYmlu ZGluZzp0IC0qLQorCis7OyBDb3B5cmlnaHQgKEMpIDIwMTYtMjAyMSBGcmVlIFNvZnR3YXJlIEZv dW5kYXRpb24sIEluYy4KKworOzsgQXV0aG9yOiBKdXN0aW4gU2NoZWxsIDxqdXN0aW5tc2NoZWxs QGdtYWlsLmNvbT4KKzs7IE1haW50YWluZXI6IGVtYWNzLWRldmVsQGdudS5vcmcKKworOzsgVGhp cyBmaWxlIGlzIHBhcnQgb2YgR05VIEVtYWNzLgorCis7OyBHTlUgRW1hY3MgaXMgZnJlZSBzb2Z0 d2FyZTogeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeQorOzsgaXQgdW5kZXIg dGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQg YnkKKzs7IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIGVpdGhlciB2ZXJzaW9uIDMgb2Yg dGhlIExpY2Vuc2UsIG9yCis7OyAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgor Cis7OyBHTlUgRW1hY3MgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJl IHVzZWZ1bCwKKzs7IGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBp bXBsaWVkIHdhcnJhbnR5IG9mCis7OyBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQ QVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlCis7OyBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5z ZSBmb3IgbW9yZSBkZXRhaWxzLgorCis7OyBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5 IG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQorOzsgYWxvbmcgd2l0aCBHTlUgRW1h Y3MuICBJZiBub3QsIHNlZSA8aHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy8+LgorCis7Ozsg Q29tbWVudGFyeToKKworOzs7IENvZGU6CisKKyhyZXF1aXJlICd2Yy1naXQpCisKKyhlcnQtZGVm dGVzdCB2Yy1naXQtdGVzdC1wcm9ncmFtLXZlcnNpb24tZ2VuZXJhbCAoKQorICAodmMtZ2l0LXRl c3QtLXJ1bi1wcm9ncmFtLXZlcnNpb24tdGVzdAorICAgImdpdCB2ZXJzaW9uIDIuMzAuMS4wIgor ICAgIjIuMzAuMS4wIikpCisKKyhlcnQtZGVmdGVzdCB2Yy1naXQtdGVzdC1wcm9ncmFtLXZlcnNp b24td2luZG93cyAoKQorICAodmMtZ2l0LXRlc3QtLXJ1bi1wcm9ncmFtLXZlcnNpb24tdGVzdAor ICAgImdpdCB2ZXJzaW9uIDIuMzAuMS4xLndpbmRvd3MuMSIKKyAgICIyLjMwLjEuMSIpKQorCiso ZXJ0LWRlZnRlc3QgdmMtZ2l0LXRlc3QtcHJvZ3JhbS12ZXJzaW9uLWFwcGxlICgpCisgICh2Yy1n aXQtdGVzdC0tcnVuLXByb2dyYW0tdmVyc2lvbi10ZXN0CisgICAiZ2l0IHZlcnNpb24gMi4zMC4x LjIgKEFwcGxlIEdpdC0xMzApIgorICAgIjIuMzAuMS4yIikpCisKKyhlcnQtZGVmdGVzdCB2Yy1n aXQtdGVzdC1wcm9ncmFtLXZlcnNpb24tb3RoZXIgKCkKKyAgKHZjLWdpdC10ZXN0LS1ydW4tcHJv Z3JhbS12ZXJzaW9uLXRlc3QKKyAgICJnaXQgdmVyc2lvbiAyLjMwLjEuMy5mb28uYmFyIgorICAg IjIuMzAuMS4zIikpCisKKyhlcnQtZGVmdGVzdCB2Yy1naXQtdGVzdC1wcm9ncmFtLXZlcnNpb24t aW52YWxpZC1sZWFkaW5nLXN0cmluZyAoKQorICAodmMtZ2l0LXRlc3QtLXJ1bi1wcm9ncmFtLXZl cnNpb24tdGVzdAorICAgImdpdCB2ZXJzaW9uIGZvby5iYXIuMi4zMC4xLjQiCisgICAiMCIpKQor CisoZXJ0LWRlZnRlc3QgdmMtZ2l0LXRlc3QtcHJvZ3JhbS12ZXJzaW9uLWludmFsaWQtbGVhZGlu Zy1kb3QgKCkKKyAgKHZjLWdpdC10ZXN0LS1ydW4tcHJvZ3JhbS12ZXJzaW9uLXRlc3QKKyAgICJn aXQgdmVyc2lvbiAuMi4zMC4xLjUiCisgICAiMCIpKQorCisoZGVmdW4gdmMtZ2l0LXRlc3QtLXJ1 bi1wcm9ncmFtLXZlcnNpb24tdGVzdAorICAgIChtb2NrLXZlcnNpb24tc3RyaW5nIGV4cGVjdGVk LW91dHB1dCkKKyAgKGNsLWxldGYqICgoKHN5bWJvbC1mdW5jdGlvbiAndmMtZ2l0LS1ydW4tY29t bWFuZC1zdHJpbmcpCisgICAgICAgICAgICAgIChsYW1iZGEgKF9maWxlIF9hcmdzKSBtb2NrLXZl cnNpb24tc3RyaW5nKSkKKyAgICAgICAgICAgICAodmMtZ2l0LS1wcm9ncmFtLXZlcnNpb24gbmls KQorICAgICAgICAgICAgIChhY3R1YWwtb3V0cHV0ICh2Yy1naXQtLXByb2dyYW0tdmVyc2lvbikp KQorICAgIChzaG91bGQgKGVxdWFsIGFjdHVhbC1vdXRwdXQgZXhwZWN0ZWQtb3V0cHV0KSkpKQor Cis7OzsgdmMtZ2l0LXRlc3RzLmVsIGVuZHMgaGVyZQo= --000000000000ff7cee05d1e395cc Content-Type: application/octet-stream; name="topic.fix-vc-git--program-version.support-macos" Content-Disposition: attachment; filename="topic.fix-vc-git--program-version.support-macos" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kwk0d6i51 ZGlmZiAtLWdpdCBhL2xpc3AvdmMvdmMtZ2l0LmVsIGIvbGlzcC92Yy92Yy1naXQuZWwKaW5kZXgg MmQzNTA2MWIyNi4uZWFiMTQ1MGE0MSAxMDA2NDQKLS0tIGEvbGlzcC92Yy92Yy1naXQuZWwKKysr IGIvbGlzcC92Yy92Yy1naXQuZWwKQEAgLTI5OSw5ICsyOTksMTAgQEAgaW5jbHVkZWQgaW4gdGhl IGNvbXBsZXRpb25zLiIKICAgICAgICAgKHNldHEgdmMtZ2l0LS1wcm9ncmFtLXZlcnNpb24KICAg ICAgICAgICAgICAgKGlmIChhbmQgdmVyc2lvbi1zdHJpbmcKICAgICAgICAgICAgICAgICAgICAg ICAgOzsgR2l0IGZvciBXaW5kb3dzIGFwcGVuZHMgIi53aW5kb3dzLk4iIHRvIHRoZQotICAgICAg ICAgICAgICAgICAgICAgICA7OyBudW1lcmljYWwgdmVyc2lvbiByZXBvcnRlZCBieSBHaXQuCisg ICAgICAgICAgICAgICAgICAgICAgIDs7IG51bWVyaWNhbCB2ZXJzaW9uIHJlcG9ydGVkIGJ5IEdp dC4gR2l0IGZvcgorICAgICAgICAgICAgICAgICAgICAgICA7OyBtYWNPUyBhcHBlbmRzICIgKEFw cGxlIEdpdC1OKSIuCiAgICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctbWF0Y2gKLSAgICAg ICAgICAgICAgICAgICAgICAgICJnaXQgdmVyc2lvbiBcXChbMC05Ll0rXFwpXFwoXFwud2luZG93 c1xcLlswLTldK1xcKT8kIgorICAgICAgICAgICAgICAgICAgICAgICAgImdpdCB2ZXJzaW9uIFxc KFswLTkuXStcXClcXChcXC53aW5kb3dzXFwuWzAtOV0rXFwpP1xcKCAoQXBwbGUgR2l0XFwtWzAt OV0rKVxcKT8kIgogICAgICAgICAgICAgICAgICAgICAgICAgdmVyc2lvbi1zdHJpbmcpKQogICAg ICAgICAgICAgICAgICAgKG1hdGNoLXN0cmluZyAxIHZlcnNpb24tc3RyaW5nKQogICAgICAgICAg ICAgICAgICIwIikpKSkpCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvdmMvdmMtZ2l0LXRlc3RzLmVs IGIvdGVzdC9saXNwL3ZjL3ZjLWdpdC10ZXN0cy5lbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwLi5hYmNkOWQ0MmJlCi0tLSAvZGV2L251bGwKKysrIGIvdGVzdC9saXNwL3Zj L3ZjLWdpdC10ZXN0cy5lbApAQCAtMCwwICsxLDU3IEBACis7OzsgdmMtZ2l0LXRlc3RzLmVsIC0t LSB0ZXN0cyBmb3IgdmMvdmMtZ2l0LmVsICAtKi0gbGV4aWNhbC1iaW5kaW5nOnQgLSotCisKKzs7 IENvcHlyaWdodCAoQykgMjAxNi0yMDIxIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLgor Cis7OyBBdXRob3I6IEp1c3RpbiBTY2hlbGwgPGp1c3Rpbm1zY2hlbGxAZ21haWwuY29tPgorOzsg TWFpbnRhaW5lcjogZW1hY3MtZGV2ZWxAZ251Lm9yZworCis7OyBUaGlzIGZpbGUgaXMgcGFydCBv ZiBHTlUgRW1hY3MuCisKKzs7IEdOVSBFbWFjcyBpcyBmcmVlIHNvZnR3YXJlOiB5b3UgY2FuIHJl ZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5Cis7OyBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhl IEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQorOzsgdGhlIEZyZWUg U29mdHdhcmUgRm91bmRhdGlvbiwgZWl0aGVyIHZlcnNpb24gMyBvZiB0aGUgTGljZW5zZSwgb3IK Kzs7IChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisKKzs7IEdOVSBFbWFjcyBp cyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorOzsgYnV0 IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkg b2YKKzs7IE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9T RS4gIFNlZSB0aGUKKzs7IEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFp bHMuCisKKzs7IFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5l cmFsIFB1YmxpYyBMaWNlbnNlCis7OyBhbG9uZyB3aXRoIEdOVSBFbWFjcy4gIElmIG5vdCwgc2Vl IDxodHRwczovL3d3dy5nbnUub3JnL2xpY2Vuc2VzLz4uCisKKzs7OyBDb21tZW50YXJ5OgorCis7 OzsgQ29kZToKKworKHJlcXVpcmUgJ3ZjLWdpdCkKKworKGVydC1kZWZ0ZXN0IHZjLWdpdC10ZXN0 LXByb2dyYW0tdmVyc2lvbi1nZW5lcmFsICgpCisgICh2Yy1naXQtdGVzdC0tcnVuLXByb2dyYW0t dmVyc2lvbi10ZXN0CisgICAiZ2l0IHZlcnNpb24gMi4yOS4wIgorICAgIjIuMjkuMCIpKQorCiso ZXJ0LWRlZnRlc3QgdmMtZ2l0LXRlc3QtcHJvZ3JhbS12ZXJzaW9uLXdpbmRvd3MgKCkKKyAgKHZj LWdpdC10ZXN0LS1ydW4tcHJvZ3JhbS12ZXJzaW9uLXRlc3QKKyAgICJnaXQgdmVyc2lvbiAyLjI5 LjEud2luZG93cy4xIgorICAgIjIuMjkuMSIpKQorCisoZXJ0LWRlZnRlc3QgdmMtZ2l0LXRlc3Qt cHJvZ3JhbS12ZXJzaW9uLWFwcGxlICgpCisgICh2Yy1naXQtdGVzdC0tcnVuLXByb2dyYW0tdmVy c2lvbi10ZXN0CisgICAiZ2l0IHZlcnNpb24gMi4yOS4yIChBcHBsZSBHaXQtMTMwKSIKKyAgICIy LjI5LjIiKSkKKworKGVydC1kZWZ0ZXN0IHZjLWdpdC10ZXN0LXByb2dyYW0tdmVyc2lvbi1vdGhl ciAoKQorICAodmMtZ2l0LXRlc3QtLXJ1bi1wcm9ncmFtLXZlcnNpb24tdGVzdAorICAgImdpdCB2 ZXJzaW9uIDIuMjkuMy5mb28uYmFyIgorICAgIjAiKSkKKworKGRlZnVuIHZjLWdpdC10ZXN0LS1y dW4tcHJvZ3JhbS12ZXJzaW9uLXRlc3QKKyAgICAobW9jay12ZXJzaW9uLXN0cmluZyBleHBlY3Rl ZC1vdXRwdXQpCisgIChjbC1sZXRmKiAoKChzeW1ib2wtZnVuY3Rpb24gJ3ZjLWdpdC0tcnVuLWNv bW1hbmQtc3RyaW5nKQorICAgICAgICAgICAgICAobGFtYmRhIChfZmlsZSBfYXJncykgbW9jay12 ZXJzaW9uLXN0cmluZykpCisgICAgICAgICAgICAgKHZjLWdpdC0tcHJvZ3JhbS12ZXJzaW9uIG5p bCkKKyAgICAgICAgICAgICAoYWN0dWFsLW91dHB1dCAodmMtZ2l0LS1wcm9ncmFtLXZlcnNpb24p KSkKKyAgICAoc2hvdWxkIChlcXVhbCBhY3R1YWwtb3V0cHV0IGV4cGVjdGVkLW91dHB1dCkpKSkK KworOzs7IHZjLWdpdC10ZXN0cy5lbCBlbmRzIGhlcmUK --000000000000ff7cee05d1e395cc--