From patchwork Fri Mar 12 08:24:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 42491 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 76106393A405; Fri, 12 Mar 2021 08:24:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 76106393A405 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1615537442; bh=gXWpN0B+kCagIf+09u8OCv0knt9up+O0hL5wbJC8qGc=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=O+d2OP/IfgZWWAL6ugjibVV0KeEgIQNbpTnh0tLVnUHZjxEF5SG08qo2WC8DNZQwP TePAdrjszAsF9W6pjC9nfcIx+O6lFkGGjOvOHiOhpB23iUItgxOgDGuN4Hkf+2KGTy TlIYp7PwZrYx1+uucstintMZ++XnRl//5oH0Zwps= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org 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 DE9093938C24 for ; Fri, 12 Mar 2021 08:23:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DE9093938C24 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-411-IUyoCOBxMJSEwI3MkGkrFA-1; Fri, 12 Mar 2021 03:23:56 -0500 X-MC-Unique: IUyoCOBxMJSEwI3MkGkrFA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7661A800D62 for ; Fri, 12 Mar 2021 08:23:55 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-77.ams2.redhat.com [10.36.112.77]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A11745D6BA for ; Fri, 12 Mar 2021 08:23:54 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 3/3] scripts/merge-abilist.py: New script to merge abilist files In-Reply-To: References: Message-Id: Date: Fri, 12 Mar 2021 09:24:06 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" --- .gitattributes | 1 + scripts/merge-abilist.py | 112 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 scripts/merge-abilist.py diff --git a/.gitattributes b/.gitattributes index 06b553db80..859638588b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ ChangeLog merge=merge-changelog +**.abilist merge=merge-abilist timezone/* -whitespace diff --git a/scripts/merge-abilist.py b/scripts/merge-abilist.py new file mode 100644 index 0000000000..ad2bae2b8a --- /dev/null +++ b/scripts/merge-abilist.py @@ -0,0 +1,112 @@ +#!/usr/bin/python3 +# Automatic merging of abilist updates for Git. +# Copyright (C) 2021 Free Software Foundation, Inc. +# This file is part of the GNU C Library. +# +# The GNU C Library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# The GNU C Library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with the GNU C Library; if not, see +# . + +"""Merge helper for consolidating changes in abilist files. + +To active, copy glibcsymbols.py and this file to a separate directory, +make merge-abilist.py executable, and add this to .git/config: + +[merge "merge-abilist"] + name = Merger for abilists + driver = /path/to/merge-abilist.py %O %A %B %P +""" + +import argparse +import os +import sys + +# Make available glibc Python modules. +sys.path.append(os.path.dirname(os.path.realpath(__file__))) + +import glibcsymbols + +def get_parser(): + """Return an argument parser for this module.""" + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument('ancestor', + help='path to the file with the merge ancestor') + parser.add_argument('current', + help='path to the file with the current version') + parser.add_argument('other', + help='path to the file with the other branch version') + parser.add_argument('path', help='path name in the source tree') + return parser + +def main(argv): + parser = get_parser() + opts = parser.parse_args(argv) + + if not opts.path.endswith(".abilist"): + # Not an abilist file. + sys.exit(3) + + ancestor = glibcsymbols.read_abilist(opts.ancestor) + current = glibcsymbols.read_abilist(opts.current) + other = glibcsymbols.read_abilist(opts.other) + + added_symbols_current = current.keys() - ancestor.keys() + deleted_symbols_current = ancestor.keys() - current.keys() + added_symbols_other = other.keys() - ancestor.keys() + deleted_symbols_other = ancestor.keys() - other.keys() + + # Check that the symbols have the same value if present in both inputs. + ok = True + for common_symbol in current.keys() & other.keys(): + if current[common_symbol] != other[common_symbol]: + print('{}: mismatch for {}: {!r} != {!r}'.format( + opts.path, common_symbol, + current[common_symbol], other[common_symbol])) + ok = False + # Check that there are no add/delete conflicts. + for common_symbol in added_symbols_current & deleted_symbols_other: + print('{}: added in current branch, deleted in other'.format( + common_symbol)) + ok = False + for common_symbol in added_symbols_other & deleted_symbols_current: + print('{}: added in other other branch, deleted in current'.format( + common_symbol)) + ok = False + if not ok: + sys.exit(2) + + # Apply the updates from the other branch. + result = current.copy() + for symbol in added_symbols_other: + result[symbol] = other[symbol] + for symbol in deleted_symbols_other: + del result[symbol] + + # Introduce placeholder symbols if a symbol set was completely + # deleted. + placeholder = "__{}_version_placeholder".format( + os.path.basename(opts.path)[:-len(".abilist")]) + old_versions = set(versym.version for versym in current.keys()) + new_versions = set(versym.version for versym in result.keys()) + for missing_version in old_versions - new_versions: + result[glibcsymbols.VersionedSymbol( + placeholder, missing_version)] = 'F' + + # Write out the merged abilist. Do not use replace_file because + # of the file system race due to the ...T name. + with open(opts.current, 'w') as out: + for line in glibcsymbols.abilist_lines(result): + out.write(line) + +if __name__ == '__main__': + main(sys.argv[1:])