diff --git a/src/install/PackageManager/PackageManagerEnqueue.zig b/src/install/PackageManager/PackageManagerEnqueue.zig index df71b665f3..9e8b3cb712 100644 --- a/src/install/PackageManager/PackageManagerEnqueue.zig +++ b/src/install/PackageManager/PackageManagerEnqueue.zig @@ -1285,12 +1285,12 @@ pub fn enqueueGitCheckout( ) void { const folder_name = PackageManager.cachedGitFolderNamePrint(&git_folder_name_buf, resolved, null); const target = Path.joinAbsString(this.cache_directory_path, &.{folder_name}, .auto); - + // Check if the checkout directory already exists - if so, just return success immediately if (this.getCacheDirectory().openDir(folder_name, .{})) |package_dir_const| { var package_dir = package_dir_const; package_dir.close(); - + // Directory already exists, create a success task immediately const task = this.preallocated_resolve_tasks.get(); task.* = Task{ @@ -1328,7 +1328,7 @@ pub fn enqueueGitCheckout( this.wake(); return; } else |_| {} - + const repo_path = bun.getFdPath(dir, &git_path_buf) catch |err| { // If we can't get the path, create a failed task const task = this.preallocated_resolve_tasks.get(); diff --git a/src/install/PackageManager/runTasks.zig b/src/install/PackageManager/runTasks.zig index a2c839a3d6..fa06949b63 100644 --- a/src/install/PackageManager/runTasks.zig +++ b/src/install/PackageManager/runTasks.zig @@ -766,7 +766,7 @@ pub fn runTasks( var resolution_buf: [8192]u8 = undefined; var stream = std.io.fixedBufferStream(&resolution_buf); var writer = stream.writer(); - + // Write the git resolution format if (strings.hasPrefixComptime(repo, "git@")) { // Transform SCP-like URL to SSH URL format @@ -781,22 +781,22 @@ pub fn runTasks( } writer.writeByte('#') catch unreachable; writer.writeAll(resolved) catch unreachable; - + const package_version = stream.getWritten(); - + // Calculate the hash for "name@version" var name_and_version_buf: [8192]u8 = undefined; const name_and_version = std.fmt.bufPrint(&name_and_version_buf, "{s}@{s}", .{ dep_name, package_version, }) catch unreachable; - + const hash = String.Builder.stringHash(name_and_version); - + if (comptime Environment.isDebug) { Output.prettyErrorln("[git-patch] Looking for patch: {s} (hash={d})", .{ name_and_version, hash }); } - + // Check if this dependency has a patch if (manager.lockfile.patched_dependencies.get(hash)) |_| { if (comptime Environment.isDebug) { @@ -804,7 +804,7 @@ pub fn runTasks( } break :brk hash; } - + // Also try checking all patched dependencies to see what we have if (comptime Environment.isDebug) { var iter = manager.lockfile.patched_dependencies.iterator(); @@ -812,7 +812,7 @@ pub fn runTasks( Output.prettyErrorln("[git-patch] Available patch: hash={d}", .{entry.key_ptr.*}); } } - + break :brk null; } else null; @@ -1148,6 +1148,7 @@ const ThreadPool = bun.ThreadPool; const default_allocator = bun.default_allocator; const logger = bun.logger; const strings = bun.strings; +const String = bun.Semver.String; const Fs = bun.fs; const FileSystem = Fs.FileSystem; @@ -1166,7 +1167,6 @@ const Repository = bun.install.Repository; const Store = bun.install.Store; const Task = bun.install.Task; const invalid_package_id = bun.install.invalid_package_id; -const String = bun.Semver.String; const Lockfile = bun.install.Lockfile; const Package = Lockfile.Package;