From 3ac55bcdf049ce58ff9185f8fdd0e63952c1fc7f Mon Sep 17 00:00:00 2001 From: Nodir Turakulov Date: Wed, 23 Jun 2021 18:41:46 +0000 Subject: [PATCH] Revert "[dirmd] Roll dirmd" This reverts commit 74ef838a40d8fecac485416f1a1fb07f9aeb6fd1. Reason for revert: b/191388102 Original change's description: > [dirmd] Roll dirmd > > This CL picks up > 1. DIR_METADATA discovery optimization, based on git-ls-files > 2. Mixin support > 3. New subcommand "read" that supersedes "export" and "compute" > > Last time it was reverted because depot_tools->src got blocked, because > dirmd was used in Swarming task. The latter was resolved in > https://chromium-review.googlesource.com/c/chromium/src/+/2921324 > > Bug: 1201822, 1179786 > Change-Id: I76a580c5d60b506c1f015890fc07817de553975d > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2965866 > Commit-Queue: Nodir Turakulov > Reviewed-by: Dirk Pranke Bug: 1201822, 1179786 Change-Id: I6d73267278802a424a6513357f0adda191317535 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2983385 Bot-Commit: Rubber Stamper Commit-Queue: Nodir Turakulov Reviewed-by: Dirk Pranke --- cipd_manifest.txt | 2 +- cipd_manifest.versions | 52 +++++++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cipd_manifest.txt b/cipd_manifest.txt index 852591a1e..ce4dc83fc 100644 --- a/cipd_manifest.txt +++ b/cipd_manifest.txt @@ -67,7 +67,7 @@ infra/goma/client/${os=linux,windows}-${arch=amd64} git_revision:93f92a71431849b infra/goma/client/${os=mac}-${arch} git_revision:93f92a71431849be697d91c74052595a56c237e6 # dirmd, a tool to work with DIR_METADATA files -infra/tools/dirmd/${platform} git_revision:97e10874b85b9f1196cdeac4fcf120f7b8210cc4 +infra/tools/dirmd/${platform} git_revision:c7072c98f7ac3ce1998542cc5637bdc54f908f4a # Pinpoint CLI infra/chromeperf/pinpoint/${platform} git_revision:a16d4a545857c36165e543c8e757392b18b7ddf9 diff --git a/cipd_manifest.versions b/cipd_manifest.versions index 86d63f355..3a3041e93 100644 --- a/cipd_manifest.versions +++ b/cipd_manifest.versions @@ -126,56 +126,56 @@ infra/tools/bb/windows-amd64 B__VpnkTIRXnZyy1hueecfk78ZCZEBIQV2bgMn-ZIooC infra/tools/dirmd/linux-386 - git_revision:97e10874b85b9f1196cdeac4fcf120f7b8210cc4 - 3XAwFie4RIaIAUs5x0IFvQo2IROOBm_YqSjLa3FhsB8C + git_revision:c7072c98f7ac3ce1998542cc5637bdc54f908f4a + SJ0WZTj7bENc3wxKx2FwLeChYjPWW-h8ZXccseKKoXUC infra/tools/dirmd/linux-amd64 - git_revision:97e10874b85b9f1196cdeac4fcf120f7b8210cc4 - Ul7c7UElOTOyW1BEnnb2cuszp3UTA-PWjiYryjvHy1AC + git_revision:c7072c98f7ac3ce1998542cc5637bdc54f908f4a + X4YQERXASA7MDmlC0FC7NKYQx6aDokbob0pLvx_46RAC infra/tools/dirmd/linux-arm64 - git_revision:97e10874b85b9f1196cdeac4fcf120f7b8210cc4 - WGoHmbGHw4JRUqJ4FQ5lPRVeal-IRhcuivW-ifuWvgIC + git_revision:c7072c98f7ac3ce1998542cc5637bdc54f908f4a + 0eJs7c8HvgTuyb-XBeAvPeMMyHABhrusJo6zJWSxyTMC infra/tools/dirmd/linux-armv6l - git_revision:97e10874b85b9f1196cdeac4fcf120f7b8210cc4 - cbzFiLDkjmgI9cpLGxal-cBKbTV8xEMdN1lz_NGppV0C + git_revision:c7072c98f7ac3ce1998542cc5637bdc54f908f4a + x9cFs5znQVbsXs9SLMrktqbUn0ML-WANQOM4u7BVutsC infra/tools/dirmd/linux-mips64 - git_revision:97e10874b85b9f1196cdeac4fcf120f7b8210cc4 - 3UJxYe6MLTRfIKmRaTGPocAGAfK_sg-gX7ukyIbsaWgC + git_revision:c7072c98f7ac3ce1998542cc5637bdc54f908f4a + -rp2QLvL3e8nnRE2xbYYAKcHqVtmpduGc6Xi7WlyI2UC infra/tools/dirmd/linux-mips64le - git_revision:97e10874b85b9f1196cdeac4fcf120f7b8210cc4 - 8oWZftmAi9bKTj2xDSQuFfhsLzuEn2_MsA-nHelRF1gC + git_revision:c7072c98f7ac3ce1998542cc5637bdc54f908f4a + yH-Oz4IqPRsZpL_6s3jgDjXCTH9uAqLldoZNSt731BsC infra/tools/dirmd/linux-mipsle - git_revision:97e10874b85b9f1196cdeac4fcf120f7b8210cc4 - zgW3KOVrAHQP5V1wXQdK62DwuAzKfRwKlVQrRK3Ekp4C + git_revision:c7072c98f7ac3ce1998542cc5637bdc54f908f4a + a8Yy8E6DsZ7AfUwRlnRfsOHU_tBEZ9C9PYGLsZWxM3cC infra/tools/dirmd/linux-ppc64 - git_revision:97e10874b85b9f1196cdeac4fcf120f7b8210cc4 - XF_iPamewJpI60-cMdUOcqwCu0PCObkqqSqa49VfrEYC + git_revision:c7072c98f7ac3ce1998542cc5637bdc54f908f4a + jRfsUS7y9r0VuZIl225ZWTG_MuJzS_WBPqOgg5_YYhMC infra/tools/dirmd/linux-ppc64le - git_revision:97e10874b85b9f1196cdeac4fcf120f7b8210cc4 - 4YPm9_FFoMdoxWJadzHxjxXRR3zBNKu1boPcudmwAUQC + git_revision:c7072c98f7ac3ce1998542cc5637bdc54f908f4a + i1bFnWKDlh8E3K0ToZJBtevnLRqsZ8VmZxxAEvouuisC infra/tools/dirmd/linux-s390x - git_revision:97e10874b85b9f1196cdeac4fcf120f7b8210cc4 - nMryMwTos-lNA6eDw9N1QtTU5EVuf_4VhSFkDsb0XQ8C + git_revision:c7072c98f7ac3ce1998542cc5637bdc54f908f4a + eZr0_InCDL8oK_aRv97dbjJT4MJSHO8vNll0d8vAnC0C infra/tools/dirmd/mac-amd64 - git_revision:97e10874b85b9f1196cdeac4fcf120f7b8210cc4 - WMi8ILxKVGWg-RGylD-tWW1kKQB7oV1veXfwGCYgmicC + git_revision:c7072c98f7ac3ce1998542cc5637bdc54f908f4a + 7vCkmFH4G_2_99BJty2iV87zA5cLJTaLr_sPtpt0WmkC infra/tools/dirmd/mac-arm64 - git_revision:97e10874b85b9f1196cdeac4fcf120f7b8210cc4 - 3s4o43f9jhEWPxzpRnO2ZQpuVXtSqRxODiay-fpdNGIC + git_revision:c7072c98f7ac3ce1998542cc5637bdc54f908f4a + OgZvMtYzIU_8FQuU6iLGRuob2LI5eqRXiYFTKupL-yMC infra/tools/dirmd/windows-amd64 - git_revision:97e10874b85b9f1196cdeac4fcf120f7b8210cc4 - XYqmGiBOkCR5kr9ZxOhgJe5h4WhL8TIH_6TsbMvNK-EC + git_revision:c7072c98f7ac3ce1998542cc5637bdc54f908f4a + 5DW2qtuhJZFEhcQGEKuN_Cq20rwMbBagUsRmc5zMrGoC infra/tools/luci-auth/linux-386 git_revision:297491c0babda68d84d8240c9d4504be671bc804