From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.4485.1590632233088604201 for ; Wed, 27 May 2020 19:17:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=YO8PAVgq; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: Ts/3UzLvDNoQFPkvvYb3yHkxunBmBJUZl6JYKay0ykbnzCHtkx5DBeO0Wpf/cMeQdEScto2xG4 Zajw8/0b/LKw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 May 2020 19:17:12 -0700 IronPort-SDR: vsNtONNITTobFb29XWrOC+OVXpRpKJVgnCofQCu0frBFOak7pC3hxusIEwgOpFoSwsAQu51xmI fRYx48yBDtnQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,443,1583222400"; d="scan'208";a="302309943" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga002.fm.intel.com with ESMTP; 27 May 2020 19:17:12 -0700 Received: from fmsmsx114.amr.corp.intel.com (10.18.116.8) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 27 May 2020 19:17:11 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by FMSMSX114.amr.corp.intel.com (10.18.116.8) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 27 May 2020 19:17:11 -0700 Received: from NAM04-SN1-obe.outbound.protection.outlook.com (104.47.44.53) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 27 May 2020 19:17:11 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SzHAlflXTn8l0PvMj4zzQYo6cx24NAbg3HtiDpzpio9Nr4YiNprDFaRdUsyEQ/qXgSEM8XAZ12dr1bUaqgT50AAdvwogKCWvMQWUEGsVqqyo/O8B/s0EEFYOOXWUO+TxSzEtGvlEg19Y1IxuA5vxgnyzG6OYhyPhY1BpRiCfvd8uW26rhSWqbm4+LbdMtoiZszVgaTlRZo3X6CwO8Qkn09/PzZ+GVLHM6aZaXxsB5L9a228+IfKbhsVKOjhLoSzz3HHTEPDzvffwIPxFB7HBOTEB2tmwee6VnlJrXBYb82eMFRQ1zzXsoyBd8skHYnBwq/SHPaEPDg6paQ5eBWOsbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HM9M+HiPnIJMNmg2iPQDwxGmv/+T1XPawSLai7cOYG0=; b=GLQuDy69VKv+DqX1TjqfhZXfW7VGhNHmo6gP3VlLIFef9zs4wbpaLzm+a026dDCcjAGjF5alnWzFrD7AJ+UEZpOGnI98Y8ua7joPumKnZRCNweKTTWimLw9NSukIUrPA7+UhwrQgeFYwtUS8IjxAmREQYfisUftg+VrqcdKUyGn1IezEmMyms30a4ljA1xaB/Pyu9hmY+cIChGFpWl2wD2EIerdN3SwINisaHmnT1yMfwLjREAALHZwkMB+ZJp4YUls3nX+W5yWcj5I+ygRY/5XIpi5af7cfwAeUhGQyAsZlXIYVtYMqeNTkwoAxfhrLP8Zzs5WK0uZHCPgQHwFbZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HM9M+HiPnIJMNmg2iPQDwxGmv/+T1XPawSLai7cOYG0=; b=YO8PAVgq57sQ444VokpCx24IzO3sPrQyBMeYfDPrkbw0q6fJKCKGKNCBRabQCou7yXH32yRpA1gqJq6wsYThHn52/cXf6BqBhfoZlXjPSMt0kvfV9sFmfFdrtbFwSwXiZgj8+ldQ/K1s0s51pXLf8J6zKxxwK0f0I2E3i2qcUIM= Received: from BY5PR11MB3973.namprd11.prod.outlook.com (2603:10b6:a03:185::29) by BY5PR11MB4436.namprd11.prod.outlook.com (2603:10b6:a03:1c3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.27; Thu, 28 May 2020 02:17:09 +0000 Received: from BY5PR11MB3973.namprd11.prod.outlook.com ([fe80::296a:eb1c:2b52:2904]) by BY5PR11MB3973.namprd11.prod.outlook.com ([fe80::296a:eb1c:2b52:2904%7]) with mapi id 15.20.3021.030; Thu, 28 May 2020 02:17:09 +0000 From: "Ashley E Desimone" To: "Bjorge, Erik C" , "devel@edk2.groups.io" CC: "Desimone, Nathaniel L" , "Pandya, Puja" , Bret Barkelew , "Agyeman, Prince" Subject: Re: [edk2-staging/EdkRepo] [PATCH v2 2/2] EdkRepo: Update commands to use new submodule code Thread-Topic: [edk2-staging/EdkRepo] [PATCH v2 2/2] EdkRepo: Update commands to use new submodule code Thread-Index: AQHWLieyT36ary+3nEqSfpehE29p56i8z7gw Date: Thu, 28 May 2020 02:17:09 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.2.0.6 dlp-reaction: no-action dlp-product: dlpe-windows authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [134.134.136.201] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5251493d-1347-45a7-54c1-08d802ad3a01 x-ms-traffictypediagnostic: BY5PR11MB4436: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:873; x-forefront-prvs: 0417A3FFD2 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 5d64t8kCOCjQTazVBEUiWHbVgDiYECUu4XxSN42ugTrLXYz9u3QrrL+WPz9RciZgJrCh0AnCTymKk34UkpXmzlZWTHEcw8rx6mrdymaUkI905mjmd4DH9D78+iZ7K8JdYfjDzsc3K4GjUCtJEx+C9luEh9hQrS5SjNfXckLAjXNxT3qImozr9mG3Hr9NvZ4HroIdz1Y0bhc2KTaczaJshsSP7ehSgKMp3eh+/GIeF9ASCiOzB2tNSnKacVkq4W4Fo0FBR8VPm8fiqOxF7+ym/IEBEjVxowpUNg6R3XutrCdV2fgemt3mWU+qCdI4K21moZSqrIoRD0997g2aX34jcw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR11MB3973.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(39860400002)(136003)(396003)(366004)(376002)(346002)(110136005)(478600001)(316002)(54906003)(52536014)(33656002)(8676002)(15650500001)(9686003)(8936002)(86362001)(7696005)(107886003)(5660300002)(4326008)(71200400001)(2906002)(186003)(30864003)(55016002)(26005)(64756008)(6506007)(83380400001)(53546011)(66946007)(66446008)(76116006)(66556008)(66476007);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: 12o7om4B6GrV9RTOLldpSmBIafzTd4J2kXhJ+p6hFjDzI8pnPT35GH2cClW1xtzei50pbPRmmQBU6b/vwl6zzHm47HRrR/P6v0frO+9kmkke+UllvI7wDpvYZ2emM/2yD4NigLk67BkX+rMVXp+lQjmDGycJP0NvnciYzf7uZqwbvdVf9xUK3A801nL9qYSW1J8IRNYZ0efXpYiW96iIj6hT971onkRNjSsS8m/MrDafi8+j+48MTQxp3sJfoEkNkXp3GMUJmhS+CwQlYg7EfOAeKxF2If+Y0wYFd4PWdpbr/rvPqkCzauV/WRrbC3gHu/tRoa3HLNwIYHNKm1a5Jl3+ADWjWuxyCdd73A3vb6jKOKG3/DFWnJ408cIt23+K+39fFwimtwDW7lJh4MHtf667++IOlCRiD4A4vZYHm+moAzUR43CDcwNYODV52ZpaljFmD8JLiZW4HTNZSKV5rGIfYMDCsllKsE+n1GP+PJ5NGgwSbmKFGxWBqcOF0c4Y MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 5251493d-1347-45a7-54c1-08d802ad3a01 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 May 2020 02:17:09.6959 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: vmvMBoLzkPR8xoOYizxC0I9Y/pLdvLrO0Fpd/mXuziOlH8YPlFpyWoGaYJm8qcqFlQQ2eDKCpF0xnZFo4rQMrfSKn5az+t9ncTwY73m9fgE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4436 Return-Path: ashley.e.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Pushed: ddb92ec59bfb872a8f69442f99faf64619e2f751 -----Original Message----- From: Bjorge, Erik C =20 Sent: Tuesday, May 19, 2020 2:51 PM To: devel@edk2.groups.io Cc: Desimone, Ashley E ; Desimone, Nathaniel L= ; Pandya, Puja ; Br= et Barkelew ; Agyeman, Prince Subject: [edk2-staging/EdkRepo] [PATCH v2 2/2] EdkRepo: Update commands to = use new submodule code Replaced use of maintain_submodules to use new common code. This allows fo= r selective submodule initialization via the manifest file. Cc: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Cc: Erik Bjorge Signed-off-by: Erik Bjorge --- edkrepo/commands/checkout_pin_command.py | 6 ++++ edkrepo/commands/clone_command.py | 20 +++++++---- edkrepo/commands/sync_command.py | 25 +++++++++----- edkrepo/common/common_repo_functions.py | 43 +++++------------------- 4 files changed, 45 insertions(+), 49 deletions(-) diff --git a/edkrepo/commands/checkout_pin_command.py b/edkrepo/commands/ch= eckout_pin_command.py index 4aaf2b5..9d7346a 100644 --- a/edkrepo/commands/checkout_pin_command.py +++ b/edkrepo/commands/checkout_pin_command.py @@ -22,6 +22,8 @@ from edkrepo.common.workspace_maintenance.manifest_repos_= maintenance import list from edkrepo.common.workspace_maintenance.manifest= _repos_maintenance import find_source_manifest_repo from edkrepo.config.co= nfig_factory import get_workspace_path, get_workspace_manifest from edkrep= o_manifest_parser.edk_manifest import ManifestXml +from project_utils.submodule import deinit_submodules,=20 +maintain_submodules + =20 class CheckoutPinCommand(EdkrepoCommand): def __init__(self): @@ -68,11 +70,15 @@ class CheckoutPinCommand(EdkrepoCommand): if sparse_enabled: print(SPARSE_RESET) reset_sparse_checkout(workspace_path, manifest_sources) + submodule_combo =3D pin.general_config.current_combo + deinit_submodules(workspace_path, manifest, manifest.general_confi= g.current_combo, + pin, submodule_combo, args.verbose) pin_repo_sources =3D pin.get_repo_sources(pin.general_config.curre= nt_combo) try: checkout_repos(args.verbose, args.override, pin_repo_sources, = workspace_path, manifest) manifest.write_current_combo(humble.PIN_COMBO.format(args.pinf= ile)) finally: + maintain_submodules(workspace_path, pin, submodule_combo,=20 + args.verbose) if sparse_enabled: print(SPARSE_CHECKOUT) sparse_checkout(workspace_path, pin_repo_sources, manifest= ) diff --git a/edkrepo/commands/clone_command.py b/edkrepo/commands/clone_c= ommand.py index 3f2e6e1..f638090 100644 --- a/edkrepo/commands/clone_command.py +++ b/edkrepo/commands/clone_command.py @@ -25,6 +25,7 @@ from edkrepo.common.workspace_maintenance.manifest_repos_= maintenance import pull from edkrepo.common.workspace_maintenance.manifest= _repos_maintenance import list_available_manifest_repos from edkrepo.commo= n.workspace_maintenance.humble.manifest_repos_maintenance_humble import PRO= J_NOT_IN_REPO, SOURCE_MANIFEST_REPO_NOT_FOUND from edkrepo_manifest_parser= .edk_manifest import CiIndexXml, ManifestXml +from project_utils.submodule import maintain_submodules =20 =20 class CloneCommand(EdkrepoCommand): @@ -108,7 +109,6 @@ class CloneCommand(EdkrepoCommand): manifest =3D ManifestXml(local_manifest_path) =20 # Process the combination name and make sure it can be found in th= e manifest - combo_name =3D None if args.Combination is not None: try: combo_name =3D case_insensitive_single_match(args.Combinat= ion, combinations_in_manifest(manifest)) @@ -122,13 +122,15 @@ class CloneCommand(EdkrepoCommand): # Since pin files are subset of manifest files they do not hav= e a "default combo" it is set to None. In this # case use the current_combo instead. combo_name =3D manifest.general_config.current_combo + else: + # If a combo was not specified or a pin file used the default = combo should be cloned. Also ensure that the + # current combo is updated to match. + combo_name =3D manifest.general_config.default_combo + manifest.write_current_combo(combo_name) =20 # Get the list of repos to clone and clone them - manifest_config =3D manifest.general_config - if combo_name: - repo_sources_to_clone =3D manifest.get_repo_sources(combo_name= ) - else: - repo_sources_to_clone =3D manifest.get_repo_sources(manifest_c= onfig.default_combo) + repo_sources_to_clone =3D manifest.get_repo_sources(combo_name) + #check that the repo sources do not contain duplicated local roots local_roots =3D [r.root for r in repo_sources_to_clone] for root in local_roots: @@ -141,7 +143,11 @@ class CloneCommand(EdkrepoCommand): # Set up submodule alt url config settings prior to cloning any re= pos submodule_included_configs =3D write_included_config(manifest.remo= tes, manifest.submodule_alternate_remotes, local_manifest_dir) write_conditional_include(workspace_dir, repo_sources_to_clone, su= bmodule_included_configs) - clone_repos(args, workspace_dir, repo_sources_to_clone, project_cl= ient_side_hooks, config, args.skip_submodule, manifest) + clone_repos(args, workspace_dir, repo_sources_to_clone,=20 + project_client_side_hooks, config, manifest) + + # Init submodules + if not args.skip_submodule: + maintain_submodules(workspace_dir, manifest, combo_name,=20 + args.verbose) =20 # Perform a sparse checkout if requested. use_sparse =3D args.sparse diff --git a/edkrepo/commands/sync_command.py b/edkrepo/commands/sync_comma= nd.py index b662c62..13b46e8 100644 --- a/edkrepo/commands/sync_command.py +++ b/edkrepo/commands/sync_command.py @@ -38,7 +38,7 @@ from edkrepo.common.common_repo_functions import checkout= _repos, check_dirty_rep from edkrepo.common.common_repo_functions import u= pdate_editor_config from edkrepo.common.common_repo_functions import updat= e_repo_commit_template, get_latest_sha from edkrepo.common.common_repo_fun= ctions import has_primary_repo_remote, fetch_from_primary_repo, in_sync_wit= h_primary -from edkrepo.common.common_repo_functions import update_hooks, m= aintain_submodules, combinations_in_manifest +from edkrepo.common.common_repo_functions import update_hooks,=20 +combinations_in_manifest from edkrepo.common.common_repo_functions import write_included_config, re= move_included_config from edkrepo.common.workspace_maintenance.workspace_m= aintenance import generate_name_for_obsolete_backup from edkrepo.common.wo= rkspace_maintenance.manifest_repos_maintenance import pull_workspace_manife= st_repo @@ -48,6 +48,7 @@ from edkrepo.common.ui_functions import init_colo= r_console from edkrepo.config.config_factory import get_workspace_path, ge= t_workspace_manifest, get_edkrepo_global_data_directory from edkrepo.confi= g.config_factory import get_workspace_manifest_file from edkrepo_manifest_= parser.edk_manifest import CiIndexXml, ManifestXml +from project_utils.submodule import deinit_submodules,=20 +maintain_submodules =20 =20 class SyncCommand(EdkrepoCommand): @@ -84,6 +85,7 @@ class SyncCommand(EdkrepoCommand): current_combo =3D initial_manifest.general_config.current_combo initial_sources =3D initial_manifest.get_repo_sources(current_comb= o) initial_hooks =3D initial_manifest.repo_hooks + initial_combo =3D current_combo =20 source_global_manifest_repo =3D find_source_manifest_repo(initial_= manifest, config['cfg_file'], config['user_cfg_file'], args.source_manifest= _repo) pull_workspace_manifest_repo(initial_manifest, config['cfg_file'],= config['user_cfg_file'], args.source_manifest_repo, False) @@ -100,6 +102,= 7 @@ class SyncCommand(EdkrepoCommand): if not args.update_local_manifest: self.__check_for_new_manifest(args, config, initial_manifest, = workspace_path, global_manifest_directory) check_dirty_repos(initial_manifest, workspace_path) + # Determine if sparse checkout needs to be disabled for this opera= tion sparse_settings =3D initial_manifest.sparse_settings sparse_enabled =3D sparse_checkout_enabled(workspace_path, initial= _sources) @@ -113,7 +116,7 @@ class SyncCommand(EdkrepoCommand): reset_sparse_checkout(workspace_path, initial_sources) =20 # Get the latest manifest if requested - if args.update_local_manifest: #NOTE: hyphens in arg name replaced= with underscores due to argparse + if args.update_local_manifest: # NOTE: hyphens in arg name=20 + replaced with underscores due to argparse self.__update_local_manifest(args, config, initial_manifest, w= orkspace_path, global_manifest_directory) manifest =3D get_workspace_manifest() if args.update_local_manifest: @@ -127,6 +130,12 @@ class SyncCommand(EdkrepoCommand): repo_sources_to_sync =3D manifest.get_repo_sources(current_com= bo) manifest.write_current_combo(current_combo) =20 + # At this point both new and old manifest files are ready so we ca= n deinit any + # submodules that are removed due to a manifest update. + if not args.skip_submodule: + deinit_submodules(workspace_path, initial_manifest, initial_co= mbo, + manifest, current_combo, args.verbose) + sync_error =3D False # Calculate the hooks which need to be updated, added or removed f= or the sync if args.update_local_manifest: @@ -195,16 +204,16 @@ class SyncCommand(EdkrepoCommand): elif args.verbose: print(NO_SYNC_DETACHED_HEAD.format(repo_to_sync.root)) =20 - if not args.skip_submodule: - if repo_to_sync.enable_submodule: - # Perform submodule updates and url redirection - maintain_submodules(repo_to_sync, repo) # Update commit message templates - update_repo_commit_template(workspace_path, repo, repo_to_sync= , config, global_manifest_directory) + update_repo_commit_template(workspace_path, repo,=20 + repo_to_sync, config, global_manifest_directory) =20 if sync_error: print(SYNC_ERROR) =20 + # Initialize submodules + if not args.skip_submodule: + maintain_submodules(workspace_path, manifest,=20 + current_combo, args.verbose) + # Restore sparse checkout state if sparse_enabled: print(SPARSE_CHECKOUT) @@ -326,7 +335,7 @@ class SyncCommand(EdkrepoCommand): print(path_to_source) if len(sources_to_remove) > 0: print(SYNC_REMOVE_LIST_END_FORMATTING) - clone_repos(args, workspace_path, sources_to_clone, new_manife= st_to_check.repo_hooks, config, args.skip_submodule, new_manifest_to_check) + clone_repos(args, workspace_path, sources_to_clone,=20 + new_manifest_to_check.repo_hooks, config, new_manifest_to_check) # Make a list of and only checkout repos that were newly clone= d. Sync keeps repos on their initial active branches # cloning the entire combo can prevent existing repos from cor= rectly being returned to their proper branch repos_to_checkout =3D [] diff --git a/edkrepo/common/common_repo_functions.py b/edkrepo/common/commo= n_repo_functions.py index 61133f1..8c79f3d 100644 --- a/edkrepo/common/common_repo_functions.py +++ b/edkrepo/common/common_repo_functions.py @@ -68,12 +68,13 @@ from edkrepo_manifest_parser.edk_manifest_validation im= port validate_manifestrep from edkrepo_manifest_parser.edk_manifest_valida= tion import get_manifest_validation_status from edkrepo_manifest_parser.ed= k_manifest_validation import print_manifest_errors from edkrepo_manifest_p= arser.edk_manifest_validation import validate_manifestfiles +from project_utils.submodule import deinit_submodules,=20 +maintain_submodules =20 CLEAR_LINE =3D '\x1b[K' DEFAULT_REMOTE_NAME =3D 'origin' PRIMARY_REMOTE_NAME =3D 'primary' =20 -def clone_repos(args, workspace_dir, repos_to_clone, project_client_side_h= ooks, config, skip_submodule, manifest): +def clone_repos(args, workspace_dir, repos_to_clone, project_client_side_h= ooks, config, manifest): for repo_to_clone in repos_to_clone: local_repo_path =3D os.path.join(workspace_dir, repo_to_clone.root= ) local_repo_url =3D repo_to_clone.remote_url @@ -108,10 +109,6 @@ d= ef clone_repos(args, workspace_dir, repos_to_clone, project_client_side_hoo= ks, else: raise EdkrepoManifestInvalidException(MISSING_BRANCH_COMMIT) =20 - if not skip_submodule: - if repo_to_clone.enable_submodule: - maintain_submodules(repo_to_clone, repo, args.verbose) - try: if 'source_manifest_repo' in vars(args).keys(): src_manifest_repo =3D find_source_manifest_repo(manifest, = config['cfg_file'], config['user_cfg_file'], args.source_manifest_repo) @@ = -184,32 +181,6 @@ def write_conditional_include(workspace_path, repo_source= s, included_configs): gitglobalconfig.add_section(section) gitglobalconfig.set(section, 'path', path) =20 -def maintain_submodules(repo_sources, repo, verbose =3D False): - try: - output_data =3D repo.git.execute(['git', 'submodule', 'init'], wit= h_extended_output=3DTrue, with_stdout=3DTrue) - if verbose and output_data[0]: - print(output_data[0]) - if output_data[1]: - print(output_data[1]) - if verbose and output_data[2]: - print(output_data[2]) - output_data =3D repo.git.execute(['git', 'submodule', 'sync', '--r= ecursive'], with_extended_output=3DTrue, with_stdout=3DTrue) - if verbose and output_data[0]: - print(output_data[0]) - if output_data[1]: - print(output_data[1]) - if verbose and output_data[2]: - print(output_data[2]) - output_data =3D repo.git.execute(['git', 'submodule', 'update', '-= -recursive'], with_extended_output=3DTrue, with_stdout=3DTrue) - if verbose and output_data[0]: - print(output_data[0]) - if output_data[1]: - print(output_data[1]) - if verbose and output_data[2]: - print(output_data[2]) - except: - raise EdkrepoGitException(SUBMODULE_FAILURE.format(repo_sources.re= mote_name)) - def install_hooks(hooks, local_repo_path, repo_for_install, config, global= _manifest_directory): # Determine the which hooks are for the repo in question and which are= from a URL based source or are in a global # manifest repo relative path @@ -399,9 +370,6 @@ def checkout_repos(verbose, override, repos_to_checkout= , workspace_path, manifes else: raise EdkrepoManifestInvalidException(MISSING_BRANCH_COMMIT) =20 - if repo_to_checkout.enable_submodule: - maintain_submodules(repo_to_checkout, repo, verbose) - def validate_manifest_repo(manifest_repo, verbose=3DFalse, archived=3DFals= e): print(VERIFY_GLOBAL) if archived: @@ -514,9 +482,11 @@ def checkout(combination_or_sha, verbose=3DFalse, over= ride=3DFalse, log=3DNone): # Create combo_or_sha so we have original input and do not introduce a= ny # unintended behavior by messing with parameters. combo_or_sha =3D combination_or_sha + submodule_combo =3D manifest.general_config.current_combo try: # Try to handle normalize combo name to match the manifest file. combo_or_sha =3D case_insensitive_single_match(combo_or_sha, combi= nations_in_manifest(manifest)) + submodule_combo =3D combo_or_sha except: # No match so leave it alone. It must be a SHA1 or a bad combo na= me. pass @@ -528,6 +498,10 @@ def checkout(combination_or_sha, verbose=3DFalse, over= ride=3DFalse, log=3DNone): log=3Dlog) initial_repo_sources =3D manifest.get_repo_sources(manifest.general_co= nfig.current_combo) =20 + # Deinit any submodules that have been removed. + deinit_submodules(workspace_path, manifest, manifest.general_config.cu= rrent_combo, + manifest, submodule_combo, verbose) + # Disable sparse checkout current_repos =3D initial_repo_sources sparse_enabled =3D sparse_checkout_enabled(workspace_path, initial_rep= o_sources) @@ -566,6 +540,7 @@ def checkout(combination_or_sha, verbose=3DF= alse, override=3DFalse, log=3DNone): # Return to the initial combo, since there was an issue with cheki= ng out the selected combo checkout_repos(verbose, override, initial_repo_sources, workspace_= path, manifest) finally: + maintain_submodules(workspace_path, manifest, submodule_combo,=20 + verbose) if sparse_enabled or sparse_diff: print(SPARSE_CHECKOUT) sparse_checkout(workspace_path, current_repos, manifest) -- 2.21.0.windows.1