From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Dzhus Newsgroups: gmane.emacs.bugs Subject: bug#8756: vc-git.el doesn't use --follow argument in vc-git-print-log Date: Thu, 31 Jul 2014 00:35:32 +0400 Message-ID: <3258071406752532@web22g.yandex.ru> References: <87sjrxl0r1.fsf@dod.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----==--bound.325808.web22g.yandex.ru" X-Trace: ger.gmane.org 1406761896 4933 80.91.229.3 (30 Jul 2014 23:11:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 30 Jul 2014 23:11:36 +0000 (UTC) To: 8756@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jul 31 01:11:28 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XCd1r-0003XL-GM for geb-bug-gnu-emacs@m.gmane.org; Thu, 31 Jul 2014 01:11:27 +0200 Original-Received: from localhost ([::1]:53527 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCd1r-0005IL-0q for geb-bug-gnu-emacs@m.gmane.org; Wed, 30 Jul 2014 19:11:27 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCd1d-00053h-0a for bug-gnu-emacs@gnu.org; Wed, 30 Jul 2014 19:11:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCd1S-0007Ec-LT for bug-gnu-emacs@gnu.org; Wed, 30 Jul 2014 19:11:12 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:45251) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCd1S-0007EY-Cb for bug-gnu-emacs@gnu.org; Wed, 30 Jul 2014 19:11:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XCd1R-0007Y5-QU for bug-gnu-emacs@gnu.org; Wed, 30 Jul 2014 19:11:01 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <87sjrxl0r1.fsf@dod.no> Resent-From: Dmitry Dzhus Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 30 Jul 2014 23:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 8756 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.140676181928951 (code B ref -1); Wed, 30 Jul 2014 23:11:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 30 Jul 2014 23:10:19 +0000 Original-Received: from localhost ([127.0.0.1]:52194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XCd0i-0007Wo-8O for submit@debbugs.gnu.org; Wed, 30 Jul 2014 19:10:17 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:40960) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XCabx-0003lq-8N for submit@debbugs.gnu.org; Wed, 30 Jul 2014 16:36:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCabh-0004vL-OZ for submit@debbugs.gnu.org; Wed, 30 Jul 2014 16:36:27 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:33957) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCabh-0004vH-LC for submit@debbugs.gnu.org; Wed, 30 Jul 2014 16:36:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCabZ-0003o8-6G for bug-gnu-emacs@gnu.org; Wed, 30 Jul 2014 16:36:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCabM-0004rY-LY for bug-gnu-emacs@gnu.org; Wed, 30 Jul 2014 16:36:09 -0400 Original-Received: from forward20.mail.yandex.net ([95.108.253.145]:41443) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCabM-0004qX-8d for bug-gnu-emacs@gnu.org; Wed, 30 Jul 2014 16:35:56 -0400 Original-Received: from web22g.yandex.ru (web22g.yandex.ru [95.108.253.231]) by forward20.mail.yandex.net (Yandex) with ESMTP id E4ADB1040274 for ; Thu, 31 Jul 2014 00:35:32 +0400 (MSK) Original-Received: from 127.0.0.1 (localhost [127.0.0.1]) by web22g.yandex.ru (Yandex) with ESMTP id 922988A100B; Thu, 31 Jul 2014 00:35:32 +0400 (MSK) Original-Received: from 95-31-27-234.broadband.corbina.ru (95-31-27-234.broadband.corbina.ru [95.31.27.234]) by web22g.yandex.ru with HTTP; Thu, 31 Jul 2014 00:35:32 +0400 X-Mailer: Yamail [ http://yandex.ru ] 5.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Mailman-Approved-At: Wed, 30 Jul 2014 19:10:14 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 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.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:91989 Archived-At: ------==--bound.325808.web22g.yandex.ru Content-Transfer-Encoding: 7bit Content-Type: text/plain How are you gentlemen, Following renames is nice no matter what Git upstream thinks, so I gave this bug a try. I'd like to share some progress. Diffing (`d`), paging (`f`) and annotating a file (`a`) revision works. I've tested it with Git version 1.8.5.4 and 2.0.2. Parallel git log with hash/file information is run when a log is queried. (vc-git-file-shalist) provides access to a list of SHA1's/historical file names for the file open in the *vc-change-log* buffer. The bad part is that whole-changeset (`D`) diffing is broken (wrong revisions are selected for diff). The culprit is `vc-git-previous-revision`. Using HASH^ to obtain the parent of HASH revision produces unexpected results when file renames are involved. However, for whole-changeset diffing HASH^ seems to be exactly what we need. However, `vc-git-previous-revision` doesn't seem to enable any inspection of the context in which we use it (in other words, if we hit `d` or `D` in the log buffer.) Any ideas? I also have not tackled revision navigation in the annotation mode, but this can likely be solved by plugging calls to `(vc-git-rev-to-filename)` somewhere in the annotation mode. ------==--bound.325808.web22g.yandex.ru Content-Disposition: attachment; filename="vc-git-follow-renames.patch" Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name="vc-git-follow-renames.patch" PT09IG1vZGlmaWVkIGZpbGUgJ2xpc3AvdmMvdmMtZ2l0LmVsJwotLS0gbGlzcC92Yy92Yy1naXQu ZWwJMjAxNC0wNi0yOSAyMDo0ODo1NSArMDAwMAorKysgbGlzcC92Yy92Yy1naXQuZWwJMjAxNC0w Ny0zMCAyMDozMjowMSArMDAwMApAQCAtNjkxLDEzICs2OTEsNyBAQAogCSAoY29kaW5nLXN5c3Rl bS1mb3ItcmVhZCAnYmluYXJ5KQogCSAoY29kaW5nLXN5c3RlbS1mb3Itd3JpdGUgJ2JpbmFyeSkK IAkgKGZ1bGxuYW1lCi0JICAobGV0ICgoZm4gKHZjLWdpdC0tcnVuLWNvbW1hbmQtc3RyaW5nCi0J CSAgICAgZmlsZSAibHMtZmlsZXMiICIteiIgIi0tZnVsbC1uYW1lIiAiLS0iKSkpCi0JICAgIDs7 IGxzLWZpbGVzIGRvZXMgbm90IHJldHVybiBhbnl0aGluZyB3aGVuIGxvb2tpbmcgZm9yIGEKLQkg ICAgOzsgcmV2aXNpb24gb2YgYSBmaWxlIHRoYXQgaGFzIGJlZW4gcmVuYW1lZCBvciByZW1vdmVk LgotCSAgICAoaWYgKHN0cmluZz0gZm4gIiIpCi0JCShmaWxlLXJlbGF0aXZlLW5hbWUgZmlsZSAo dmMtZ2l0LXJvb3QgZGVmYXVsdC1kaXJlY3RvcnkpKQotCSAgICAgIChzdWJzdHJpbmcgZm4gMCAt MSkpKSkpCisgICAgICAgICAgKHZjLWdpdC1yZXYtdG8tZmlsZW5hbWUgcmV2KSkpCiAgICAgKHZj LWdpdC1jb21tYW5kCiAgICAgIGJ1ZmZlciAwCiAgICAgIG5pbApAQCAtNzg2LDIwICs3ODAsNTMg QEAKICAgICA7OyBJZiB0aGUgYnVmZmVyIGV4aXN0cyBmcm9tIGEgcHJldmlvdXMgaW52b2NhdGlv biBpdCBtaWdodCBiZQogICAgIDs7IHJlYWQtb25seS4KICAgICAobGV0ICgoaW5oaWJpdC1yZWFk LW9ubHkgdCkpCisgICAgICA7OyBDbGVhbiBTSEExIGxpc3QgY2FjaGVzIHdoZW5ldmVyIHdlIHF1 ZXJ5IGEgbmV3IGNoYW5nZSBsb2cKICAgICAgICh3aXRoLWN1cnJlbnQtYnVmZmVyCiAgICAgICAg ICAgYnVmZmVyCi0JKGFwcGx5ICd2Yy1naXQtY29tbWFuZCBidWZmZXIKLQkgICAgICAgJ2FzeW5j IGZpbGVzCi0JICAgICAgIChhcHBlbmQKLQkJJygibG9nIiAiLS1uby1jb2xvciIpCi0JCSh3aGVu IHNob3J0bG9nCi0JCSAgYCgiLS1ncmFwaCIgIi0tZGVjb3JhdGUiICItLWRhdGU9c2hvcnQiCisg ICAgICAgIChpZiAoYm91bmRwICd2Yy1naXQtZmlsZS1zaGFsaXN0LXJhdykKKyAgICAgICAgICAg IChzZXRxIHZjLWdpdC1maWxlLXNoYWxpc3QtcmF3IG5pbCkKKyAgICAgICAgICAoc2V0IChtYWtl LWxvY2FsLXZhcmlhYmxlICd2Yy1naXQtZmlsZS1zaGFsaXN0LXJhdykgbmlsKSkKKyAgICAgICAg KGlmIChib3VuZHAgJ3ZjLWdpdC1maWxlLXNoYWxpc3QpCisgICAgICAgICAgICAoc2V0cSB2Yy1n aXQtZmlsZS1zaGFsaXN0IG5pbCkpCisgICAgICAgICh3aGVuICh2Yy1naXQtc2luZ2xlLWZpbGUg ZmlsZXMpCisgICAgICAgICAgOzsgU3RvcmUgbmV3bGluZS1zZXBhcmF0ZWQgbGlzdCBvZiByZXZp c2lvbiBoYXNoZXMgYW5kIGZpbGUKKyAgICAgICAgICA7OyBuYW1lcyBpbiB2Yy1naXQtZmlsZS1z aGFsaXN0LXJhdyBidWZmZXItbG9jYWwgdmFyaWFibGUKKyAgICAgICAgICAod2l0aC10ZW1wLWJ1 ZmZlcgorICAgICAgICAgICAgKHNldC1wcm9jZXNzLWZpbHRlcgorICAgICAgICAgICAgIChhcHBs eSAndmMtZ2l0LWNvbW1hbmQgbmlsCisgICAgICAgICAgICAgICAgICAgICdhc3luYyBmaWxlcwor ICAgICAgICAgICAgICAgICAgICAoYXBwZW5kCisgICAgICAgICAgICAgICAgICAgICAnKCJsb2ci CisgICAgICAgICAgICAgICAgICAgICAgICItLWZvbGxvdyIKKyAgICAgICAgICAgICAgICAgICAg ICAgIi0tbmFtZS1vbmx5IgorICAgICAgICAgICAgICAgICAgICAgICAiLS1wcmV0dHk9dGZvcm1h dDolSCIKKyAgICAgICAgICAgICAgICAgICAgICAgIi0tbm8tY29sb3IiKQorICAgICAgICAgICAg ICAgICAgICAgOzsgVGFpbCByZXZpc2lvbiBtdXN0IG5vdyBpdHMgcGFyZW50CisgICAgICAgICAg ICAgICAgICAgICAod2hlbiBsaW1pdCAobGlzdCAiLW4iIChmb3JtYXQgIiVzIiAoMSsgbGltaXQp KSkpCisgICAgICAgICAgICAgICAgICAgICAod2hlbiBzdGFydC1yZXZpc2lvbiAobHNpdCBzdGFy dC1yZXZpc2lvbikpCisgICAgICAgICAgICAgICAgICAgICAnKCItLSIpKSkKKyAgICAgICAgICAg ICAobGFtYmRhIChwIHMpCisgICAgICAgICAgICAgICAod2l0aC1jdXJyZW50LWJ1ZmZlciBidWZm ZXIKKyAgICAgICAgICAgICAgICAgKHNldHEKKyAgICAgICAgICAgICAgICAgIHZjLWdpdC1maWxl LXNoYWxpc3QtcmF3CisgICAgICAgICAgICAgICAgICAocmVwbGFjZS1yZWdleHAtaW4tc3RyaW5n CisgICAgICAgICAgICAgICAgICAgIlxuXG4iICJcbiIKKyAgICAgICAgICAgICAgICAgICAoY29u Y2F0IChpZiAoYm91bmRwICd2Yy1naXQtZmlsZS1zaGFsaXN0LXJhdykKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB2Yy1naXQtZmlsZS1zaGFsaXN0LXJhdyAiIikgcykpKSkpKSkpCisg ICAgICAgIChhcHBseSAndmMtZ2l0LWNvbW1hbmQgYnVmZmVyCisgICAgICAgICAgICAgICAnYXN5 bmMgZmlsZXMKKyAgICAgICAgICAgICAgIChhcHBlbmQKKyAgICAgICAgICAgICAgICAoaWYgKHZj LWdpdC1zaW5nbGUtZmlsZSBmaWxlcykKKyAgICAgICAgICAgICAgICAgICAgJygibG9nIiAiLS1m b2xsb3ciICItLW5vLWNvbG9yIikKKyAgICAgICAgICAgICAgICAgICcoImxvZyIgIi0tbm8tY29s b3IiKSkKKyAgICAgICAgICAgICAgICAod2hlbiBzaG9ydGxvZworICAgICAgICAgICAgICAgICAg YCgiLS1ncmFwaCIgIi0tZGVjb3JhdGUiICItLWRhdGU9c2hvcnQiCiAgICAgICAgICAgICAgICAg ICAgICwoZm9ybWF0ICItLXByZXR0eT10Zm9ybWF0OiVzIgotCQkJICAgICAoY2FyIHZjLWdpdC1y b290LWxvZy1mb3JtYXQpKQotCQkgICAgIi0tYWJicmV2LWNvbW1pdCIpKQotCQkod2hlbiBsaW1p dCAobGlzdCAiLW4iIChmb3JtYXQgIiVzIiBsaW1pdCkpKQotCQkod2hlbiBzdGFydC1yZXZpc2lv biAobGlzdCBzdGFydC1yZXZpc2lvbikpCi0JCScoIi0tIikpKSkpKSkKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKGNhciB2Yy1naXQtcm9vdC1sb2ctZm9ybWF0KSkKKyAgICAgICAgICAg ICAgICAgICAgIi0tYWJicmV2LWNvbW1pdCIpKQorICAgICAgICAgICAgICAgICh3aGVuIGxpbWl0 IChsaXN0ICItbiIgKGZvcm1hdCAiJXMiIGxpbWl0KSkpCisgICAgICAgICAgICAgICAgKHdoZW4g c3RhcnQtcmV2aXNpb24gKGxpc3Qgc3RhcnQtcmV2aXNpb24pKQorICAgICAgICAgICAgICAgICco Ii0tIikpKSkpKSkKIAogKGRlZnVuIHZjLWdpdC1sb2ctb3V0Z29pbmcgKGJ1ZmZlciByZW1vdGUt bG9jYXRpb24pCiAgIChpbnRlcmFjdGl2ZSkKQEAgLTkwNCwxMSArOTMxLDIxIEBACiAoZGVmdW4g dmMtZ2l0LWRpZmYgKGZpbGVzICZvcHRpb25hbCByZXYxIHJldjIgYnVmZmVyKQogICAiR2V0IGEg ZGlmZmVyZW5jZSByZXBvcnQgdXNpbmcgR2l0IGJldHdlZW4gdHdvIHJldmlzaW9ucyBvZiBGSUxF Uy4iCiAgIChsZXQgKHByb2Nlc3MtZmlsZS1zaWRlLWVmZmVjdHMpCi0gICAgKGFwcGx5ICMndmMt Z2l0LWNvbW1hbmQgKG9yIGJ1ZmZlciAiKnZjLWRpZmYqIikgMSBmaWxlcwotCSAgIChpZiAoYW5k IHJldjEgcmV2MikgImRpZmYtdHJlZSIgImRpZmYtaW5kZXgiKQotCSAgICItLWV4aXQtY29kZSIK LQkgICAoYXBwZW5kICh2Yy1zd2l0Y2hlcyAnZ2l0ICdkaWZmKQotCQkgICAobGlzdCAiLXAiIChv ciByZXYxICJIRUFEIikgcmV2MiAiLS0iKSkpKSkKKyAgICAod2l0aC1jdXJyZW50LWJ1ZmZlciAo b3IgYnVmZmVyICIqdmMtZGlmZioiKQorICAgICAgOzsgUnVuIGRpZmYgZnJvbSB0aGUgcmVwb3Np dG9yeSByb290IGJlY2F1c2Ugb3VyIGZpbGUgbmFtZXMgYXJlCisgICAgICA7OyByZWxhdGl2ZSB0 byBpdAorICAgICAgKHNldHEgZGVmYXVsdC1kaXJlY3RvcnkgKHZjLWdpdC1yb290IGRlZmF1bHQt ZGlyZWN0b3J5KSkKKyAgICAgIChhcHBseSAjJ3ZjLWdpdC1jb21tYW5kIChvciBidWZmZXIgIip2 Yy1kaWZmKiIpIDEKKyAgICAgICAgICAgICAoaWYgKHZjLWdpdC1zaW5nbGUtZmlsZSBmaWxlcykK KyAgICAgICAgICAgICAgICAgKGxpc3QKKyAgICAgICAgICAgICAgICAgICh2Yy1naXQtcmV2LXRv LWZpbGVuYW1lIHJldjEpCisgICAgICAgICAgICAgICAgICAodmMtZ2l0LXJldi10by1maWxlbmFt ZSByZXYyKSkKKyAgICAgICAgICAgICAgIGZpbGVzKQorICAgICAgICAgICAgIChpZiAoYW5kIHJl djEgcmV2MikgImRpZmYtdHJlZSIgImRpZmYtaW5kZXgiKQorICAgICAgICAgICAgICItLWV4aXQt Y29kZSIKKyAgICAgICAgICAgICAiLU0iCisgICAgICAgICAgICAgKGFwcGVuZCAodmMtc3dpdGNo ZXMgJ2dpdCAnZGlmZikKKyAgICAgICAgICAgICAgICAgICAgIChsaXN0ICItcCIgKG9yIHJldjEg IkhFQUQiKSByZXYyICItLSIpKSkpKSkKIAogKGRlZnVuIHZjLWdpdC1yZXZpc2lvbi10YWJsZSAo X2ZpbGVzKQogICA7OyBXaGF0IGFib3V0IGBmaWxlcyc/IT8gIC0tU3RlZgpAQCAtOTI4LDcgKzk2 NSw4IEBACiAgICAgdGFibGUpKQogCiAoZGVmdW4gdmMtZ2l0LWFubm90YXRlLWNvbW1hbmQgKGZp bGUgYnVmICZvcHRpb25hbCByZXYpCi0gIChsZXQgKChuYW1lIChmaWxlLXJlbGF0aXZlLW5hbWUg ZmlsZSkpKQorICAoc2V0cSBkZWZhdWx0LWRpcmVjdG9yeSAodmMtZ2l0LXJvb3QgZGVmYXVsdC1k aXJlY3RvcnkpKQorICAobGV0ICgobmFtZSAodmMtZ2l0LXJldi10by1maWxlbmFtZSByZXYpKSkK ICAgICAodmMtZ2l0LWNvbW1hbmQgYnVmICdhc3luYyBuaWwgImJsYW1lIiAiLS1kYXRlPWlzbyIg Ii1DIiAiLUMiIHJldiAiLS0iIG5hbWUpKSkKIAogKGRlY2xhcmUtZnVuY3Rpb24gdmMtYW5ub3Rh dGUtY29udmVydC10aW1lICJ2Yy1hbm5vdGF0ZSIgKHRpbWUpKQpAQCAtOTg3LDcgKzEwMjUsMTEg QEAKICAgICAgICAgICAgICAgICAgICAgICAgICAgIChwb2ludCkKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICgxLSAocG9pbnQtbWF4KSkpKSkpKQogICAgICAgICAob3IgKHZjLWdpdC1zeW1i b2xpYy1jb21taXQgcHJldi1yZXYpIHByZXYtcmV2KSkKLSAgICAodmMtZ2l0LS1yZXYtcGFyc2Ug KGNvbmNhdCByZXYgIl4iKSkpKQorICAgIDs7IFVzZSBoaXN0b3JpY2FsIGRhdGEgZm9yIHRoZSBm aWxlIGlmIHBvc3NpYmxlLgorICAgIDs7IEZJWE1FOiBUaGlzIGJyZWFrcyB3aG9sZS1jaGFuZ2Vz ZXQgZGlmZmluZy4KKyAgICAoaWYgKHZjLWdpdC1maWxlLXNoYWxpc3QpCisgICAgICAgIChjYXIg KGNkZHIgKG1lbWJlciByZXYgKHZjLWdpdC1maWxlLXNoYWxpc3QpKSkpCisgICAgICAodmMtZ2l0 LS1yZXYtcGFyc2UgKGNvbmNhdCByZXYgIl4iKSkpKSkKIAogKGRlZnVuIHZjLWdpdC0tcmV2LXBh cnNlIChyZXYpCiAgICh3aXRoLXRlbXAtYnVmZmVyCkBAIC05OTUsNiArMTAzNywyNiBAQAogICAg ICAodmMtZ2l0LS1vdXQtb2sgInJldi1wYXJzZSIgcmV2KQogICAgICAoYnVmZmVyLXN1YnN0cmlu Zy1uby1wcm9wZXJ0aWVzIChwb2ludC1taW4pICgrIChwb2ludC1taW4pIDQwKSkpKSkKIAorKGRl ZnVuIHZjLWdpdC1zaW5nbGUtZmlsZSAoZmlsZXMpCisgICJSZXR1cm4gdCBpZiBGSUxFUyBjb250 YWlucyBhIHNpbmdsZSBub24tZGlyZWN0b3J5IGZpbGUuIgorICAoYW5kIChlcSAobGVuZ3RoIGZp bGVzKSAxKQorICAgICAgIChub3QgKGZpbGUtZGlyZWN0b3J5LXAgKGNhciBmaWxlcykpKSkpCisK KyhkZWZ1biB2Yy1naXQtZmlsZS1zaGFsaXN0ICgpCisgICJSZXR1cm4gYWx0ZXJuYXRpbmcgbGlz dCBvZiBTSEExIGhhc2hlcyBhbmQgZmlsZSBuYW1lcy4KK1RoZSBsaXN0IGNvbnRhaW5zIGNvbW1p dCBoYXNoZXMgYW5kIGhpc3RvcmljYWwgbmFtZXMgZm9yIGEgZmlsZQoraW4gdGhlIGN1cnJlbnQg Y2hhbmdlIGxvZyBidWZmZXIuIgorICAoY29uZAorICAgKChhbmQgKGJvdW5kcCAndmMtZ2l0LWZp bGUtc2hhbGlzdCkgdmMtZ2l0LWZpbGUtc2hhbGlzdCkKKyAgICB2Yy1naXQtZmlsZS1zaGFsaXN0 KQorICAgKChhbmQgKGJvdW5kcCAndmMtZ2l0LWZpbGUtc2hhbGlzdC1yYXcpIHZjLWdpdC1maWxl LXNoYWxpc3QtcmF3KQorICAgIChzZXQgKG1ha2UtbG9jYWwtdmFyaWFibGUgJ3ZjLWdpdC1maWxl LXNoYWxpc3QpCisgICAgICAgICAoc3BsaXQtc3RyaW5nIHZjLWdpdC1maWxlLXNoYWxpc3QtcmF3 ICJcbiIpKSkpKQorCisoZGVmdW4gdmMtZ2l0LXJldi10by1maWxlbmFtZSAocmV2KQorICAiUmV0 dXJuIGEgaGlzdG9yaWNhbCBmaWxlIG5hbWUgZm9yIHRoZSBmaWxlIGluIFJFVi4iCisgIChjYWRy IChtZW1iZXIgcmV2ICh2Yy1naXQtZmlsZS1zaGFsaXN0KSkpKQorCiAoZGVmdW4gdmMtZ2l0LW5l eHQtcmV2aXNpb24gKGZpbGUgcmV2KQogICAiR2l0LXNwZWNpZmljIHZlcnNpb24gb2YgYHZjLW5l eHQtcmV2aXNpb24nLiIKICAgKGxldCogKChkZWZhdWx0LWRpcmVjdG9yeSAoZmlsZS1uYW1lLWRp cmVjdG9yeQoK ------==--bound.325808.web22g.yandex.ru--