oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git: Work around windows command length limit message fetching (#39115)

Browse Source 
Release Notes:

- Fix git blame failing on windows for files with lots of blame entries
This commit is contained in:
Lukas Wirth
2025-09-29 15:29:42 +00:00
committed by GitHub
parent 1e70a1a4ce
commit 98ab118526
1 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/git/src/commit.rs
+36 -17
View File
@@ -8,34 +8,53 @@ pub async fn get_messages(working_directory: &Path, shas: &[Oid]) -> Result<Hash
return Ok(HashMap::default());
}
const MARKER: &str = "<MARKER>";
let output = if cfg!(windows) {
// Windows has a maximum invocable command length, so we chunk the input.
// Actual max is 32767, but we leave some room for the rest of the command as we aren't in precise control of what std might do here
const MAX_CMD_LENGTH: usize = 30000;
// 40 bytes of hash, 2 quotes and a separating space
const SHA_LENGTH: usize = 40 + 2 + 1;
const MAX_ENTRIES_PER_INVOCATION: usize = MAX_CMD_LENGTH / SHA_LENGTH;
let output = util::command::new_smol_command("git")
.current_dir(working_directory)
let mut result = vec![];
for shas in shas.chunks(MAX_ENTRIES_PER_INVOCATION) {
let partial = get_messages_impl(working_directory, shas).await?;
result.extend(partial);
}
result
} else {
get_messages_impl(working_directory, shas).await?
};
Ok(shas
.iter()
.cloned()
.zip(output)
.collect::<HashMap<Oid, String>>())
}
async fn get_messages_impl(working_directory: &Path, shas: &[Oid]) -> Result<Vec<String>> {
const MARKER: &str = "<MARKER>";
let mut cmd = util::command::new_smol_command("git");
cmd.current_dir(working_directory)
.arg("show")
.arg("-s")
.arg(format!("--format=%B{}", MARKER))
.args(shas.iter().map(ToString::to_string))
.args(shas.iter().map(ToString::to_string));
let output = cmd
.output()
.await
.context("starting git blame process")?;
.with_context(|| format!("starting git blame process: {:?}", cmd))?;
anyhow::ensure!(
output.status.success(),
"'git show' failed with error {:?}",
output.status
);
Ok(shas
.iter()
.cloned()
.zip(
String::from_utf8_lossy(&output.stdout)
.trim()
.split_terminator(MARKER)
.map(|str| str.trim().replace("<", "&lt;").replace(">", "&gt;")),
)
.collect::<HashMap<Oid, String>>())
Ok(String::from_utf8_lossy(&output.stdout)
.trim()
.split_terminator(MARKER)
.map(|str| str.trim().replace("<", "&lt;").replace(">", "&gt;"))
.collect::<Vec<_>>())
}
/// Parse the output of `git diff --name-status -z`