Skip to content

Commit

Permalink
Track moved files when staged but not committed yet
Browse files Browse the repository at this point in the history
  • Loading branch information
hampustagerud authored and nicklockwood committed Sep 22, 2024
1 parent 6d01ccb commit 1b53343
Showing 1 changed file with 27 additions and 2 deletions.
29 changes: 27 additions & 2 deletions Sources/GitFileInfo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,36 @@ private let getDefaultGitInfo: (URL) -> GitFileInfo = memoize({ $0.relativePath
return GitFileInfo(authorName: name, authorEmail: email)
}

private let getMovedFiles: (URL) -> [(from: URL, to: URL)] = memoize({ $0.relativePath }) { root in
let command = "git diff --diff-filter=R --staged --name-status"
let output = command.shellOutput(cwd: root)

guard let safeValue = output, !safeValue.isEmpty else { return [] }

return safeValue.split(separator: "\n").compactMap { input -> (URL, URL)? in
var parts = input.split(separator: "\t").dropFirst()

guard let from = parts.popFirst(), let to = parts.popFirst(), from != to else { return nil }

let fromURL = URL(fileURLWithPath: String(from), relativeTo: root)
let toURL = URL(fileURLWithPath: String(to), relativeTo: root)

return (fromURL, toURL)
}
}

private func getCommitHash(_ url: URL, root: URL) -> String? {
let movedFile = getMovedFiles(root).first { $0.to.absoluteString == url.absoluteString }
let trackedFile = movedFile?.from ?? url

let command = [
"git log",
"--follow", // keep tracking file across renames
"--diff-filter=A",
"--author-date-order",
"--pretty=%H",
url.relativePath,
"--",
trackedFile.relativePath,
]
.filter { ($0?.count ?? 0) > 0 }
.joined(separator: " ")
Expand Down Expand Up @@ -161,7 +183,10 @@ private let getCommitInfo: ((String?, URL)) -> GitFileInfo? = memoize(
return nil
}

let (name, email) = (dict["name"] ?? defaultInfo.authorName, dict["email"] ?? defaultInfo.authorEmail)
let (name, email) = (
dict["name"] ?? defaultInfo.authorName,
dict["email"] ?? defaultInfo.authorEmail
)

var date: Date?
if let createdAtString = dict["time"],
Expand Down

0 comments on commit 1b53343

Please sign in to comment.