From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id C145A3855037 for ; Fri, 18 Jun 2021 11:10:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C145A3855037 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-359-sR4GRdRVOFWDDPTTdddnYw-1; Fri, 18 Jun 2021 07:10:45 -0400 X-MC-Unique: sR4GRdRVOFWDDPTTdddnYw-1 Received: by mail-wr1-f72.google.com with SMTP id n2-20020adfb7420000b029010e47b59f31so4181018wre.9 for ; Fri, 18 Jun 2021 04:10:45 -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:cc; bh=AuflyGhhAwrNsDNNHFeO/bg0wHzbYxDyTD9P7EGsuok=; b=MktrBnLX2dtYeBZp89MxUaZPtebraCFqDn8bo59L9Wj04sHZ6IIgAZOd5Bj+BupjZ1 NslfmeTOwtcA0tt+3hrz4aUvjV1nzWK6UWLHgl0Pa/uSj5bQCL6MX9KOj22O8GnxW+dD iPqjd0Xfu+VG2OV2w8/k5qy+QGUC4JtgSP+SnkRorSib9LTsF9qU6jbze5lR2y1gUcWG jNj7Vpajr7cD8Y7hOviu3hd06MkXivni4/6OTGBGnU7DEAB/o6LA1RJSDInufhuKVbCW mcsK4QnDSdf8KDWSBz5UU2IK+lGug9qEeB7T8mG8cSsS7lFTt/3QGlEkyi7DsyBGHzsX vWvA== X-Gm-Message-State: AOAM532RKVI3dz6x24Xn4ieGAUsN/UURfKbQ6xl9sibUUYOV47QNzfir ib5AttT260ys8IN8pUsXMwHl/rMWIn2LIJ5lopLoF6h5LNtmEo/dFIfVwRnSYsBxIaus6DRUoP9 FC/XKNO3FkntmOT53l3q6gGw= X-Received: by 2002:a05:6000:cb:: with SMTP id q11mr11854242wrx.13.1624014644132; Fri, 18 Jun 2021 04:10:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+mMnGYPrTxrmKXBhSXtyFBmrLfFLRov7yoBaDmhLwxDuL1zo2YYuvi2qGnLoHJqgBVDL/6s3WxhZzzfRxySw= X-Received: by 2002:a05:6000:cb:: with SMTP id q11mr11854218wrx.13.1624014643964; Fri, 18 Jun 2021 04:10:43 -0700 (PDT) MIME-Version: 1.0 References: <71b4a023-efb2-6c6a-9ced-93cce7c96540@gmail.com> <013d6727-4008-b4b5-b793-c782a5ba8e10@redhat.com> <916af0f3-0877-e977-6b6c-899edec8e706@foss.arm.com> <20210617172129.GH7746@tucnak> <16f70de7-8324-e249-dbd8-605022066d12@foss.arm.com> <070f57d5-1496-50f4-1144-3ff2e75a4460@codesourcery.com> In-Reply-To: <070f57d5-1496-50f4-1144-3ff2e75a4460@codesourcery.com> From: Jonathan Wakely Date: Fri, 18 Jun 2021 12:10:33 +0100 Message-ID: Subject: Re: [Patch] contrib/mklog.py: Improve PR handling (was: git gcc-commit-mklog doesn't extract PR number to ChangeLog) To: Tobias Burnus Cc: Richard Earnshaw , Jakub Jelinek , Joseph Myers , =?UTF-8?Q?Martin_Li=C5=A1ka?= , gcc Mailing List X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-6.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2021 11:10:47 -0000 On Fri, 18 Jun 2021 at 12:05, Tobias Burnus wrote: > But with -p added, it becomes rather nice. For instance: > > git diff |./contrib/mklog.py -b foo/12394 -b 100123 -p > > nows prints: > > PR c++/12394 - internal compiler error: in write_type, at cp/mangle.c:1517 > PR fortran/100123 - -ftree-fre gives incorrect result in subroutine with array declared as length 1 > > PR c++/12394 > PR fortran/100123 Now that we put these PR cmpt/nnnn lines before the xxx/ChangeLog entries, is there any reason to indent them with a TAB? If we didn't require the TAB before them, then the lines added by -p would serve the same purpose, and we wouldn't need to repeat them So instead of requiring "^\tPR .*/\d+$" for the PR entry, require "^\t?PR ([^/]+)/\d+" That would allow the existing convention, but also allow these to be used in their place: PR c++/12394 - internal compiler error: in write_type, at cp/mangle.c:1517 PR fortran/100123 - -ftree-fre gives incorrect result in subroutine with array declared as length 1