From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: [RFE] Migration to gitlab Date: Sat, 11 May 2019 16:13:09 +0300 Message-ID: <969d9650-71b7-f583-ef95-8694db2f2679@yandex.ru> References: <87imwhmmt8.fsf@gmail.com> <87y347g1l3.fsf@iotcl.com> <9ac21e82-8e47-f9b5-f88d-23c0c56946d1@yandex.ru> <87pnpc1lby.fsf@iotcl.com> <83zhoezdqc.fsf@gnu.org> <87imuivfcr.fsf@iotcl.com> <83k1eyfxls.fsf@gnu.org> <17D21056-10B2-4813-AE90-9B2706936CE9@icloud.com> <83imuifqjc.fsf@gnu.org> <87lfzehrug.fsf@gmail.com> <20190511021206.GA4049@ACM> <83ef55eapl.fsf@gnu.org> <83bm09e2ce.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="261685"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 Cc: acm@muc.de, toon@iotcl.com, monnier@iro.umontreal.ca, agrambot@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii , =?UTF-8?B?7KGw7ISx67mI?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 11 15:13:50 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hPRp0-0015yJ-7Z for ged-emacs-devel@m.gmane.org; Sat, 11 May 2019 15:13:50 +0200 Original-Received: from localhost ([127.0.0.1]:58794 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPRoz-0003u4-7U for ged-emacs-devel@m.gmane.org; Sat, 11 May 2019 09:13:49 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:54513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPRoV-0003gI-AD for emacs-devel@gnu.org; Sat, 11 May 2019 09:13:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hPRoU-0006Vd-66 for emacs-devel@gnu.org; Sat, 11 May 2019 09:13:19 -0400 Original-Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]:40365) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hPRoT-0006Uh-Us; Sat, 11 May 2019 09:13:18 -0400 Original-Received: by mail-lf1-x129.google.com with SMTP id h13so6000219lfc.7; Sat, 11 May 2019 06:13:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=hC1wK5pfc4QPJobEvMtF+NQ+lQfsq7QBKiJP3hKgol0=; b=o5n5d8C3Mm8LsjuZVEkKsyo75BecbV1NPugRSN3xtTopmdBpsnPxEMb9/IH6V2rKAh 56e5+WK8+sI+Z+pP9UWm4BLnLNXg0tsvCkih175h0mNr34ddCeWAcp6friRWddTNeMem Ss0gBBa8fTc+PjxUba+OOi8lS4FB/N1blaP1jOIXzMVMG/aAtNSrJgt6y2p9BhZ5QlAx i8MfQtQIPaC9TaeHP5elLAhdXWVYim62d9qaWUgqLcSsfh8t9j3NbhBMYAlChEa2cYSC g3ypGms1zuNbGekZlCu+juecbQzPZwQ+eWxcB4sL5Ldkq5Ms28cw+RUMKSuPoa4CP7WL hq6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=hC1wK5pfc4QPJobEvMtF+NQ+lQfsq7QBKiJP3hKgol0=; b=jxV8v1nYS2TNpn5uieeRLbA6vdNpb6+pcC8qETl6NloXtdGz0Am0VHRROaamBiIpQr kwTABGPk+r637iNpKZvu4ahkJw50n63mYxZU9r1a/LDhurnFv1Z8mSFctE1MXKzeLlRW tBNAOk5bT5wmAEESa0WnM/i815GRmKWlmaxjP2UHS91Ezcpfh4CyCslQ0hBENcpaJOoJ 7bruA+W5rlMd6XuA94E0aEeBX5nEitVElHvukm91l5x1ZvQGi7yX6Ua0eXpz7x7bEisr xZUJgjAh6sOkv/+TcIKkcyV6LF24TlmRTlCwp2BNZDRXsCulsJrLtoUftIiYrzAbrAn7 yZag== X-Gm-Message-State: APjAAAU8Lq0iLxIuMveUmr/plS8cbTc+Nbn3JGUs4ogTtJXEj7GhMqg/ hZD/xu3UAhhzIEmA4nOYcDM= X-Google-Smtp-Source: APXvYqz5qgmvkREM0CkDJHWFSWZsaomYZ14Nc5CnetzxMhVbPbBnOp781FQqe4tWdhWp2jIdYiIBTw== X-Received: by 2002:ac2:4a8c:: with SMTP id l12mr8694753lfp.53.1557580396237; Sat, 11 May 2019 06:13:16 -0700 (PDT) Original-Received: from [192.168.1.3] ([185.105.174.23]) by smtp.googlemail.com with ESMTPSA id q17sm2243562lji.22.2019.05.11.06.13.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 May 2019 06:13:12 -0700 (PDT) In-Reply-To: <83bm09e2ce.fsf@gnu.org> Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::129 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:236417 Archived-At: On 11.05.2019 13:02, Eli Zaretskii wrote: > Asking the contributors to fix the log messages works only up to some > not very far limit. Quite frequently, IME, the 2nd, the 3rd, and > sometimes the 4th attempt are still not what I'd like to see, whether > due to misunderstanding or something else. At which point I usually > give up and fix the rest myself, so as not to discourage the > contributor the next time he/she wants to contribute. Same here. > So there should be an easy way of accepting a PR/MR where I can > augment the log message in the process. Because once the commit is > pushed, whatever deficiencies there were in the log message are carved > in stone forever. There are basically two options: If the MR only has a few commits (or just one, which might consititute the majority of them), you can "Merge with squashing" by clicking a checkbox: https://docs.gitlab.com/ee/user/project/merge_requests/squash_and_merge.html. The UI will let you edit the commit message for the squashed commit before it is merged. That would probably require using the Web UI; a hypothetical Emacs-based client might also support that later, IDK. The alternative option is always there: when you don't want to squash all commits together (say, the branch is long and big), you can, of course, fetch it, check it out locally, rebase (fixing all commit messages while doing that) and push. And close the MR manually (I think automatic detection will break in the presence of rebasing). >> And yes, GitLab adds the reference to the issue, which commit or PR resolves this issue. > > What if the issue is not yet resolved, like when we commit a change > that fixes only part of the issue, or is only tangentially related to > it? We cannot yet close the issue, but a reference to it should be in > the commit log. An issue reference doesn't have to close it. #123 is a reference. "Fixes #123" is an auto-closing reference. Some details here: https://docs.gitlab.com/ee/user/project/issues/automatic_issue_closing.html To sum up, we can create references to issues in commits (which the GitLab UI recognizes as references), *and* we can make commits close issues. In the latter case the issue notes will reference the commit that closed it automatically. >> About adding the copyright/paperworks, there isn’t a default setting, but you can have a bot to do that. I’ve never used one myself, so I’m not sure, but I’ve seen lots of projects that use bots to get paperwork, etc... > > How can a bot do that, when a commit log message is immutable once the > commit is pushed? Is a commit message related to copyright/paperworks?