fix(pub): Do not use the revision from the pubspec.yaml of dependencies

The repository URLs taken from the pubspec.yaml in the local Pub cache often point to the main or master branch of the repository, for example: https://github.com/dart-lang/sdk/tree/main/pkg/_fe_analyzer_shared As there was not a single example where the URL pointed to the correct revision that matches the release of the package, simply ignore the revision. Fixes #5542. Signed-off-by: Martin Nonnenmacher <[email protected]>
oss-review-toolkit · Jan 26, 2024 · a234ae5 · a234ae5
1 parent 232bc19
commit a234ae5
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 61 deletions.
diff --git a/...s/package-managers/pub/src/funTest/assets/projects/external/dart-http-expected-output.yml b/...s/package-managers/pub/src/funTest/assets/projects/external/dart-http-expected-output.yml
@@ -904,12 +904,12 @@ packages:
   vcs:
     type: "Git"
     url: "https://github.com/dart-lang/sdk.git"
-    revision: "main"
+    revision: ""
     path: "pkg/_fe_analyzer_shared"
   vcs_processed:
     type: "Git"
     url: "https://github.com/dart-lang/sdk.git"
-    revision: "main"
+    revision: ""
     path: "pkg/_fe_analyzer_shared"
 - id: "Pub::analyzer:6.4.0"
   purl: "pkg:pub/[email protected]"
@@ -931,12 +931,12 @@ packages:
   vcs:
     type: "Git"
     url: "https://github.com/dart-lang/sdk.git"
-    revision: "main"
+    revision: ""
     path: "pkg/analyzer"
   vcs_processed:
     type: "Git"
     url: "https://github.com/dart-lang/sdk.git"
-    revision: "main"
+    revision: ""
     path: "pkg/analyzer"
 - id: "Pub::args:2.4.2"
   purl: "pkg:pub/[email protected]"
@@ -1144,12 +1144,12 @@ packages:
   vcs:
     type: "Git"
     url: "https://github.com/google/file.dart.git"
-    revision: "master"
+    revision: ""
     path: "packages/file"
   vcs_processed:
     type: "Git"
     url: "https://github.com/google/file.dart.git"
-    revision: "master"
+    revision: ""
     path: "packages/file"
 - id: "Pub::frontend_server_client:3.2.0"
   purl: "pkg:pub/[email protected]"
@@ -1171,12 +1171,12 @@ packages:
   vcs:
     type: "Git"
     url: "https://github.com/dart-lang/webdev.git"
-    revision: "master"
+    revision: ""
     path: "frontend_server_client"
   vcs_processed:
     type: "Git"
     url: "https://github.com/dart-lang/webdev.git"
-    revision: "master"
+    revision: ""
     path: "frontend_server_client"
 - id: "Pub::glob:2.1.2"
   purl: "pkg:pub/[email protected]"
@@ -1302,12 +1302,12 @@ packages:
   vcs:
     type: "Git"
     url: "https://github.com/dart-lang/sdk.git"
-    revision: "main"
+    revision: ""
     path: "pkg/js"
   vcs_processed:
     type: "Git"
     url: "https://github.com/dart-lang/sdk.git"
-    revision: "main"
+    revision: ""
     path: "pkg/js"
 - id: "Pub::logging:1.2.0"
   purl: "pkg:pub/[email protected]"
@@ -1384,12 +1384,12 @@ packages:
   vcs:
     type: "Git"
     url: "https://github.com/dart-lang/sdk.git"
-    revision: "main"
+    revision: ""
     path: "pkg/meta"
   vcs_processed:
     type: "Git"
     url: "https://github.com/dart-lang/sdk.git"
-    revision: "main"
+    revision: ""
     path: "pkg/meta"
 - id: "Pub::mime:1.0.4"
   purl: "pkg:pub/[email protected]"
@@ -1600,12 +1600,12 @@ packages:
   vcs:
     type: "Git"
     url: "https://github.com/dart-lang/shelf.git"
