Revert "Merge pull request #19349 from nolanderc/save-commit"

This reverts commit 7fa2357d0586cef742bf691d69a6cffdd353b496, reversing
changes made to cb77bd672c3b398e3c5f6be80af03243bf8638e3.

1 files changed, 2 insertions, 42 deletions

diff --git a/src/main.zig b/src/main.zig
index 156334be56..3ec27ceb4e 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -5097,7 +5097,6 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
                     .job_queue = &job_queue,
                     .omit_missing_hash_error = true,
                     .allow_missing_paths_field = false,
-                    .use_latest_commit = false,
 
                     .package_root = undefined,
                     .error_bundle = undefined,
@@ -5106,7 +5105,6 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
                     .actual_hash = undefined,
                     .has_build_zig = true,
                     .oom_flag = false,
-                    .latest_commit = undefined,
 
                     .module = build_mod,
                 };
@@ -6896,7 +6894,6 @@ const usage_fetch =
     \\  --debug-hash                  Print verbose hash information to stdout
     \\  --save                        Add the fetched package to build.zig.zon
     \\  --save=[name]                 Add the fetched package to build.zig.zon as name
-    \\  --preserve-url                Store a verbatim copy of the URL in build.zig.zon
     \\
 ;
 
@@ -6912,7 +6909,6 @@ fn cmdFetch(
     var override_global_cache_dir: ?[]const u8 = try EnvVar.ZIG_GLOBAL_CACHE_DIR.get(arena);
     var debug_hash: bool = false;
     var save: union(enum) { no, yes, name: []const u8 } = .no;
-    var preserve_url: bool = false;
 
     {
         var i: usize = 0;
@@ -6933,8 +6929,6 @@ fn cmdFetch(
                     save = .yes;
                 } else if (mem.startsWith(u8, arg, "--save=")) {
                     save = .{ .name = arg["--save=".len..] };
-                } else if (mem.startsWith(u8, arg, "--preserve-url")) {
-                    preserve_url = true;
                 } else {
                     fatal("unrecognized parameter: '{s}'", .{arg});
                 }
@@ -6946,8 +6940,6 @@ fn cmdFetch(
         }
     }
 
-    if (preserve_url and save == .no) fatal("use of '--preserve-url' requires '--save'", .{});
-
     const path_or_url = opt_path_or_url orelse fatal("missing url or path parameter", .{});
 
     var thread_pool: ThreadPool = undefined;
@@ -6996,7 +6988,6 @@ fn cmdFetch(
         .job_queue = &job_queue,
         .omit_missing_hash_error = true,
         .allow_missing_paths_field = false,
-        .use_latest_commit = true,
 
         .package_root = undefined,
         .error_bundle = undefined,
@@ -7005,7 +6996,6 @@ fn cmdFetch(
         .actual_hash = undefined,
         .has_build_zig = false,
         .oom_flag = false,
-        .latest_commit = undefined,
 
         .module = null,
     };
@@ -7062,43 +7052,13 @@ fn cmdFetch(
     var fixups: Ast.Fixups = .{};
     defer fixups.deinit(gpa);
 
-    var saved_path_or_url = path_or_url;
-
-    if (fetch.latest_commit) |*latest_commit| {
-        var uri = try std.Uri.parse(path_or_url);
-        const target_ref = uri.fragment orelse "";
-        if (!std.mem.eql(u8, target_ref, latest_commit)) {
-            std.log.info("resolved ref '{s}' to commit {s}", .{
-                target_ref,
-                std.fmt.fmtSliceHexLower(latest_commit),
-            });
-
-            if (!preserve_url) {
-                if (target_ref.len != 0) {
-                    // include the target ref in a query parameter
-                    var query = try std.ArrayList(u8).initCapacity(arena, 4 + target_ref.len);
-                    try std.Uri.writeEscapedQuery(query.writer(), "ref=");
-                    try std.Uri.writeEscapedQuery(query.writer(), target_ref);
-                    uri.query = try query.toOwnedSlice();
-                }
-
-                // replace the refspec with the resolved commit SHA
-                uri.fragment = try std.fmt.allocPrint(arena, "{}", .{
-                    std.fmt.fmtSliceHexLower(latest_commit),
-                });
-
-                saved_path_or_url = try std.fmt.allocPrint(arena, "{}", .{uri});
-            }
-        }
-    }
-
     const new_node_init = try std.fmt.allocPrint(arena,
         \\.{{
         \\            .url = "{}",
         \\            .hash = "{}",
         \\        }}
     , .{
-        std.zig.fmtEscapes(saved_path_or_url),
+        std.zig.fmtEscapes(path_or_url),
         std.zig.fmtEscapes(&hex_digest),
     });
 
@@ -7118,7 +7078,7 @@ fn cmdFetch(
         if (dep.hash) |h| {
             switch (dep.location) {
                 .url => |u| {
-                    if (mem.eql(u8, h, &hex_digest) and mem.eql(u8, u, saved_path_or_url)) {
+                    if (mem.eql(u8, h, &hex_digest) and mem.eql(u8, u, path_or_url)) {
                         std.log.info("existing dependency named '{s}' is up-to-date", .{name});
                         process.exit(0);
                     }