From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Nathan Moreau Newsgroups: gmane.emacs.bugs Subject: bug#40967: 27.0.50; vc-diff in indirect buffers Date: Wed, 1 Jul 2020 02:19:56 +0200 Message-ID: References: <4a643eda-2b72-857e-4d25-3b9bcbd1e086@yandex.ru> <5f6e0c6c-d699-d9ff-34f6-a8967fc84dfb@orcon.net.nz> <77dd86b8-c5f8-5a91-a424-74feed90b037@yandex.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0000000000002bd34f05a9564177" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4095"; mail-complaints-to="usenet@ciao.gmane.io" To: Dmitry Gutov , 40967@debbugs.gnu.org, Phil Sainty Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Jul 01 02:21:37 2020 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 1jqQVM-0000y6-DQ for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 01 Jul 2020 02:21:36 +0200 Original-Received: from localhost ([::1]:35216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqQVL-0007RJ-6j for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 30 Jun 2020 20:21:35 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqQUp-0007Qe-7O for bug-gnu-emacs@gnu.org; Tue, 30 Jun 2020 20:21:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:40457) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqQUo-0004MB-In for bug-gnu-emacs@gnu.org; Tue, 30 Jun 2020 20:21:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jqQUo-0002xS-Cn for bug-gnu-emacs@gnu.org; Tue, 30 Jun 2020 20:21:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Nathan Moreau Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 01 Jul 2020 00:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40967 X-GNU-PR-Package: emacs Original-Received: via spool by 40967-submit@debbugs.gnu.org id=B40967.159356281811287 (code B ref 40967); Wed, 01 Jul 2020 00:21:02 +0000 Original-Received: (at 40967) by debbugs.gnu.org; 1 Jul 2020 00:20:18 +0000 Original-Received: from localhost ([127.0.0.1]:52003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqQU6-0002vy-IG for submit@debbugs.gnu.org; Tue, 30 Jun 2020 20:20:18 -0400 Original-Received: from mail-vs1-f46.google.com ([209.85.217.46]:39835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqQU2-0002vi-Qc for 40967@debbugs.gnu.org; Tue, 30 Jun 2020 20:20:17 -0400 Original-Received: by mail-vs1-f46.google.com with SMTP id a17so1432897vsq.6 for <40967@debbugs.gnu.org>; Tue, 30 Jun 2020 17:20:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=PlZ4E0kk5RYYxJSCwNuq1nksrOqptGaUGxcRSJzpnps=; b=K1VAakrfy4+CK6UjpRuh56A4gTkzikAYqzdJ4HOvtUvVCSSWpXMyr9wgV5TK76UG45 +eT/RkyByraEpXJU1zHvXh6K+6iWmxodO929HdeXIavQtdLJqqTPV71FoataSBorQVAO RCSR0JT/oJ6ub091sri5yLxBoHvr2uMgfe+w5aoQwHh4Oc/FuBmaG3UweniGVk4TdBuO JSSIt2fRZrXNklwIhawRARhxAXY2uul6gu7/xero/IxOlXoSECsN4vIP46pStQBgbkyw 7zlTmY8XT0rU+JrReX/eQfPzxuhe59k8ARRm0oJkS04sTpmzSlxl2FlZxfh1vk2aQQeU i9Xg== X-Gm-Message-State: AOAM533WROvbpfJs/51ahQhLI+uJqdOuaDmmtVFoJJywXRPNTQ6Js5LB ZFBrxakFxASRqpR4xQ1YIVx96zzcx+dOTUVKdKY= X-Google-Smtp-Source: ABdhPJwPNMqxU8TN4p8EZd4wubeGU4BYjk54t44kq2k9V6KiPaWfneP/POj7WguOf1obHMgaEreTjbsaKgeRWqIJ5Yc= X-Received: by 2002:a67:2c89:: with SMTP id s131mr15672610vss.26.1593562809218; Tue, 30 Jun 2020 17:20:09 -0700 (PDT) In-Reply-To: <77dd86b8-c5f8-5a91-a424-74feed90b037@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" Xref: news.gmane.io gmane.emacs.bugs:182592 Archived-At: --0000000000002bd34f05a9564177 Content-Type: text/plain; charset="UTF-8" Here is a new version of the patch, with support for most of the commands defined in vc.el. The support is not exhaustive as I was not able to make all commands work I did not succeed in testing all the commands: vc-delete-file and vc-rename-file are probably candidates next. Feedback is very welcome, I am not used to the contribution process on Emacs. Nathan On Wed, 17 Jun 2020 at 00:37, Dmitry Gutov wrote: > > On 16.06.2020 15:08, Phil Sainty wrote: > > Personally I'd be ok with seeing piecemeal changes to commands > > like these to enable certain common workflows to DTRT with > > indirect buffers. > > All right then. > > > I think there will likely be a subset of > > commands which are of higher value than others, and so there > > might not be such a vast number of things which are very useful > > to change in practice. > > IDK, seems like it wouldn't simplify the proposed patch. It's short > already anywa. --0000000000002bd34f05a9564177 Content-Type: application/octet-stream; name="vc-diff-indirect-buffers.diff" Content-Disposition: attachment; filename="vc-diff-indirect-buffers.diff" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kc2m4xte0 Y29tbWl0IDQ2ODQxZDgyOGM2ZjFiYzk1MDQwMTkyNjZlNzhkN2M1NjU4NzE3MDAKQXV0aG9yOiBO YXRoYW4gTW9yZWF1IDxuYXRoYW4ubW9yZWF1QG00eC5vcmc+CkRhdGU6ICAgV2VkIEp1bCAxIDAy OjAyOjI1IDIwMjAgKzAyMDAKCiAgICBJbXByb3ZlIHN1cHBvcnQgZm9yIGluZGlyZWN0IGJ1ZmZl cnMuCiAgICAKICAgICogbGlzcC92Yy92Yy5lbCAodmMtZGVkdWNlLWZpbGVzZXQtMSk6IG5ldyBk ZWZ1bi4KICAgICh2Yy1kZWR1Y2UtZmlsZXNldCk6IGFkYXB0LgogICAgKHZjLW1heWJlLWJ1ZmZl ci1zeW5jKTogbmV3IGRlZnVuLgogICAgKHZjLWRpZmYpOiBhZGFwdC4KICAgICh2Yy1lZGlmZik6 IGFkYXB0LgogICAgKHZjLXJvb3QtZGlmZik6IGFkYXB0LgogICAgKHZjLXJldmlzaW9uLW90aGVy LXdpbmRvdyk6IGFkYXB0LgoKZGlmZiAtLWdpdCBsaXNwL3ZjL3ZjLmVsIGxpc3AvdmMvdmMuZWwK aW5kZXggYzY0MGJhMDQyMC4uMjkxZTEwYmM4YSAxMDA2NDQKLS0tIGxpc3AvdmMvdmMuZWwKKysr IGxpc3AvdmMvdmMuZWwKQEAgLTEwMjcsNyArMTAyNyw5IEBAIHZjLWRlZHVjZS1maWxlc2V0CiBs aXN0IG9mIG1hcmtlZCBmaWxlcywgb3IgdGhlIGN1cnJlbnQgZGlyZWN0b3J5IGlmIG5vIGZpbGVz IGFyZQogbWFya2VkLgogT3RoZXJ3aXNlLCBpZiB0aGUgY3VycmVudCBidWZmZXIgaXMgdmlzaXRp bmcgYSB2ZXJzaW9uLWNvbnRyb2xsZWQKLWZpbGUsIEZJTEVTRVQgaXMgYSBzaW5nbGUtZmlsZSBs aXN0IGNvbnRhaW5pbmcgdGhhdCBmaWxlJ3MgbmFtZS4KK2ZpbGUgb3IgaXMgYW4gaW5kaXJlY3Qg YnVmZmVyIHdob3NlIGJhc2UgYnVmZmVyIHZpc2l0cyBhCit2ZXJzaW9uLWNvbnRyb2xsZWQgZmls ZSwgRklMRVNFVCBpcyBhIHNpbmdsZS1maWxlIGxpc3QgY29udGFpbmluZwordGhhdCBmaWxlJ3Mg bmFtZS4KIE90aGVyd2lzZSwgaWYgQUxMT1ctVU5SRUdJU1RFUkVEIGlzIG5vbi1uaWwgYW5kIHRo ZSB2aXNpdGVkIGZpbGUKIGlzIHVucmVnaXN0ZXJlZCwgRklMRVNFVCBpcyBhIHNpbmdsZS1maWxl IGxpc3QgY29udGFpbmluZyB0aGUKIG5hbWUgb2YgdGhlIHZpc2l0ZWQgZmlsZS4KQEAgLTEwNDEs NiArMTA0MywxNCBAQCB2Yy1kZWR1Y2UtZmlsZXNldAogdGhlIHJldHVybmVkIGxpc3QuCiAKIEJF V0FSRTogdGhpcyBmdW5jdGlvbiBtYXkgY2hhbmdlIHRoZSBjdXJyZW50IGJ1ZmZlci4iCisgICh3 aXRoLWN1cnJlbnQtYnVmZmVyIChvciAoYnVmZmVyLWJhc2UtYnVmZmVyKSAoY3VycmVudC1idWZm ZXIpKQorICAgICh2Yy1kZWR1Y2UtZmlsZXNldC0xIG5vdC1zdGF0ZS1jaGFuZ2luZworICAgICAg ICAgICAgICAgICAgICAgICAgIGFsbG93LXVucmVnaXN0ZXJlZAorICAgICAgICAgICAgICAgICAg ICAgICAgIHN0YXRlLW1vZGVsLW9ubHktZmlsZXMpKSkKKworKGRlZnVuIHZjLWRlZHVjZS1maWxl c2V0LTEgKG5vdC1zdGF0ZS1jaGFuZ2luZworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFs bG93LXVucmVnaXN0ZXJlZAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRlLW1vZGVs LW9ubHktZmlsZXMpCiAgIChsZXQgKGJhY2tlbmQpCiAgICAgKGNvbmQKICAgICAgKChkZXJpdmVk LW1vZGUtcCAndmMtZGlyLW1vZGUpCkBAIC0xMDYyLDcgKzEwNzIsNyBAQCB2Yy1kZWR1Y2UtZmls ZXNldAogCQkJCSAgICAgIChkZXJpdmVkLW1vZGUtcCAnZGlyZWQtbW9kZSkpKSkpCiAgICAgICAo cHJvZ24gICAgICAgICAgICAgICAgICA7RklYTUU6IFdoeSBub3QgYHdpdGgtY3VycmVudC1idWZm ZXInPyAtLVN0ZWYuCiAJKHNldC1idWZmZXIgdmMtcGFyZW50LWJ1ZmZlcikKLQkodmMtZGVkdWNl LWZpbGVzZXQgbm90LXN0YXRlLWNoYW5naW5nIGFsbG93LXVucmVnaXN0ZXJlZCBzdGF0ZS1tb2Rl bC1vbmx5LWZpbGVzKSkpCisJKHZjLWRlZHVjZS1maWxlc2V0LTEgbm90LXN0YXRlLWNoYW5naW5n IGFsbG93LXVucmVnaXN0ZXJlZCBzdGF0ZS1tb2RlbC1vbmx5LWZpbGVzKSkpCiAgICAgICgoYW5k IChkZXJpdmVkLW1vZGUtcCAnbG9nLXZpZXctbW9kZSkKIAkgICAoc2V0cSBiYWNrZW5kICh2Yy1y ZXNwb25zaWJsZS1iYWNrZW5kIGRlZmF1bHQtZGlyZWN0b3J5KSkpCiAgICAgICAobGlzdCBiYWNr ZW5kIG5pbCkpCkBAIC0xODc4LDYgKzE4ODgsMTAgQEAgdmMtcm9vdC12ZXJzaW9uLWRpZmYKICAg ICAgICB0IChsaXN0IGJhY2tlbmQgKGxpc3Qgcm9vdGRpcikpIHJldjEgcmV2MgogICAgICAgIChj YWxsZWQtaW50ZXJhY3RpdmVseS1wICdpbnRlcmFjdGl2ZSkpKSkpCiAKKyhkZWZ1biB2Yy1tYXli ZS1idWZmZXItc3luYyAobm90LXVyZ2VudCkKKyAgKHdpdGgtY3VycmVudC1idWZmZXIgKG9yIChi dWZmZXItYmFzZS1idWZmZXIpIChjdXJyZW50LWJ1ZmZlcikpCisgICAgKHdoZW4gYnVmZmVyLWZp bGUtbmFtZSAodmMtYnVmZmVyLXN5bmMgbm90LXVyZ2VudCkpKSkKKwogOzs7IyMjYXV0b2xvYWQK IChkZWZ1biB2Yy1kaWZmICgmb3B0aW9uYWwgaGlzdG9yaWMgbm90LXVyZ2VudCkKICAgIkRpc3Bs YXkgZGlmZnMgYmV0d2VlbiBmaWxlIHJldmlzaW9ucy4KQEAgLTE4OTAsNyArMTkwNCw3IEBAIHZj LWRpZmYKICAgKGludGVyYWN0aXZlIChsaXN0IGN1cnJlbnQtcHJlZml4LWFyZyB0KSkKICAgKGlm IGhpc3RvcmljCiAgICAgICAoY2FsbC1pbnRlcmFjdGl2ZWx5ICd2Yy12ZXJzaW9uLWRpZmYpCi0g ICAgKHdoZW4gYnVmZmVyLWZpbGUtbmFtZSAodmMtYnVmZmVyLXN5bmMgbm90LXVyZ2VudCkpCisg ICAgKHZjLW1heWJlLWJ1ZmZlci1zeW5jIG5vdC11cmdlbnQpCiAgICAgKHZjLWRpZmYtaW50ZXJu YWwgdCAodmMtZGVkdWNlLWZpbGVzZXQgdCkgbmlsIG5pbAogCQkgICAgICAoY2FsbGVkLWludGVy YWN0aXZlbHktcCAnaW50ZXJhY3RpdmUpKSkpCiAKQEAgLTE5NjksNyArMTk4Myw3IEBAIHZjLWVk aWZmCiAgIChpbnRlcmFjdGl2ZSAobGlzdCBjdXJyZW50LXByZWZpeC1hcmcgdCkpCiAgIChpZiBo aXN0b3JpYwogICAgICAgKGNhbGwtaW50ZXJhY3RpdmVseSAndmMtdmVyc2lvbi1lZGlmZikKLSAg ICAod2hlbiBidWZmZXItZmlsZS1uYW1lICh2Yy1idWZmZXItc3luYyBub3QtdXJnZW50KSkKKyAg ICAodmMtbWF5YmUtYnVmZmVyLXN5bmMgbm90LXVyZ2VudCkKICAgICAodmMtdmVyc2lvbi1lZGlm ZiAoY2FkciAodmMtZGVkdWNlLWZpbGVzZXQgdCkpIG5pbCBuaWwpKSkKIAogOzs7IyMjYXV0b2xv YWQKQEAgLTE5ODYsNyArMjAwMCw3IEBAIHZjLXJvb3QtZGlmZgogICAoaWYgaGlzdG9yaWMKICAg ICAgIDs7IFdlIHdhbnQgdGhlIGRpZmYgZm9yIHRoZSBWQyByb290IGRpci4KICAgICAgIChjYWxs LWludGVyYWN0aXZlbHkgJ3ZjLXJvb3QtdmVyc2lvbi1kaWZmKQotICAgICh3aGVuIGJ1ZmZlci1m aWxlLW5hbWUgKHZjLWJ1ZmZlci1zeW5jIG5vdC11cmdlbnQpKQorICAgICh2Yy1tYXliZS1idWZm ZXItc3luYyBub3QtdXJnZW50KQogICAgIChsZXQgKChiYWNrZW5kICh2Yy1kZWR1Y2UtYmFja2Vu ZCkpCiAJICAoZGVmYXVsdC1kaXJlY3RvcnkgZGVmYXVsdC1kaXJlY3RvcnkpCiAJICByb290ZGly IHdvcmtpbmctcmV2aXNpb24pCkBAIC0yMDI2LDE3ICsyMDQwLDE4IEBAIHZjLXJldmlzaW9uLW90 aGVyLXdpbmRvdwogSWYgdGhlIGN1cnJlbnQgZmlsZSBpcyBuYW1lZCBgRicsIHRoZSByZXZpc2lv biBpcyBuYW1lZCBgRi5+UkVWficuCiBJZiBgRi5+UkVWficgYWxyZWFkeSBleGlzdHMsIHVzZSBp dCBpbnN0ZWFkIG9mIGNoZWNraW5nIGl0IG91dCBhZ2Fpbi4iCiAgIChpbnRlcmFjdGl2ZQotICAg KHNhdmUtY3VycmVudC1idWZmZXIKKyAgICh3aXRoLWN1cnJlbnQtYnVmZmVyIChvciAoYnVmZmVy LWJhc2UtYnVmZmVyKSAoY3VycmVudC1idWZmZXIpKQogICAgICAodmMtZW5zdXJlLXZjLWJ1ZmZl cikKICAgICAgKGxpc3QKICAgICAgICh2Yy1yZWFkLXJldmlzaW9uICJSZXZpc2lvbiB0byB2aXNp dCAoZGVmYXVsdCBpcyB3b3JraW5nIHJldmlzaW9uKTogIgogICAgICAgICAgICAgICAgICAgICAg ICAgKGxpc3QgYnVmZmVyLWZpbGUtbmFtZSkpKSkpCi0gICh2Yy1lbnN1cmUtdmMtYnVmZmVyKQot ICAobGV0KiAoKGZpbGUgYnVmZmVyLWZpbGUtbmFtZSkKLQkgKHJldmlzaW9uIChpZiAoc3RyaW5n LWVxdWFsIHJldiAiIikKLQkJICAgICAgKHZjLXdvcmtpbmctcmV2aXNpb24gZmlsZSkKLQkJICAg IHJldikpKQotICAgIChzd2l0Y2gtdG8tYnVmZmVyLW90aGVyLXdpbmRvdyAodmMtZmluZC1yZXZp c2lvbiBmaWxlIHJldmlzaW9uKSkpKQorICAod2l0aC1jdXJyZW50LWJ1ZmZlciAob3IgKGJ1ZmZl ci1iYXNlLWJ1ZmZlcikgKGN1cnJlbnQtYnVmZmVyKSkKKyAgICAodmMtZW5zdXJlLXZjLWJ1ZmZl cikKKyAgICAobGV0KiAoKGZpbGUgYnVmZmVyLWZpbGUtbmFtZSkKKwkgICAocmV2aXNpb24gKGlm IChzdHJpbmctZXF1YWwgcmV2ICIiKQorCQkgICAgICAgICAodmMtd29ya2luZy1yZXZpc2lvbiBm aWxlKQorCQkgICAgICAgcmV2KSkpCisgICAgICAoc3dpdGNoLXRvLWJ1ZmZlci1vdGhlci13aW5k b3cgKHZjLWZpbmQtcmV2aXNpb24gZmlsZSByZXZpc2lvbikpKSkpCiAKIChkZWZ1biB2Yy1maW5k LXJldmlzaW9uIChmaWxlIHJldmlzaW9uICZvcHRpb25hbCBiYWNrZW5kKQogICAiUmVhZCBSRVZJ U0lPTiBvZiBGSUxFIGludG8gYSBidWZmZXIgYW5kIHJldHVybiB0aGUgYnVmZmVyLgo= --0000000000002bd34f05a9564177--