-    revision: "master"
+    revision: ""
     path: "pkgs/shelf"
   vcs_processed:
     type: "Git"
     url: "https://github.com/dart-lang/shelf.git"
-    revision: "master"
+    revision: ""
     path: "pkgs/shelf"
 - id: "Pub::shelf_packages_handler:3.0.2"
   purl: "pkg:pub/[email protected]"
@@ -1626,12 +1626,12 @@ packages:
   vcs:
     type: "Git"
     url: "https://github.com/dart-lang/shelf.git"
-    revision: "master"
+    revision: ""
     path: "pkgs/shelf_packages_handler"
   vcs_processed:
     type: "Git"
     url: "https://github.com/dart-lang/shelf.git"
-    revision: "master"
+    revision: ""
     path: "pkgs/shelf_packages_handler"
 - id: "Pub::shelf_static:1.1.2"
   purl: "pkg:pub/[email protected]"
@@ -1652,12 +1652,12 @@ packages:
   vcs:
     type: "Git"
     url: "https://github.com/dart-lang/shelf.git"
-    revision: "master"
+    revision: ""
     path: "pkgs/shelf_static"
   vcs_processed:
     type: "Git"
     url: "https://github.com/dart-lang/shelf.git"
-    revision: "master"
+    revision: ""
     path: "pkgs/shelf_static"
 - id: "Pub::shelf_web_socket:1.0.4"
   purl: "pkg:pub/[email protected]"
@@ -1678,12 +1678,12 @@ packages:
   vcs:
     type: "Git"
     url: "https://github.com/dart-lang/shelf.git"
-    revision: "master"
+    revision: ""
     path: "pkgs/shelf_web_socket"
   vcs_processed:
     type: "Git"
     url: "https://github.com/dart-lang/shelf.git"
-    revision: "master"
+    revision: ""
     path: "pkgs/shelf_web_socket"
 - id: "Pub::source_map_stack_trace:2.1.1"
   purl: "pkg:pub/[email protected]"
@@ -1888,12 +1888,12 @@ packages:
   vcs:
     type: "Git"
     url: "https://github.com/dart-lang/test.git"
-    revision: "master"
+    revision: ""
     path: "pkgs/test"
   vcs_processed:
     type: "Git"
     url: "https://github.com/dart-lang/test.git"
-    revision: "master"
+    revision: ""
     path: "pkgs/test"
 - id: "Pub::test_api:0.7.0"
   purl: "pkg:pub/[email protected]"
@@ -1914,12 +1914,12 @@ packages:
   vcs:
     type: "Git"
     url: "https://github.com/dart-lang/test.git"
-    revision: "master"
+    revision: ""
     path: "pkgs/test_api"
   vcs_processed:
     type: "Git"
     url: "https://github.com/dart-lang/test.git"
-    revision: "master"
+    revision: ""
     path: "pkgs/test_api"
 - id: "Pub::test_core:0.6.0"
   purl: "pkg:pub/[email protected]"
@@ -1940,12 +1940,12 @@ packages:
   vcs:
     type: "Git"
     url: "https://github.com/dart-lang/test.git"
-    revision: "master"
+    revision: ""
     path: "pkgs/test_core"
   vcs_processed:
     type: "Git"
     url: "https://github.com/dart-lang/test.git"
-    revision: "master"
+    revision: ""
     path: "pkgs/test_core"
 - id: "Pub::typed_data:1.3.2"
   purl: "pkg:pub/[email protected]"
@@ -1993,12 +1993,12 @@ packages:
   vcs:
     type: "Git"
     url: "https://github.com/dart-lang/sdk.git"
-    revision: "main"
+    revision: ""
     path: "pkg/vm_service"
   vcs_processed:
     type: "Git"
     url: "https://github.com/dart-lang/sdk.git"
-    revision: "main"
+    revision: ""
     path: "pkg/vm_service"
 - id: "Pub::watcher:1.1.0"
   purl: "pkg:pub/[email protected]"