From patchwork Thu Nov 23 09:14:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 44755 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp444059pzb; Thu, 23 Nov 2023 01:15:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IGzYSfhvD54tI/YWB+AlOBOcFK5UhBEaY8mUofeC26/3K6/wvIDHDpW+3bp/s/tt4lmTN5l X-Received: by 2002:a05:6402:1353:b0:543:5364:33b4 with SMTP id y19-20020a056402135300b00543536433b4mr3780469edw.11.1700730909806; Thu, 23 Nov 2023 01:15:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700730909; cv=none; d=google.com; s=arc-20160816; b=cWHYe4hsaO0+Z56U8DO5Zsy9JiMSUQnWPJIqWewUJOdQZfdn5l6pW2Z8JouUyaE0VU dbh0KXnDuXEoAzXOTkXD/332p7iJDIhZSnYA+K7X+1UUqRQeWRvYnJmpM6StQPQBVtyp HSQQ7UCLFJlKSnH3kufvki3rpCxqK5K5P+JQMJ9xOau6pNPn1MhbaDjfC/yNNlID7GBS D+SybxMmeTAuGCDNu018F3NZueTgKhJW2wcUTlKSuaW8rw3/4QNnNkCjTTuDTS0WJQOC qo1d2xu1EScohCZXzxicxuPeXQdnrfN2bLZEM8iQUs0/TK+8jpuRC4d3v1qHk3l0Kz41 DiQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=8oYvUNbFxqJL8eA9W56H2Nl0EYEOUpPQJsBC8JKVeKM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=wszVTRtDKgSIEBd/iqUxB5lpi/M2E/Hw5G01M02APfYz2FdWoBFseVhZY0jTIXpshS gvMw6JvPZUkUv/u+sZskvIjjbnblzP0XL6sWF58tt4Bww6dU53mGY9b2kvABrEMAs8GN rn58Btv041O1pH8ooag6m6KR1Ntdy9g8hrWmofpcz1Peb0fWGkOhN8TFwXxUDFksosiQ 9KDo5BjbyNInHZ9jvrhSl1kKyEqVZhJBYg2DPvHoIsqqhKqIjlEAjAsbPeosCpDLYMN6 LQWFmRPbBXO7OiOpLzutvWF9tQXL3iC1/ECHYVNDjmLS3fBIMtXMhW9gpniwB9xmQVpv n6Jw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n13-20020a50934d000000b0054a8d349552si471746eda.150.2023.11.23.01.15.09; Thu, 23 Nov 2023 01:15:09 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DB15468CF2D; Thu, 23 Nov 2023 11:14:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCF8F68CF1E for ; Thu, 23 Nov 2023 11:14:49 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 7AAE614AB for ; Thu, 23 Nov 2023 10:14:48 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id BWtQh55OxoVP for ; Thu, 23 Nov 2023 10:14:47 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 92E6510FE for ; Thu, 23 Nov 2023 10:14:47 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 42E013A0582 for ; Thu, 23 Nov 2023 10:14:41 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Nov 2023 10:14:23 +0100 Message-ID: <20231123091424.25640-1-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] tools/general_assembly: implement extra GA members X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bw1cF8wkGxce --- tools/general_assembly.pl | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/tools/general_assembly.pl b/tools/general_assembly.pl index 4c3208ccac..3bf65f3405 100755 --- a/tools/general_assembly.pl +++ b/tools/general_assembly.pl @@ -13,6 +13,12 @@ use utf8; use DateTime; use DateTime::Format::ISO8601; +my @extra_members = ( + # entries should be of the format + # [ , , ], + # ['Foo Bar', 'foo@bar', DateTime->new(year => 8613, month => 5, day => 22)], +); + sub trim { my $s = shift; $s =~ s/^\s+|\s+$//g; return $s }; sub print_help { @@ -29,7 +35,7 @@ sub print_help { my $print_full = 1; my $print_names = 0; my $print_emails = 0; -my $date = DateTime->now()->iso8601; +my $date_str = DateTime->now()->iso8601; my $help = 0; GetOptions( @@ -37,7 +43,7 @@ GetOptions( "names" => \$print_names, "emails" => \$print_emails, "help" => \$help, - "date=s" => \$date, + "date=s" => \$date_str, "h" => \$help, ); @@ -76,7 +82,8 @@ sub get_date_range { return ($date_since, $date_until); } -my ($since, $until) = get_date_range(DateTime::Format::ISO8601->parse_datetime($date)); +my $date = DateTime::Format::ISO8601->parse_datetime($date_str); +my ($since, $until) = get_date_range($date); my @shortlog = split /\n/, decode('UTF-8', `git log --pretty=format:"%aN <%aE>" --since="$since" --until="$until" | sort | uniq -c | sort -r`, @@ -108,6 +115,13 @@ foreach my $line (@shortlog) { $assembly{$name} = $email; } +foreach my $entry (@extra_members) { + my $elected = $entry->[2]; + if ($date->is_between($elected, $elected->clone()->set_year($elected->year + 2))) { + $assembly{$entry->[0]} = $entry->[1]; + } +} + # generate the output string my @out_lines; foreach my $name (sort keys %assembly) { From patchwork Thu Nov 23 09:14:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 44754 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp443984pzb; Thu, 23 Nov 2023 01:14:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IH9Kqxy1CC0qauky+x356zj8xO0HTvQu4fX3T8xmBYdrq6uJLK8VRp0HZXUi2+Ll7RNMs92 X-Received: by 2002:a05:6402:b1a:b0:54a:97c4:b035 with SMTP id bm26-20020a0564020b1a00b0054a97c4b035mr1747500edb.1.1700730899699; Thu, 23 Nov 2023 01:14:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700730899; cv=none; d=google.com; s=arc-20160816; b=rFjvy57a7mHKRBr12Gyage5OMZdvo3MkfllCLmbqKAMk4gPchz+h9v0SXFm6XalV7e dF7Yyw+E3JuqRyg2qX1/GJMn3Z8omry4sSc8YypqZDSFwwrCFhj7bWztBnY8HrpND2sL gmNxbYEX9fyKZPIIBtqIcW1AeKE3/R6DcjbKp5qwACUbSuXhlF3aVWDY8cpvsvDs9cAd Z/zbUUPyK52wNmgnFuKYVNsZOe7Au/XJ9vfXO8zxPnSIh/RIg5zlNq+uiWAzWRvSjdnA yGI0r5j5xfn6J+vi9ZHDOUbcqXDT42tBVssFf85bkSP6mbiFrj9DOsuxVQ4yyBd8LjjY d8FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=UN016CrVgQiEdaYGRN3Oop4WLLA0nHiT8lyVQX8MylE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=qjR0eDtAdm+GfSRNFkjViSweeZAhHOgEYc/qe2FB8qvv0jHlUOslV3/Uq12Fc1JQ2C 7vixMvAIT2i5i1DucGSz0fW3tQmxv5P5Awh1xWIo+VbcMe2ikFKmaIgx7DPjqbj2eq/W M6SxeCap6r87HiN6Ek5hV7pWNEsSy9Auel6wQ6EadMBNTM/RPmIQmnaE5TJVe2dWn10q qMTMP6xW4ZDJKldUtqZqYg6J6l/b6uxjwYJ0mVi31J4XEvBCB0MBFbsTlet3Kukb0/QL n1PIrnaJER4cuQcCJRx5iShwayceSKSCrkPNqopQd5EyxJP9adIDo8VXTg5p6eN9yu+v nhaw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r13-20020a05640251cd00b00548bb57277dsi470747edd.405.2023.11.23.01.14.59; Thu, 23 Nov 2023 01:14:59 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B720A68CF26; Thu, 23 Nov 2023 11:14:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9F326801F2 for ; Thu, 23 Nov 2023 11:14:49 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 7E9E614DD for ; Thu, 23 Nov 2023 10:14:48 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id fAI2qMU_c2Nh for ; Thu, 23 Nov 2023 10:14:47 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 92E961486 for ; Thu, 23 Nov 2023 10:14:47 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 503C63A0585 for ; Thu, 23 Nov 2023 10:14:41 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Nov 2023 10:14:24 +0100 Message-ID: <20231123091424.25640-2-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231123091424.25640-1-anton@khirnov.net> References: <20231123091424.25640-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] tools/general_assembly: restore printing HEAD X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /xHcu0QvuP2a --- tools/general_assembly.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/general_assembly.pl b/tools/general_assembly.pl index 3bf65f3405..13c13bb28f 100755 --- a/tools/general_assembly.pl +++ b/tools/general_assembly.pl @@ -139,5 +139,7 @@ foreach my $name (sort keys %assembly) { my $out_str = join("\n", @out_lines) . "\n"; utf8::encode($out_str); -printf("# GA for $since/$until; %d people; SHA256:%s\n%s", - scalar @out_lines, Digest::SHA::sha256_hex($out_str), $out_str); +printf("# GA for $since/$until; %d people; SHA256:%s; HEAD:%s%s", + scalar @out_lines, Digest::SHA::sha256_hex($out_str), + decode('UTF-8', `git rev-parse HEAD`, Encode::FB_CROAK), + $out_str);