enhance: do not show hint: messages in error popup, but leave it in git command logs (#1348)

Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-05-23 10:05:09 +08:00
parent c112549b69
commit 0ae39faad1
No known key found for this signature in database

View file

@ -44,35 +44,30 @@ namespace SourceGit.Commands
proc.OutputDataReceived += (_, e) => proc.OutputDataReceived += (_, e) =>
{ {
if (e.Data == null) if (e.Data is { } line)
return; Log?.AppendLine(line);
Log?.AppendLine(e.Data);
}; };
proc.ErrorDataReceived += (_, e) => proc.ErrorDataReceived += (_, e) =>
{ {
if (string.IsNullOrEmpty(e.Data)) var line = e.Data ?? string.Empty;
Log?.AppendLine(line);
// Lines to hide in error message.
if (line.Length > 0)
{ {
errs.Add(string.Empty); if (line.StartsWith("remote: Enumerating objects:", StringComparison.Ordinal) ||
return; line.StartsWith("remote: Counting objects:", StringComparison.Ordinal) ||
line.StartsWith("remote: Compressing objects:", StringComparison.Ordinal) ||
line.StartsWith("Filtering content:", StringComparison.Ordinal) ||
line.StartsWith("hint: ", StringComparison.Ordinal))
return;
if (REG_PROGRESS().IsMatch(line))
return;
} }
Log?.AppendLine(e.Data); errs.Add(line);
// Ignore progress messages
if (e.Data.StartsWith("remote: Enumerating objects:", StringComparison.Ordinal))
return;
if (e.Data.StartsWith("remote: Counting objects:", StringComparison.Ordinal))
return;
if (e.Data.StartsWith("remote: Compressing objects:", StringComparison.Ordinal))
return;
if (e.Data.StartsWith("Filtering content:", StringComparison.Ordinal))
return;
if (REG_PROGRESS().IsMatch(e.Data))
return;
errs.Add(e.Data);
}; };
var dummy = null as Process; var dummy = null as Process;