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.devel Subject: Re: [patch: first impression] Date: Tue, 11 Oct 2022 05:05:02 +0300 Message-ID: <43e67d5a-e3f4-3e7d-cd0e-819a08279d7e@yandex.ru> References: <87fsgyuyh7.fsf@mat.ucm.es> <87fsg9crz3.fsf@mat.ucm.es> <87ill4c18c.fsf@mat.ucm.es> <078c04cf-00ad-4104-5762-6b3b7832485c@yandex.ru> <87czbcaxve.fsf@mat.ucm.es> <87tu4naere.fsf@mat.ucm.es> <9bea31a0-c16e-aeed-cf22-a27760c229e2@yandex.ru> <871qrq9240.fsf@mat.ucm.es> <396309ef-2040-ec3c-af19-3fc6a0d587a0@yandex.ru> <87k05cw3ps.fsf@mat.ucm.es> <32439d3e-e40b-c2c2-5f5a-34785a1a5790@yandex.ru> <87v8os9o8q.fsf@mat.ucm.es> <877d177mri.fsf_-_@mat.ucm.es> <520c15a0-a82b-657f-c47f-8f030521980a@yandex.ru> <87fsfv1yau.fsf@mat.ucm.es> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------ohEboRw8bXSfARdmTRbVtX4h" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29779"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 Cc: emacs-devel@gnu.org To: Uwe Brauer Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Oct 11 04:06:08 2022 Return-path: Envelope-to: ged-emacs-devel@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 1oi4el-0007Xs-RN for ged-emacs-devel@m.gmane-mx.org; Tue, 11 Oct 2022 04:06:07 +0200 Original-Received: from localhost ([::1]:38498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oi4ek-0001ia-DB for ged-emacs-devel@m.gmane-mx.org; Mon, 10 Oct 2022 22:06:06 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oi4dx-00012J-8K for emacs-devel@gnu.org; Mon, 10 Oct 2022 22:05:17 -0400 Original-Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:44004) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oi4du-0007Cj-Sw for emacs-devel@gnu.org; Mon, 10 Oct 2022 22:05:16 -0400 Original-Received: by mail-wr1-x42f.google.com with SMTP id n12so19379937wrp.10 for ; Mon, 10 Oct 2022 19:05:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:sender:from:to:cc:subject :date:message-id:reply-to; bh=uOnjnBAkHRNN2VuYoa7Zj5T2EhUVLVMRTWDySyWim7Q=; b=Q+G+5sa6LGm1pHGzFrJVSIhKDHSPHRUKmL3zC5hy09sNVFPdrvntc+8d/2GAZkM+JC 0/uQTcAG8krSi4XQHg75Yp9d2R/Ru1RkP2o20itlnqqJBePg/0w6nPDm/OVptem6Rpjb xwPvrD3EbUs5BpiaI/u05M+n1zasbH1Op/VsuRtcBpPaBb5BUmCRz5kzwgig2DKUHMyn stXp8y7IwKX0vY0fOzAqfddJBo3XuTdDrovLVf4y5DTt7kg7UHNcvaRLr5AGhuzm7Vo6 YxnR80btJsPdc6SiSa+oZp7StBxHUGorge+ECKGS1K+jud6adJmcdyCqsrZMNEgTchAQ izXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:sender:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=uOnjnBAkHRNN2VuYoa7Zj5T2EhUVLVMRTWDySyWim7Q=; b=OpgMo3vR473002sBVRjJXUzsFzRAzn9uO3vEKf1Gnwv4JOaCepYPhOxVbL+2YyllgK ppMao4Fi4q673QW44cOx4so/Q+k8Ih8kNakOdHvfy5ezQ954U8eTZnxsNBTJnoFoeajY U0Nam/zi0hJsFEkeUTmKolx9ujSUMteBHHUSlGeF7JgwNnKT1dQCPkNt/Bn/HCb3motU WD4sAzVA7mkUv26dWzu8TPnks+4CzloyAUkb1ejHu0o4ilcntMQrxYgI4VUsztShrsZy KLikaaqQWAmG4YWBX3ky0uafG5h52+oeFbf3xNeDyMqt1bdGviohTBFIkAZFwxJVBfUg 0Pfw== X-Gm-Message-State: ACrzQf1uGh+EXh0nlODmZ8RwPHEeVQ4QdI7f/BLfRc3ezgP/1CDkOOyI eZvSvVLOAWvvmHEt+9vhD4Y= X-Google-Smtp-Source: AMsMyM6bioH+pSwM0ZhtZD0Q0KJqHKNJmzxisRj5Aqp45Tc5UpZkEXWwlLoz8UYZtWmDYIyxSJsVhw== X-Received: by 2002:adf:f982:0:b0:22e:343f:8daf with SMTP id f2-20020adff982000000b0022e343f8dafmr13332918wrr.475.1665453904992; Mon, 10 Oct 2022 19:05:04 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id i9-20020a5d5229000000b0022cd59331b2sm10276382wra.95.2022.10.10.19.05.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Oct 2022 19:05:04 -0700 (PDT) Content-Language: en-US In-Reply-To: <87fsfv1yau.fsf@mat.ucm.es> Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=raaahh@gmail.com; helo=mail-wr1-x42f.google.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-2.007, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:297410 Archived-At: This is a multi-part message in MIME format. --------------ohEboRw8bXSfARdmTRbVtX4h Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10.10.2022 18:41, Uwe Brauer wrote: >>>> "DG" == Dmitry Gutov writes: > >> On 10.10.2022 17:53, Uwe Brauer wrote: >>>> On 10.10.2022 09:39, Uwe Brauer wrote: >>>> Just 'git apply' on top of the latest master. >>> I have to wait till the BUG I reported is resolved, since otherwise >>> working with Emacs is an ordeal. However I have given it a try and >>> it seems, that in mercurial speech, >>> there is a >>> hg up tip >>> Missing, the @ is not on tip (I think called HEAD in git), but on >>> the changeset (commit) just before. >>> I have to debug this in order to see what is going on. >>> The behavior is a bit annoying especially if you continue working >>> and want to commit again, in which case you might create a new head >>> (in mercurial speech), if you are not carefully checking the graph >>> before. >>> But if you do, your solution is somehow working. > >> OK. What if our solution also automatically calls `hg up tip` at the >> end? Should that always work, or would it mess up situations where the >> user actually wanted to be in that state (head not at tip), and was in >> that originally? > > Let me think a bit about it and maybe ask other mercurial users on the > hg mailing list. I would say hg up tip should be ok, since this the > default behavior anyway Another option is to use shelving. See the attached slightly different patch. >> E.g. if they wanted to "create a new head" using the new method to >> commit a patch? > > I am not sure you know but in mercurial you could create an anonymous > head (which is impossible in git, well at least not permanently) but it > is also strongly avised against doing it, so if you want to do that you > would create before the commit a named branch, topic or maybe a > bookmark. It's probably the same as "detached HEAD" in Git. --------------ohEboRw8bXSfARdmTRbVtX4h Content-Type: text/x-patch; charset=UTF-8; name="vc-hg-checkin-patch-with-shelve.diff" Content-Disposition: attachment; filename="vc-hg-checkin-patch-with-shelve.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpc3AvdmMvdmMtaGcuZWwgYi9saXNwL3ZjL3ZjLWhnLmVsCmluZGV4 IGY0YTQ0ZGYzYzIuLjMwYzE0NTNlNDIgMTAwNjQ0Ci0tLSBhL2xpc3AvdmMvdmMtaGcuZWwK KysrIGIvbGlzcC92Yy92Yy1oZy5lbApAQCAtMTE4NSwxOSArMTE4NSwzOCBAQCB2Yy1oZy1s b2ctZWRpdC1tb2RlCiAgICJNYWpvciBtb2RlIGZvciBlZGl0aW5nIEhnIGxvZyBtZXNzYWdl cy4KIEl0IGlzIGJhc2VkIG9uIGBsb2ctZWRpdC1tb2RlJywgYW5kIGhhcyBIZy1zcGVjaWZp YyBleHRlbnNpb25zLiIpCiAKKyhkZWZ2YXIgdmMtaGctcGF0Y2gtc3RyaW5nIG5pbCkKKwog KGRlZnVuIHZjLWhnLWNoZWNraW4gKGZpbGVzIGNvbW1lbnQgJm9wdGlvbmFsIF9yZXYpCiAg ICJIZy1zcGVjaWZpYyB2ZXJzaW9uIG9mIGB2Yy1iYWNrZW5kLWNoZWNraW4nLgogUkVWIGlz IGlnbm9yZWQuIgotICAobGV0ICgoYW1lbmQtZXh0cmFjdC1mbgotICAgICAgICAgKGxhbWJk YSAodmFsdWUpCi0gICAgICAgICAgICh3aGVuIChlcXVhbCB2YWx1ZSAieWVzIikKLSAgICAg ICAgICAgICAobGlzdCAiLS1hbWVuZCIpKSkpKQotICAgIChhcHBseSAjJ3ZjLWhnLWNvbW1h bmQgbmlsIDAgZmlsZXMKLSAgICAgICAgICAgKG5jb25jIChsaXN0ICJjb21taXQiICItbSIp Ci0gICAgICAgICAgICAgICAgICAobG9nLWVkaXQtZXh0cmFjdC1oZWFkZXJzIGAoKCJBdXRo b3IiIC4gIi0tdXNlciIpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgKCJEYXRlIiAuICItLWRhdGUiKQotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICgiQW1lbmQiIC4gLGFtZW5kLWV4dHJhY3QtZm4pKQot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb21tZW50KSkp KSkKKyAgKGFwcGx5ICMndmMtaGctY29tbWFuZCBuaWwgMCBmaWxlcworICAgICAgICAgKG5j b25jIChsaXN0ICJjb21taXQiCisgICAgICAgICAgICAgICAgICAgICAgIi1tIikKKyAgICAg ICAgICAgICAgICAodmMtaGctLWV4dHJhY3QtaGVhZGVycyBjb21tZW50KSkpKQorCisoZGVm dW4gdmMtaGctY2hlY2tpbi1wYXRjaCAocGF0Y2gtc3RyaW5nIGNvbW1lbnQpCisgIChsZXQg KChwYXRjaC1maWxlIChtYWtlLXRlbXAtZmlsZSAiaGctcGF0Y2giKSkKKyAgICAgICAgKHNo ZWxmLW5hbWUgKG1ha2UtdGVtcC1uYW1lICJ2Yy1jaGVja2luLXBhdGNoIikpKQorICAgICh3 aXRoLXRlbXAtZmlsZSBwYXRjaC1maWxlCisgICAgICAoaW5zZXJ0IHBhdGNoLXN0cmluZykp CisgICAgKHZjLWhnLWNvbW1hbmQgbmlsIHQgbmlsICJzaGVsdmUiICItZCIgc2hlbGYtbmFt ZSkKKyAgICAodmMtaGctY29tbWFuZCBuaWwgMCBuaWwgInNoZWx2ZSIgIi1uIiBzaGVsZi1u YW1lKQorICAgICh1bndpbmQtcHJvdGVjdAorICAgICAgICAoYXBwbHkgIyd2Yy1oZy1jb21t YW5kIG5pbCAwIG5pbAorICAgICAgICAgICAgICAgKG5jb25jIChsaXN0ICJpbXBvcnQiIHBh dGNoLWZpbGUgIi1tIikKKyAgICAgICAgICAgICAgICAgICAgICAodmMtaGctLWV4dHJhY3Qt aGVhZGVycyBjb21tZW50KSkpCisgICAgICAocHJvZ24KKyAgICAgICAgKHZjLWhnLWNvbW1h bmQgbmlsIDAgbmlsICJ1bnNoZWx2ZSIgIi1uIiBzaGVsZi1uYW1lKQorICAgICAgICAoZGVs ZXRlLWZpbGUgcGF0Y2gtZmlsZSkpKSkpCisKKyhkZWZ1biB2Yy1oZy0tZXh0cmFjdC1oZWFk ZXJzIChjb21tZW50KQorICAobG9nLWVkaXQtZXh0cmFjdC1oZWFkZXJzIGAoKCJBdXRob3Ii IC4gIi0tdXNlciIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoIkRhdGUiIC4g Ii0tZGF0ZSIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoIkFtZW5kIiAuIChs YW1iZGEgKHZhbHVlKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICh3aGVuIChlcXVhbCB2YWx1ZSAieWVzIikKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIChsaXN0ICItLWFtZW5kIikpKSkpCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29tbWVudCkpCiAKIChkZWZ1biB2Yy1oZy1maW5kLXJldmlz aW9uIChmaWxlIHJldiBidWZmZXIpCiAgIChsZXQgKChjb2Rpbmctc3lzdGVtLWZvci1yZWFk ICdiaW5hcnkpCg== --------------ohEboRw8bXSfARdmTRbVtX4h--