From nobody Mon May 6 13:47:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+56787+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56787+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1585694566; cv=none; d=zohomail.com; s=zohoarc; b=IkZgrOZuWROvWNzyD5VdAEKBoOgsf1iYKj2gYJV5ImdhThlSLlbGlGnHGY8gq9YWNSBtOFvJg5azrUznNCmxEYpgJWvIWqzD1etbMGAcgVWoLQbwTOi7OSYOxOaNX2+QE1KKGB9bwXSCGGH9Cy5coPfbPRtdASEHQKmFNMddViA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585694566; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=hcU/+o2FOfdsErCZlHyVhmjBVvrLG2cKC9PF4OwKlJ4=; b=ABuwmotctVfTV5OTxTGeRCdcaHM87xitVnT+m9w+4jGamHZL3XEH97w+wpt6xwaUbcg7HDjn+jJ8GUfTVcPhM/vp9+c9NrxJY/1Tzl6Z8x9Gf83Nvm7PTkuyRk55J5YfH0EEutlxhs6mL5d80O/EGVchJ73VRWHj93ZrywGTEFA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56787+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1585694566657113.39661458906994; Tue, 31 Mar 2020 15:42:46 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id UnmcYY1788612xF9o5u3qtjO; Tue, 31 Mar 2020 15:42:46 -0700 X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web10.418.1585694565871970875 for ; Tue, 31 Mar 2020 15:42:46 -0700 IronPort-SDR: IFTH8psdyHyz3Tm6L3KzVK2MWlz6LqpAWVLln/ObgnF8XOZysVoK/lAeEHfJZDXZl1f4B5IN+6 l8MZ9wLoTLlg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2020 15:42:45 -0700 IronPort-SDR: 4p/bsRjL3rI5bycqOGblZPjixVDgbvBfqWZQqSM07lZfZsKZA+NTjBq75Z6CVKvDMUOBMzZP8l oKosZjjUrb6A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,329,1580803200"; d="scan'208";a="284168254" X-Received: from ecbjorge-mobl1.amr.corp.intel.com ([10.134.71.242]) by fmsmga002.fm.intel.com with ESMTP; 31 Mar 2020 15:42:44 -0700 From: "Bjorge, Erik C" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 1/7] EdkRepo: Adding support for archiving combos Date: Tue, 31 Mar 2020 15:41:57 -0700 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,erik.c.bjorge@intel.com X-Gm-Message-State: qCsDPQbBuDRNm1gKyVjJsvk7x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1585694566; bh=wlShDF53GzNbTuN/bdMp4+X+cTstIu+CvkAFZV1ZGUk=; h=Cc:Date:From:Reply-To:Subject:To; b=ALkWzuW4zWcZ6axlSsMih9756Ya8voG5j10OonqrP0DekHmxnC5mVwc9JotpzFWzOxZ E5PfYKo48Ir4/oWRu2yKiGPNMD6uRa0VjROIyyhCavL0DUJ1itxXY+04gIbWIF9Hb5G27 yKCAcHrhSeIEnNiylUp5Q8vxzu2h5XU/5N0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Adding support to check the archived attribute on branch combos. This allows a combo to be archived and available if required but not dirty up the combo list. Signed-off-by: Erik Bjorge Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Reviewed-by: Ashley DeSimone Reviewed-by: Nate DeSimone --- edkrepo_manifest_parser/edk_manifest.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/edkrepo_manifest_parser/edk_manifest.py b/edkrepo_manifest_par= ser/edk_manifest.py index dd3512b..7b513dc 100644 --- a/edkrepo_manifest_parser/edk_manifest.py +++ b/edkrepo_manifest_parser/edk_manifest.py @@ -306,7 +306,11 @@ class ManifestXml(BaseXmlHelper): =20 @property def combinations(self): - return self._tuple_list(self.__combinations.values()) + return self._tuple_list([x for x in self.__combinations.values() i= f not x.archived]) + + @property + def archived_combinations(self): + return self._tuple_list([x for x in self.__combinations.values() i= f x.archived]) =20 def get_repo_sources(self, combo_name): if combo_name in self.__combo_sources: @@ -645,6 +649,10 @@ class _Combination(): self.description =3D element.attrib['description'] except: self.description =3D None #description is optional attribute + try: + self.archived =3D (element.attrib['archived'].lower() =3D=3D '= true') + except: + self.archived =3D False =20 @property def tuple(self): --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56787): https://edk2.groups.io/g/devel/message/56787 Mute This Topic: https://groups.io/mt/72688768/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Mon May 6 13:47:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+56788+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56788+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1585694574; cv=none; d=zohomail.com; s=zohoarc; b=ATR7h5VqBKlClj/R02uLAtJTTt2XuA7Ax8LWsuSVDFyTETS+c1iBW1wp4SKUrCSA+hD7xNvgeMvi3CMIZs/c4QJjOLR0PmnTFkHADoay/qd+MfnHprLpoNUFVfZJDAw7BCQ+lrizF70Eb9o4T64LHaeVJK9yV6mTpRVJxRu+p2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585694574; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Jtz/AsLpWF/fxerVuuzIpUEAnti3FyAO//lgwjYryi4=; b=dH/eIvE1HzBeCuiGDOKWI3LGP05XvsIu0l3UM6Pbmsm3FCN5ifAxysrWpH7nb5nBLmkQQBcFrSYQNCJZVvKqc81LtUiXtCOb0/cRBtUWwzOjmqrJpMV/uASRBdPBpeSBRfVOoyY4W2bea9jtz5q+x4v4u0zwi1diacZYfQFQWIE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56788+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 158569457430039.569738471273695; Tue, 31 Mar 2020 15:42:54 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id hOOVYY1788612xigPaiIbXhq; Tue, 31 Mar 2020 15:42:53 -0700 X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web12.418.1585694573550368246 for ; Tue, 31 Mar 2020 15:42:53 -0700 IronPort-SDR: cqIfpMJp0usRiFrKNuxpaawfv6kJfCiSiiQnQi1y4VA310YWheaetsJ8bEVTxrRWplzdFJPHO8 ZjY31RvV6rWQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2020 15:42:53 -0700 IronPort-SDR: dOixnZrVr0f5povOpn9l+uF/gdeOUEhRUkDFOjo13E4vKiJVRD1Cm4qLVemOl2rhv0A6y1oKPc Lyxbp3142IQQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,329,1580803200"; d="scan'208";a="284168274" X-Received: from ecbjorge-mobl1.amr.corp.intel.com ([10.134.71.242]) by fmsmga002.fm.intel.com with ESMTP; 31 Mar 2020 15:42:53 -0700 From: "Bjorge, Erik C" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 2/7] EdkRepo: Added ability to display archived combinations Date: Tue, 31 Mar 2020 15:41:58 -0700 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,erik.c.bjorge@intel.com X-Gm-Message-State: LbZLmsm6hlWsDagaccR5qxuWx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1585694573; bh=i/rY0ndfl21BFCOYSjUDPewQJdBkbloe7qF6NP9vXek=; h=Cc:Date:From:Reply-To:Subject:To; b=FrFVTyzRnDpRPbOu8MLF4/5SFNIsiwIp6zeoyLNqVwAjXnSc2GjtB0J8zUVNYZTUM9d LlQt8eTNGMEDRl6f8xXbPIsdl6UjX0GzsMGmAWmRRQah3JqOp0qOBoNv3hOP/HniORsQF t2itep0l+3xe2CfKvwCfsqNoyaSsigrXio8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Added support for using the -a / --archived flags to include archived combinations. Signed-off-by: Erik Bjorge Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Reviewed-by: Ashley DeSimone Reviewed-by: Nate DeSimone --- edkrepo/commands/arguments/combo_args.py | 5 +++-- edkrepo/commands/combo_command.py | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/edkrepo/commands/arguments/combo_args.py b/edkrepo/commands/ar= guments/combo_args.py index af3ded9..dabb464 100644 --- a/edkrepo/commands/arguments/combo_args.py +++ b/edkrepo/commands/arguments/combo_args.py @@ -3,7 +3,7 @@ ## @file # combo_args.py # -# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # =20 @@ -11,4 +11,5 @@ combo command meta data. ''' =20 -COMMAND_DESCRIPTION =3D 'Displays the currently checked out combination an= d lists all available combinations.' \ No newline at end of file +COMMAND_DESCRIPTION =3D 'Displays the currently checked out combination an= d lists all available combinations.' +ARCHIVED_HELP =3D 'Include a listing of archived combinations.' diff --git a/edkrepo/commands/combo_command.py b/edkrepo/commands/combo_com= mand.py index 68d6854..9e13f47 100644 --- a/edkrepo/commands/combo_command.py +++ b/edkrepo/commands/combo_command.py @@ -3,10 +3,11 @@ ## @file # combo_command.py # -# Copyright (c) 2017- 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2017- 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # from colorama import Fore +from colorama import Style =20 from edkrepo.commands.edkrepo_command import EdkrepoCommand from edkrepo.commands.edkrepo_command import ColorArgument @@ -25,6 +26,11 @@ class ComboCommand(EdkrepoCommand): metadata['help-text'] =3D arguments.COMMAND_DESCRIPTION args =3D [] metadata['arguments'] =3D args + args.append({'name': 'archived', + 'short-name': 'a', + 'positional': False, + 'required': False, + 'help-text': arguments.ARCHIVED_HELP}) args.append(ColorArgument) return metadata =20 @@ -32,9 +38,18 @@ class ComboCommand(EdkrepoCommand): init_color_console(args.color) =20 manifest =3D get_workspace_manifest() - for combo in [c.name for c in manifest.combinations]: + combo_archive =3D [] + combo_list =3D [c.name for c in manifest.combinations] + if args.archived: + combo_archive =3D [c.name for c in manifest.archived_combinati= ons] + combo_list.extend(combo_archive) + if manifest.general_config.current_combo not in combo_list: + combo_list.append(manifest.general_config.current_combo) + for combo in sorted(combo_list): if combo =3D=3D manifest.general_config.current_combo: print("* {}{}{}".format(Fore.GREEN, combo, Fore.RESET)) + elif combo in combo_archive: + print(" {}{}{}{}".format(Fore.YELLOW, Style.BRIGHT, combo= , Style.RESET_ALL)) else: print(" {}".format(combo)) if args.verbose: --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56788): https://edk2.groups.io/g/devel/message/56788 Mute This Topic: https://groups.io/mt/72688776/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Mon May 6 13:47:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+56789+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56789+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1585694576; cv=none; d=zohomail.com; s=zohoarc; b=CdPeH+DAh+Kg1V+a8oS4V3Nhq7AegZsYGWbkARLcye3vW0KmgAXiIRRGYKeuzYlI7i7h/XtoKK+SK85A0vIZslen2mdVVesw94Gj2AePCFFm6GP6TU3+18L5j62tXHFjcdsQGJxuOFihiBHa65yBuqzRgf5B7nmcetGVRrHt1mM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585694576; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=UH7tYpzOrwikIRxXRYyUx9EUtkUAEYlTjg15zSf9Ng0=; b=NjgC+9bgERJWZNw2vmaTjjq87F3+zanIGPeVwYcyPEcWte8sk2WQBr7crYnpU8kpBQaH3bWtxX60z2neUTl0fj78QHRnreeO1gYkmQ2Vm5ClK29XvykAELuUMQ6HiU9yrIOqJEjEns9efXigDST5jy2QXT03hH+CVzivMZYiYAM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56789+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 158569457693818.971374642650744; Tue, 31 Mar 2020 15:42:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id qeNnYY1788612xiDnx6v495I; Tue, 31 Mar 2020 15:42:56 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.418.1585694573550368246 for ; Tue, 31 Mar 2020 15:42:56 -0700 IronPort-SDR: kfRneH3S6cRv7dCCn4UQ4NsuSeGT7VUaJLex5Y9mlK9CC8rEcGoJuE3kVM6b9/65Q3Vi5yv9zS 31u/psnLumtQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2020 15:42:56 -0700 IronPort-SDR: T/C8TwJMhPc6jBG1FDWNfNkh2k2ZwL/pIvgbwTYrXgb7MUS/7G5tJ6e3/qFeZVgg+02i+U776f FbteQoc1jrKQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,329,1580803200"; d="scan'208";a="284168284" X-Received: from ecbjorge-mobl1.amr.corp.intel.com ([10.134.71.242]) by fmsmga002.fm.intel.com with ESMTP; 31 Mar 2020 15:42:55 -0700 From: "Bjorge, Erik C" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 3/7] EdkRepo: Update Checkout for archived combos Date: Tue, 31 Mar 2020 15:41:59 -0700 Message-Id: <7a505db71f781f656e061acb6a48204b893eb2f7.1585694095.git.erik.c.bjorge@intel.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,erik.c.bjorge@intel.com X-Gm-Message-State: e2FlhxDEQHhVW5kCpvnzHzWix1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1585694576; bh=QqUVdA08N+b7a7ktd1w37CFvC68W7Dnjab1nNjJ+tI4=; h=Cc:Date:From:Reply-To:Subject:To; b=dEwIOjpc3d6ORCGmccqeTnKRNWWcw4Fby04+yS37fVFCqIwpVZGRPwQgvZD/w0x5N3b U0xQZHwv56o3/16duyfwbfyR4vFP93pJ+GFJO/boLWucDEd3xn7ZmRraYGgRvjNeMMtAJ wd2ACVlq5gQ+O5BIZKBqB4KFMtsy55twxKg= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Now either an active or archived branch combination can be checked out. Signed-off-by: Erik Bjorge Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Reviewed-by: Ashley DeSimone Reviewed-by: Nate DeSimone --- edkrepo/common/common_repo_functions.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/edkrepo/common/common_repo_functions.py b/edkrepo/common/commo= n_repo_functions.py index 288dd27..160127b 100644 --- a/edkrepo/common/common_repo_functions.py +++ b/edkrepo/common/common_repo_functions.py @@ -494,8 +494,14 @@ def sort_commits(manifest, workspace_path, max_commits= =3DNone): return sorted_commit_list =20 =20 -def combination_is_in_manifest(combination, manifest): +def combinations_in_manifest(manifest): combination_names =3D [c.name for c in manifest.combinations] + combination_names.extend([c.name for c in manifest.archived_combinatio= ns]) + return combination_names + + +def combination_is_in_manifest(combination, manifest): + combination_names =3D combinations_in_manifest(manifest) return combination in combination_names =20 =20 @@ -557,7 +563,7 @@ def checkout(combination_or_sha, verbose=3DFalse, overr= ide=3DFalse, log=3DNone): combo_or_sha =3D combination_or_sha try: # Try to handle normalize combo name to match the manifest file. - combo_or_sha =3D case_insensitive_single_match(combo_or_sha, [x.na= me for x in manifest.combinations]) + combo_or_sha =3D case_insensitive_single_match(combo_or_sha, combi= nations_in_manifest()) except: # No match so leave it alone. It must be a SHA1 or a bad combo na= me. pass --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56789): https://edk2.groups.io/g/devel/message/56789 Mute This Topic: https://groups.io/mt/72688779/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Mon May 6 13:47:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+56790+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56790+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1585694580; cv=none; d=zohomail.com; s=zohoarc; b=S7PUPXShXWP9PPqfVoPJVHHcy+k0byrvl36o1Ks8hWI3P6hVC6d/YIa5dxTJs0tkbjehtrdKN55aACx8Kbo4AKS+DmDyIIOiE/IVBdxT1VYyFzmJ9mMHEsiOE8itUSoNeYDZyckfuvHf+7UylpsOUM4Ndfu5jUHm/8B4ue0ltZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585694580; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=KiLjMHi0S6xPuG9HCQlg58iXPL3bzcjzKozTohQ+jsU=; b=VW/BG7XRh1wRuillFwIvLFEGjVUjms4HVauUUFX2HQbPYX+rfEzwci/vLBgNkc+jTsnR1EajeeTYzsHoEU7Ne+OFlhwghh5cVVwQPjg1bluWMt29gXUUg6awEo30r2lebGWvx+pKl2qsOe8uW8LL4Tg7cBQm1qb5H3K3DP+1i28= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56790+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1585694580371306.53361611189086; Tue, 31 Mar 2020 15:43:00 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 2BoPYY1788612xxqLnL2n5U4; Tue, 31 Mar 2020 15:43:00 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.418.1585694573550368246 for ; Tue, 31 Mar 2020 15:42:59 -0700 IronPort-SDR: QHPMGEVssq5OEhJDeY9YnyfG2+6Nuz4cVEfJWtrTXmdCtIC7iYeSYZTf0QsA+pgkQpBFVG9CAK X56YkCYzl4uQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2020 15:42:59 -0700 IronPort-SDR: O4BCqe5Gxbm6MMs4veyPM/DXrFeiy64wX/zzapeKoji/MA2Vy8S382T81IagTfLEJXVXJ7jPCi zR4+hQGB6jOg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,329,1580803200"; d="scan'208";a="284168296" X-Received: from ecbjorge-mobl1.amr.corp.intel.com ([10.134.71.242]) by fmsmga002.fm.intel.com with ESMTP; 31 Mar 2020 15:42:59 -0700 From: "Bjorge, Erik C" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 4/7] EdkRepo: Update Sync for archived combos Date: Tue, 31 Mar 2020 15:42:00 -0700 Message-Id: <7272a3a9cb8c99bb47c02652ea621b7abe2ca26c.1585694095.git.erik.c.bjorge@intel.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,erik.c.bjorge@intel.com X-Gm-Message-State: M5qtzlKTVR88luWZ9J5WdRvCx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1585694580; bh=BotLKs/BgI0+Qx3SMf/4uvZTdziqnXLmlsE2h+L5WmI=; h=Cc:Date:From:Reply-To:Subject:To; b=mN9jnR3/lFcCUsJ4fEKWIAt0fzvDd1bss6WtWOcMs0fID4/tY1C7EZwl7HfMubV+uNs vUerD3wWm9B6d4y+lcPcejPN38fYC22N0QXlBEyW9lC2PetGlArCYUBUukPF6wkCRK/xC CHd7OINN8J1ZVcwuZCUluWyTcVlbruTKMoU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Added support for archived combos in Sync command. Signed-off-by: Erik Bjorge Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Reviewed-by: Ashley DeSimone Reviewed-by: Nate DeSimone --- edkrepo/commands/sync_command.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/edkrepo/commands/sync_command.py b/edkrepo/commands/sync_comma= nd.py index 71c600a..daa558f 100644 --- a/edkrepo/commands/sync_command.py +++ b/edkrepo/commands/sync_command.py @@ -3,7 +3,7 @@ ## @file # sync_command.py # -# Copyright (c) 2017- 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2017- 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # =20 @@ -19,7 +19,7 @@ from git import Repo # Our modules from edkrepo.commands.edkrepo_command import EdkrepoCommand from edkrepo.commands.edkrepo_command import DryRunArgument, SubmoduleSkip= Argument -import edkrepo.commands.arguments.sync_args as arguments +import edkrepo.commands.arguments.sync_args as arguments from edkrepo.common.progress_handler import GitProgressHandler from edkrepo.common.edkrepo_exception import EdkrepoUncommitedChangesExcep= tion, EdkrepoManifestNotFoundException from edkrepo.common.edkrepo_exception import EdkrepoManifestChangedExcepti= on @@ -38,7 +38,7 @@ from edkrepo.common.common_repo_functions import generate= _name_for_obsolete_back from edkrepo.common.common_repo_functions import update_editor_config from edkrepo.common.common_repo_functions import update_repo_commit_templa= te, get_latest_sha from edkrepo.common.common_repo_functions import has_primary_repo_remote, = fetch_from_primary_repo, in_sync_with_primary -from edkrepo.common.common_repo_functions import update_hooks, maintain_su= bmodules +from edkrepo.common.common_repo_functions import update_hooks, maintain_su= bmodules, combinations_in_manifest from edkrepo.common.common_repo_functions import write_included_config, re= move_included_config from edkrepo.common.ui_functions import init_color_console from edkrepo.config.config_factory import get_workspace_path, get_workspac= e_manifest, get_edkrepo_global_data_directory @@ -53,22 +53,22 @@ class SyncCommand(EdkrepoCommand): def get_metadata(self): metadata =3D {} metadata['name'] =3D 'sync' - metadata['help-text'] =3D arguments.COMMAND_DESCRIPTION + metadata['help-text'] =3D arguments.COMMAND_DESCRIPTION args =3D [] metadata['arguments'] =3D args args.append({'name' : 'fetch', 'positional' : False, 'required' : False, - 'help-text': arguments.FETCH_HELP}) + 'help-text': arguments.FETCH_HELP}) args.append({'name' : 'update-local-manifest', 'short-name': 'u', 'required' : False, - 'help-text' : arguments.UPDATE_LOCAL_MANIFEST_HELP}) + 'help-text' : arguments.UPDATE_LOCAL_MANIFEST_HELP}) args.append({'name' : 'override', 'short-name': 'o', 'positional' : False, 'required' : False, - 'help-text' : arguments.OVERRIDE_HELP}) + 'help-text' : arguments.OVERRIDE_HELP}) args.append(SubmoduleSkipArgument) return metadata =20 @@ -222,7 +222,7 @@ class SyncCommand(EdkrepoCommand): if initial_manifest_remotes[remote_name] !=3D new_manifest= _remotes[remote_name]: raise EdkrepoManifestChangedException(SYNC_URL_CHANGE.= format(remote_name)) #check to see if the currently checked out combo exists in the new= manifest. - new_combos =3D [c.name for c in new_manifest_to_check.combinations] + new_combos =3D combinations_in_manifest(new_manifest_to_check) if current_combo not in new_combos: raise EdkrepoManifestChangedException(SYNC_COMBO_CHANGE.format= (current_combo, = initial_manifest.project_info.codename)) --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56790): https://edk2.groups.io/g/devel/message/56790 Mute This Topic: https://groups.io/mt/72688781/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Mon May 6 13:47:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+56791+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56791+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1585694580; cv=none; d=zohomail.com; s=zohoarc; b=CBYxguHUNJwPUS9LocTUsxY1z2shtO/E05DON0QYW9HbrI6f/I1v4jvCNDmeX0IDym/XEJvlY40pIUWnk0fCSsfnCf4phFGT1zae5bNGZRzQwyLMLbNHZ9QiGp8nZbFttKOy+hrIKofUB648WFMUXlhpmdjQagYgLYfEhmOMi0A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585694580; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=u02/swX70uL7E80GuKE9yEOKGtghtHYvDw24XCCOfng=; b=WAp1U+zw5maJKM2f+DCJUg5kAdS7Qw5uM6JnZoO4mHQJ6/UGZcif86Y3s4j0n05rUlGwyhtp3Ahetc1qxReZmrOE5AD/tWs/OlOO4lC4WYZWrIOJf8yhZlr54y4tlvXcSZUzrQyZkkFNZjVCdL9p6gJ/q7WeEY9B58lMa21tzOw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56791+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1585694580717433.3546249456855; Tue, 31 Mar 2020 15:43:00 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id qinxYY1788612xxWyVjJ4eEd; Tue, 31 Mar 2020 15:43:00 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.418.1585694573550368246 for ; Tue, 31 Mar 2020 15:43:00 -0700 IronPort-SDR: y6jvYV3oA0pYtQiOLQdJmrSU6PZCsYQb5tA8WNCiRS51g95/3YjHeW30CsB9rEpsaQ4EVSYDWr NZHNUqPvLCfg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2020 15:42:59 -0700 IronPort-SDR: bGwRQq+A7I0lrbiwMGgyW0uX+ViU03KSFwPd0/1UX02KfdsJNVinEs9TbXGKuMP2c60Wi2lGAS C7SqWAQIp9JA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,329,1580803200"; d="scan'208";a="284168304" X-Received: from ecbjorge-mobl1.amr.corp.intel.com ([10.134.71.242]) by fmsmga002.fm.intel.com with ESMTP; 31 Mar 2020 15:42:59 -0700 From: "Bjorge, Erik C" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 5/7] EdkRepo: Update Checkout Pin for archived combos Date: Tue, 31 Mar 2020 15:42:01 -0700 Message-Id: <03d0594155577e47d537cb35f1a9dfe474108ab2.1585694095.git.erik.c.bjorge@intel.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,erik.c.bjorge@intel.com X-Gm-Message-State: 0fqq6F9va0ATPg0dZCR8SOcOx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1585694580; bh=+4cXgVDhzPingG7z/DW0GdxsDl5g5VNUXPBTxegGTGk=; h=Cc:Date:From:Reply-To:Subject:To; b=QM8i1S2rGEG2Mm/QZ4e+xvYnonNWBoJeFhGf9uGUXp+Sp8/9wBpcHANMMjapCdlJLPc 7cQ8D9t/rwZ1h3JEBVnmdNSPSzkjW3v5F3Mq1679sBKWTorRvdWvoyDQAfU8Jn76s/FB/ unPHSZLXwbp0g/mzfIzv9UfJgf3CpniLjdg= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Added support for archived combos in the Checkout Pin command. Signed-off-by: Erik Bjorge Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Reviewed-by: Ashley DeSimone Reviewed-by: Nate DeSimone --- edkrepo/commands/checkout_pin_command.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/edkrepo/commands/checkout_pin_command.py b/edkrepo/commands/ch= eckout_pin_command.py index a2afc41..858271a 100644 --- a/edkrepo/commands/checkout_pin_command.py +++ b/edkrepo/commands/checkout_pin_command.py @@ -15,7 +15,7 @@ from edkrepo.commands.edkrepo_command import EdkrepoComma= nd, OverrideArgument import edkrepo.commands.arguments.checkout_pin_args as arguments import edkrepo.commands.humble.checkout_pin_humble as humble from edkrepo.common.common_repo_functions import sparse_checkout_enabled, = reset_sparse_checkout, sparse_checkout -from edkrepo.common.common_repo_functions import check_dirty_repos, checko= ut_repos +from edkrepo.common.common_repo_functions import check_dirty_repos, checko= ut_repos, combinations_in_manifest from edkrepo.common.humble import SPARSE_CHECKOUT, SPARSE_RESET from edkrepo.common.edkrepo_exception import EdkrepoInvalidParametersExcep= tion, EdkrepoProjectMismatchException from edkrepo.config.config_factory import get_workspace_path, get_workspac= e_manifest @@ -89,7 +89,7 @@ class CheckoutPinCommand(EdkrepoCommand): raise EdkrepoProjectMismatchException(humble.MANIFEST_MISMATCH) elif not set(pin.remotes).issubset(set(manifest.remotes)): raise EdkrepoProjectMismatchException(humble.MANIFEST_MISMATCH) - elif pin.general_config.current_combo not in [c.name for c in mani= fest.combinations]: + elif pin.general_config.current_combo not in combinations_in_manif= est(manifest): raise EdkrepoProjectMismatchException(humble.MANIFEST_MISMATCH) combo_name =3D pin.general_config.current_combo pin_sources =3D pin.get_repo_sources(combo_name) --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56791): https://edk2.groups.io/g/devel/message/56791 Mute This Topic: https://groups.io/mt/72688782/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Mon May 6 13:47:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+56792+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56792+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1585694581; cv=none; d=zohomail.com; s=zohoarc; b=kBFT47FX6RonHhS4K2wTMcN2ZrUXb0W8cwcwFC0yP6Ja3YHr0FiitDPbsTJtHwXlkdvaYykKSlxW0bBELcmg1ZSYb4oLV3rmAUw2VjZ1p+6vRHiZ6KsJkRJFDsIr7ctWQqJbZ1k1wCRehgru2CFO6u5xN8MGbHvrXRy6R7t+8ic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585694581; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=yRsT2T8LyiabkGbuhOFy369pa1pHyrAaOYnbLdC3iRA=; b=m+BVUg5+0STB5Loo0toaQjRfWgPPnc38qwnetlBAV9fIFCiCz9Ppc7/X1LgVsRRD++t+FPNYZqyFdGzFPjv+Kx5dfBdjMTSQLlo+YsSIRXgPHXB+jhIOg8asPfYUKdVfsIXOkZBwzRHHLcOodf3xTC0KgMPne0At6uwhW3oeBTg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56792+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 15856945812873.91762303025007; Tue, 31 Mar 2020 15:43:01 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id i235YY1788612x3AQoi4263S; Tue, 31 Mar 2020 15:43:00 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.418.1585694573550368246 for ; Tue, 31 Mar 2020 15:43:00 -0700 IronPort-SDR: UDKaLcYme+uDuMAE5jpsJcIZDmydO1cDnPxcTIi08gy2VtsFiHEBlH5wCxge7b88R0miNXJEP5 s0Nw0egxG+nQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2020 15:43:00 -0700 IronPort-SDR: 9WO2/N3xBoCLSpxwvN1K50SbDOwQIlJAge/8LdchrpkK+a1u6fKm/eCIzCFZ3roJx6UPI3EfwU K1qHmnc1WdWQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,329,1580803200"; d="scan'208";a="284168313" X-Received: from ecbjorge-mobl1.amr.corp.intel.com ([10.134.71.242]) by fmsmga002.fm.intel.com with ESMTP; 31 Mar 2020 15:43:00 -0700 From: "Bjorge, Erik C" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 6/7] EdkRepo: Update clone for archived combos Date: Tue, 31 Mar 2020 15:42:02 -0700 Message-Id: <690979cacc2b662971cc805eab44bf74562e7236.1585694095.git.erik.c.bjorge@intel.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,erik.c.bjorge@intel.com X-Gm-Message-State: b64RYuLiSzaac5rB6OVSTzntx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1585694580; bh=sivuHWxihgnvntVjLtRl+ah2e/mrgaycqJWR3UkqsXM=; h=Cc:Date:From:Reply-To:Subject:To; b=cyohXIUH4uRVYdxJqqnIEBatoL2ttmIqHLv6ez3zM3mb3s8C1RNK1J4nyHpFP7/YiGp g+dMXTViYh4CC/WeXPPxVE0ifCcm6bCA/GaQioqzPwc3uCGfPo7PBSUVSF5ERdzBmP9fD WKUoOjaQnX2gYsuLEvSaGUQwSEN7BQ9whUc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Adding support for archived combos in the clone command. Signed-off-by: Erik Bjorge Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Reviewed-by: Ashley DeSimone Reviewed-by: Nate DeSimone --- edkrepo/commands/clone_command.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/edkrepo/commands/clone_command.py b/edkrepo/commands/clone_com= mand.py index 2400272..701a853 100644 --- a/edkrepo/commands/clone_command.py +++ b/edkrepo/commands/clone_command.py @@ -3,7 +3,7 @@ ## @file # clone_command.py # -# Copyright (c) 2017- 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2017- 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # =20 @@ -16,7 +16,7 @@ import edkrepo.commands.arguments.clone_args as arguments from edkrepo.common.common_repo_functions import pull_latest_manifest_repo= , clone_repos, sparse_checkout, verify_manifest_data from edkrepo.common.common_repo_functions import case_insensitive_single_m= atch, update_editor_config from edkrepo.common.common_repo_functions import write_included_config, wr= ite_conditional_include -from edkrepo.common.common_repo_functions import find_project_in_index +from edkrepo.common.common_repo_functions import find_project_in_index, co= mbinations_in_manifest from edkrepo.common.edkrepo_exception import EdkrepoInvalidParametersExcep= tion, EdkrepoManifestInvalidException from edkrepo.common.humble import CLONE_INVALID_WORKSPACE, CLONE_INVALID_P= ROJECT_ARG, CLONE_INVALID_COMBO_ARG from edkrepo.common.humble import SPARSE_CHECKOUT, CLONE_INVALID_LOCAL_ROO= TS @@ -99,7 +99,7 @@ class CloneCommand(EdkrepoCommand): combo_name =3D None if args.Combination is not None: try: - combo_name =3D case_insensitive_single_match(args.Combinat= ion, [x.name for x in manifest.combinations]) + combo_name =3D case_insensitive_single_match(args.Combinat= ion, combinations_in_manifest(manifest)) except: #remove the repo directory and Manifest.xml from the works= pace so the next time the user trys to clone #they will have an empty workspace and then raise an excep= tion --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56792): https://edk2.groups.io/g/devel/message/56792 Mute This Topic: https://groups.io/mt/72688783/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Mon May 6 13:47:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+56793+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56793+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1585694581; cv=none; d=zohomail.com; s=zohoarc; b=YYW9bseDizOExIJpcfoTJbYKtK4+4J5QBjjLEVvSTPlMBhZ7oIofUUhmCZzbNdEBGY71c3RuSCyLwXPpZpxszPa0UcmsLo440MjsxG/xWkumpSVt8RrQof9oMqCm1bgwl3JcP3g1SKzcNsUyXw/Mc+uZV/VMOrPXuvsNPLx0b3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585694581; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=q1rU67iV0BfZ7EXe6H+ogpq7nf1vmqAWl2GGQJrVvfE=; b=F+zRWf9KJYeZ55oDb4nDiicL7XS1R4HBzFZy19jBLYgfMNmoUBRUojrkVtMGgKuZ8lCRF+t2p9FgnQj6wSrV4kbH/z6AvgSqiBG0187bCKlZSAwOgdEUBBr9lsVa5uCUk9tEuNX7mwrahQuiivRJwNsrOTbqC1iy7cXAooefyGg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56793+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1585694581657169.37366166322806; Tue, 31 Mar 2020 15:43:01 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 5YiSYY1788612xmG41ZOKrX5; Tue, 31 Mar 2020 15:43:01 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.418.1585694573550368246 for ; Tue, 31 Mar 2020 15:43:00 -0700 IronPort-SDR: AAzxtaGDP4pMEvygssGMCu/vynrhD9GW8kSLB+e0aFlm5jBaxJBkJ8y3xbo+ANjHH6taoqU9z1 nN03sBqFN4ng== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2020 15:43:00 -0700 IronPort-SDR: wIhusH7BUtmS6mmtHvg5n5Xu+6KhP5AVMAjXnogO1W5mTLx0c20kIH49eG77xuJiHCv09+JY3u qQFX/Z6CF3kA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,329,1580803200"; d="scan'208";a="284168318" X-Received: from ecbjorge-mobl1.amr.corp.intel.com ([10.134.71.242]) by fmsmga002.fm.intel.com with ESMTP; 31 Mar 2020 15:43:00 -0700 From: "Bjorge, Erik C" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 7/7] EdkRepo: Update List Repos for archived combos Date: Tue, 31 Mar 2020 15:42:03 -0700 Message-Id: <71ddae1f98ff47c8f90e6d9fdf4967d3c1214100.1585694095.git.erik.c.bjorge@intel.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,erik.c.bjorge@intel.com X-Gm-Message-State: 8NlfJD9hcxZLf7K5c9bpPSxhx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1585694581; bh=O3gk440bBn1llzSW00kG1mRmTLaUlGbuJqhFOsXvXNY=; h=Cc:Date:From:Reply-To:Subject:To; b=oFStv7mgEf1XmIa/2+d6ZMjee8vKBGKwBhAoP5VwCjL0MmjivbLELchbEDVhYWAv9JZ BxsU6T3l9QSAGz6hRGQApQdgqrPpMtIZVrewPIN+iM+NKP9A4BSmmG/SsDae6mkRLwrVT 4rElDvkzKpOMIKkKM7AT6OVykpWbsIHWBKw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" When running the List Repos command archived combos will not be listed unless the archived flag is provided. Signed-off-by: Erik Bjorge Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Reviewed-by: Ashley DeSimone Reviewed-by: Nate DeSimone --- edkrepo/commands/list_repos_command.py | 37 ++++++++++++++++++-------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/edkrepo/commands/list_repos_command.py b/edkrepo/commands/list= _repos_command.py index caf0373..b06a493 100644 --- a/edkrepo/commands/list_repos_command.py +++ b/edkrepo/commands/list_repos_command.py @@ -3,7 +3,7 @@ ## @file # list_repos_command.py # -# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # =20 @@ -74,7 +74,10 @@ class ListReposCommand(EdkrepoCommand): xml_file =3D ci_index_xml.get_project_xml(project) manifest =3D ManifestXml(os.path.normpath(os.path.join(global_= manifest_directory, xml_file))) manifests[project] =3D manifest - for combo in [c.name for c in manifest.combinations]: + combo_list =3D [c.name for c in manifest.combinations] + if args.archived: + combo_list.extend([c.name for c in manifest.archived_combi= nations]) + for combo in combo_list: sources =3D manifest.get_repo_sources(combo) for source in sources: repo_urls.add(self.get_repo_url(source.remote_url)) @@ -84,7 +87,7 @@ class ListReposCommand(EdkrepoCommand): project_justify =3D len(max(manifests.keys(), key=3Dlen)) =20 #Determine the names of the repositories - self.generate_repo_names(repo_urls, manifests) + self.generate_repo_names(repo_urls, manifests, args.archived) print(humble.REPOSITORIES) =20 #If the user provided a list of repositories to view, check to mak= e sure @@ -103,7 +106,10 @@ class ListReposCommand(EdkrepoCommand): #Determine the list of branches that used by any branch combin= ation in any manifest branches =3D set() for project_name in manifests: - for combo in [c.name for c in manifests[project_name].comb= inations]: + combo_list =3D [c.name for c in manifests[project_name].co= mbinations] + if args.archived: + combo_list.extend([c.name for c in manifests[project_n= ame].archived_combinations]) + for combo in combo_list: sources =3D manifests[project_name].get_repo_sources(c= ombo) for source in sources: if self.get_repo_url(source.remote_url) =3D=3D rep= o: @@ -124,7 +130,10 @@ class ListReposCommand(EdkrepoCommand): #Determine the branch combinations that use that branch for project_name in manifests: combos =3D [] - for combo in [c.name for c in manifests[project_name].= combinations]: + combo_list =3D [c.name for c in manifests[project_name= ].combinations] + if args.archived: + combo_list.extend([c.name for c in manifests[proje= ct_name].archived_combinations]) + for combo in combo_list: sources =3D manifests[project_name].get_repo_sourc= es(combo) for source in sources: if self.get_repo_url(source.remote_url) =3D=3D= repo and source.branch =3D=3D branch: @@ -165,11 +174,11 @@ class ListReposCommand(EdkrepoCommand): return name raise EdkrepoInvalidParametersException(humble.REPO_NAME_NOT_FOUND) =20 - def generate_repo_names(self, repo_urls, manifests): + def generate_repo_names(self, repo_urls, manifests, archived=3DFalse): #Determine the names of the repositories self.repo_names =3D collections.OrderedDict() for repo_url in repo_urls: - self.__repo_name_worker(repo_url, manifests) + self.__repo_name_worker(repo_url, manifests, archived) =20 #Sort the git repositories so they will be displayed alphabetically self.repo_names =3D collections.OrderedDict(sorted(self.repo_names= .items())) @@ -188,12 +197,15 @@ class ListReposCommand(EdkrepoCommand): for name_to_move in names_to_move: self.repo_names.move_to_end(name_to_move, False) =20 - def __repo_name_worker(self, repo_url, manifests): + def __repo_name_worker(self, repo_url, manifests, archived=3DFalse): #This is a heuristic that guesses the "name" of a repository by lo= oking #at the name given to it by the most manifest files. names =3D collections.defaultdict(int) for project_name in manifests: - for combo in [c.name for c in manifests[project_name].combinat= ions]: + combo_list =3D [c.name for c in manifests[project_name].combin= ations] + if archived: + combo_list.extend([c.name for c in manifests[project_name]= .archived_combinations]) + for combo in combo_list: sources =3D manifests[project_name].get_repo_sources(combo) for source in sources: if self.get_repo_url(source.remote_url) =3D=3D repo_ur= l: @@ -209,7 +221,10 @@ class ListReposCommand(EdkrepoCommand): #If only 1 project uses this name, then append the pro= ject #name to the directory name to create the repo name for project_name in manifests: - for combo in [c.name for c in manifests[project_na= me].combinations]: + combo_list =3D [c.name for c in manifests[project_= name].combinations] + if archived: + combo_list.extend([c.name for c in manifests[p= roject_name].archived_combinations]) + for combo in combo_list: sources =3D manifests[project_name].get_repo_s= ources(combo) for source in sources: if self.get_repo_url(source.remote_url) = =3D=3D repo_url and source.root =3D=3D original_best_name: @@ -239,7 +254,7 @@ class ListReposCommand(EdkrepoCommand): del self.repo_names[best_name] found_unique_name =3D True self.repo_names[best_name] =3D (repo_url, best_nam= e_frequency) - self.__repo_name_worker(old_repo_url, manifests) + self.__repo_name_worker(old_repo_url, manifests, a= rchived) else: #Use the name given by the second most manifest fi= les del names[best_name] --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56793): https://edk2.groups.io/g/devel/message/56793 Mute This Topic: https://groups.io/mt/72688784/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-