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: log-edit-insert-changelog even when run git/hg from the Date: Sat, 1 Oct 2022 21:13:32 +0300 Message-ID: <9bea31a0-c16e-aeed-cf22-a27760c229e2@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> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12759"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Cc: emacs-devel@gnu.org To: Uwe Brauer Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Oct 01 20:14:45 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 1oeh0d-000380-8G for ged-emacs-devel@m.gmane-mx.org; Sat, 01 Oct 2022 20:14:43 +0200 Original-Received: from localhost ([::1]:48614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oeh0b-0007vc-PX for ged-emacs-devel@m.gmane-mx.org; Sat, 01 Oct 2022 14:14:41 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oegzi-0007FK-67 for emacs-devel@gnu.org; Sat, 01 Oct 2022 14:13:46 -0400 Original-Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:42712) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oegzg-0004H1-4S for emacs-devel@gnu.org; Sat, 01 Oct 2022 14:13:45 -0400 Original-Received: by mail-wr1-x433.google.com with SMTP id b7so3715338wrq.9 for ; Sat, 01 Oct 2022 11:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date; bh=kydW7rk8QzpKubSH/YVmKrTGs7YQqMIQTI2rGMKTIXY=; b=cD9Qyxex6ay9zMGFBZhs4KZTxxy87XeVbarAZEWHnKGn+4EwUyo+CwhhKPWSjX4kEc kRCC4i2DuGY2PdbFffTy42KKkRzu/DT0OmACJ9FeorUhPVAL5zSEUAnx/Iejfszgtbit JIzTpsf+ScMY5feyMzBplmJo8VBhx7M2CX5bNuVz4SZtisZqL9N8aa0XBMgxCOCndv8V muC9+yjeqqmt0DpVsDFv0tZq6w1wtYPEe5/uJiQXby68PT+NDDvwiv2sKc0NFMdsz12n wJHp/iHpUwn1wUgelcer7TarXO/dZgqFFxP4zBVl0TtVcNBvAMOLchseQhUoy7kUr2V6 sJiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding: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; bh=kydW7rk8QzpKubSH/YVmKrTGs7YQqMIQTI2rGMKTIXY=; b=g3bw5bN2VafjxSxlmMPw70WKsVzI0laKbBKjCNlj07XR9HXYaq11g3TsPue4jKApZH +OD3AXheY0LDIKH6hQRS/GtknybJ+8W60VdxvNqF8pOmRkQi5YsVh3n8uwWxfK9NQy5H Ez+RYjtNKLC0Qttxsyx5SshLakBsx1P7PumyqkWGpP4uUrhm+YLq/mxn+JE/mn8k8Bmu cf0LiFVqc4xqK/+8xRuE9lJZsJoUa8KsCjUEIqL3lrNcxhIle+PqW3m7yALrtaq+Z88F dInvkk0n51crlzaYyI8xLgpHgwK2Ud8GRywbj0nz4RzmcwVxWKdQR7m1iSF7B+m8GIhp /Yaw== X-Gm-Message-State: ACrzQf3oCVzrMtzQylCYyfaQfLikZzlVw76U9yN1K9uwipzHXt5V0H8r 5NJ0embSOOB6MTsxIKn0cEU= X-Google-Smtp-Source: AMsMyM4XvwqmXuuh4mo+k3GaW8tt8fr1/ENJEFWrnML5s3EMmVvPEzKHF1xD2Zi9APBUT1/IqVNHNw== X-Received: by 2002:a05:6000:81e:b0:228:a17f:92f0 with SMTP id bt30-20020a056000081e00b00228a17f92f0mr9238249wrb.31.1664648014884; Sat, 01 Oct 2022 11:13:34 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id bu21-20020a056000079500b0022cdcad0d21sm5752783wrb.8.2022.10.01.11.13.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 01 Oct 2022 11:13:34 -0700 (PDT) Content-Language: en-US In-Reply-To: <87tu4naere.fsf@mat.ucm.es> Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=raaahh@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 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.743, 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:296558 Archived-At: On 01.10.2022 15:51, Uwe Brauer wrote: >>>> "DG" == Dmitry Gutov writes: > >> On 01.10.2022 08:58, Uwe Brauer wrote: >>> I think the most common use case, that also git users use quite a bit, >>> would be the rebase command, since in my understanding vc does not >>> support it and so the ChangeLog in that case would be unavailable. > >> Wouldn't you need to insert the older entries from ChangeLog, as >> you're rebasing the older commits? > > Ok, to give some more details: I don't like rebasing in fact, I hate it, I prefer merging. I prefer merging as well, but I'm fine with either. > However there is a particular workflow, where it comes in handy. Suppose > I develop some code on a branch that I don't push (in hg that would be a > secret branch, as far as I know git does not have phases) or say I > cannot push since I don't have write access. When I finish the other > developers only want to see the final change set. > > So I rebase the branch on top of master (in git speech) and collapse all > changesets to one (not sure git has this feature). Normally, when you edit the log message for the combined changeset, all the messages from the squashed commits should already be present in the buffer. So you would just rearrange them and commit. So I never felt the need to insert changelog entries again (after doing that when creating the original sequence of commits). > BTW, interesting (fun) fact. > > Mercurial and git are often orthogonal in there default setting (like > mercurial hg log always show all branches, if you want only particular > one, you need to specify which git is the other way around, also in > commit: mercurial commits all change set to all files per default but > you can change that by using the interactive option (I think git stage > is something similar). > > Now there is a package commit-patch, with fortunately a emacs interace commit-patch-buffer.el > > that allows mercurial users to interactive commit some hunks but not all > (magit has this for a long time I think) > > Now the point is that this interface, also it does not rely on > vc-next-action, allows me to use log-edit-insert-changelog. > > I have to find out how. We have a ready counterpart for that feature for the Git backend, and I should hopefully make it support Hg as well, before Emacs 29 is out. It does rely on vc-next-action, though (and works when 'C-x v v' is called from a diff-mode buffer).