Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Say what Git answered when it refused a change

Țugui Dragoșb05acafbf413
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index 4125aefc..974959d1 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -57142,6 +57142,112 @@
}
}
},
+ "Git didn’t answer, so nothing changed." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git neodpověděl, takže se nic nezměnilo."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git hat nicht geantwortet, daher wurde nichts geändert."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git no ha respondido, así que no ha cambiado nada."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git n’a pas répondu : rien n’a donc changé."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git non ha risposto, quindi non è cambiato nulla."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Gitから応答がなかったため、何も変更されていません。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git이 응답하지 않았으므로 아무것도 변경되지 않았습니다."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git gaf geen antwoord, dus er is niets gewijzigd."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git nie odpowiedział, więc nic się nie zmieniło."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "O Git não respondeu, então nada mudou."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git nu a răspuns, așa că nu s‑a schimbat nimic."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git не ответил, поэтому ничего не изменилось."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git svarade inte, så ingenting ändrades."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git yanıt vermedi, bu yüzden hiçbir şey değişmedi."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git не відповів, тож нічого не змінено."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git没有回应,因此没有任何更改。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git沒有回應,因此沒有任何變更。"
+ }
+ }
+ }
+ },
"Git isn’t installed" : {
"localizations" : {
"cs" : {
@@ -57248,108 +57354,108 @@
}
}
},
- "Git refused it" : {
+ "Git refused the change." : {
"localizations" : {
"cs" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Git změnu odmítl"
+ "value" : "Git změnu odmítl."
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Git hat es abgelehnt"
+ "value" : "Git hat die Änderung abgelehnt."
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Git lo ha rechazado"
+ "value" : "Git ha rechazado el cambio."
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Refusé par Git"
+ "value" : "Git a refusé la modification."
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Git l’ha rifiutato"
+ "value" : "Git ha rifiutato la modifica."
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Gitに拒否されました"
+ "value" : "Gitに変更を拒否されました。"
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Git이 거부함"
+ "value" : "Git이 변경을 거부했습니다."
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Git heeft het geweigerd"
+ "value" : "Git heeft de wijziging geweigerd."
}
},
"pl" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Git odmówił zmiany"
+ "value" : "Git odmówił zmiany."
}
},
"pt" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Recusado pelo Git"
+ "value" : "O Git recusou a alteração."
}
},
"ro" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Git a refuzat modificarea"
+ "value" : "Git a refuzat modificarea."
}
},
"ru" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Git отклонил изменение"
+ "value" : "Git отклонил изменение."
}
},
"sv" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Git nekade det"
+ "value" : "Git nekade ändringen."
}
},
"tr" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Git bunu reddetti"
+ "value" : "Git değişikliği reddetti."
}
},
"uk" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Git не прийняв зміну"
+ "value" : "Git не прийняв зміну."
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Git拒绝了此更改"
+ "value" : "Git拒绝了此更改。"
}
},
"zh-Hant" : {
"stringUnit" : {
"state" : "translated",
- "value" : "Git拒絕了此變更"
+ "value" : "Git拒絕了此變更。"
}
}
}
@@ -57460,6 +57566,112 @@
}
}
},
+ "Git said: %@" : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git uvedl: %@"
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git meldete: %@"
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git ha dicho: %@"
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git a indiqué : %@"
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git ha detto: %@"
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Gitからのメッセージ: %@"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git 응답 내용: %@"
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git zei: %@"
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git podał: %@"
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "O Git disse: %@"
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git a spus: %@"
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Сообщение Git: %@"
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git sa: %@"
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git’in söylediği: %@"
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Повідомлення Git: %@"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git表示:%@"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Git表示:%@"
+ }
+ }
+ }
+ },
"Go to a folder by typing its name" : {
"localizations" : {
"cs" : {
diff --git a/Packages/PeelCore/Sources/PeelCore/Terminal/GitConfig.swift b/Packages/PeelCore/Sources/PeelCore/Terminal/GitConfig.swift
index 0efd48eb..c66cb9ea 100644
--- a/Packages/PeelCore/Sources/PeelCore/Terminal/GitConfig.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Terminal/GitConfig.swift
@@ -4,6 +4,14 @@ import PeelPrivileged
/// Git's global settings, read and changed through `git config --global`, Git's own command, in the home Peel
/// serves. `/usr/bin/git` is never run, since without the developer tools it asks macOS to install them.
public struct GitConfig: Sendable {
+ /// What kept Git from making a change.
+ public enum Refusal: Sendable, Equatable {
+ /// What Git wrote on its standard error, in its own words.
+ case said(String)
+ /// It didn't start, didn't answer in time, or was stopped.
+ case noAnswer
+ }
+
public let executable: URL
let home: URL
@@ -101,15 +109,23 @@ public struct GitConfig: Sendable {
return Set(output.text.split(separator: "\n").map { $0.lowercased() })
}
- public func set(_ key: String, to value: String) async -> Bool {
- guard case .success(let output) = await run(["config", "--global", "--replace-all", key, value]) else { return false }
- return output.status == 0
+ /// Sets `key` to `value`, and answers why Git didn't, or nil once it did.
+ public func set(_ key: String, to value: String) async -> Refusal? {
+ refusal(of: await run(["config", "--global", "--replace-all", key, value]))
}
- /// Removes every value of `key`. Git answers 5 when there is none, which is what was asked.
- public func remove(_ key: String) async -> Bool {
- guard case .success(let output) = await run(["config", "--global", "--unset-all", key]) else { return false }
- return output.status == 0 || output.status == 5
+ /// Removes every value of `key`, and answers why Git didn't, or nil once it did. Git answers 5 when there is
+ /// none, which is what was asked.
+ public func remove(_ key: String) async -> Refusal? {
+ refusal(of: await run(["config", "--global", "--unset-all", key]), alsoDone: 5)
+ }
+
+ private func refusal(of run: Result<Subprocess.Output, Subprocess.Failure>, alsoDone: Int32? = nil) -> Refusal? {
+ switch run {
+ case .failure: .noAnswer
+ case .success(let output) where output.status == 0 || output.status == alsoDone: nil
+ case .success(let output): .said(output.errorText.trimmingCharacters(in: .whitespacesAndNewlines))
+ }
}
private func run(_ arguments: [String]) async -> Result<Subprocess.Output, Subprocess.Failure> {
diff --git a/Packages/PeelCore/Sources/PeelCore/Terminal/GitLedger.swift b/Packages/PeelCore/Sources/PeelCore/Terminal/GitLedger.swift
index 09e16335..67acf528 100644
--- a/Packages/PeelCore/Sources/PeelCore/Terminal/GitLedger.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Terminal/GitLedger.swift
@@ -5,7 +5,9 @@ public struct GitLedger {
public enum Outcome: Sendable, Equatable {
case changed
case unchanged
- case refused
+ /// And why Git refused, when it was asked: none when it couldn't list its settings, or a key it needs is
+ /// missing.
+ case refused(GitConfig.Refusal?)
}
public private(set) var previous: [String: String]
@@ -26,7 +28,7 @@ public struct GitLedger {
_ setting: GitSetting, signingKey: String?, in config: GitConfig, saving: (GitLedger) -> Void = { _ in }
) async -> Outcome {
let values = setting.values(signingKey: signingKey)
- guard !values.isEmpty, let settings = await config.settings() else { return .refused }
+ guard !values.isEmpty, let settings = await config.settings() else { return .refused(nil) }
guard !setting.isSetInIncludedFiles(await config.keysSetByIncludedFiles()) else { return .unchanged }
var outcome = Outcome.unchanged
for wanted in values {
@@ -44,11 +46,11 @@ public struct GitLedger {
written[name] = wanted.value
saving(self)
if before != .some(.some(wanted.value)) {
- guard await config.set(wanted.key, to: wanted.value) else {
+ if let refusal = await config.set(wanted.key, to: wanted.value) {
previous[name] = kept.previous
written[name] = kept.written
saving(self)
- return .refused
+ return .refused(refusal)
}
outcome = .changed
}
@@ -61,26 +63,26 @@ public struct GitLedger {
public mutating func turnOff(
_ setting: GitSetting, in config: GitConfig, saving: (GitLedger) -> Void = { _ in }
) async -> Outcome {
- guard let settings = await config.settings() else { return .refused }
+ guard let settings = await config.settings() else { return .refused(nil) }
var outcome = Outcome.unchanged
for key in setting.keys {
let name = key.lowercased()
let now = settings[name]
if let mine = written[name] {
if now == .some(.some(mine)), previous[name] != mine {
- let restored = if let before = previous[name] {
+ let refusal = if let before = previous[name] {
await config.set(key, to: before)
} else {
await config.remove(key)
}
- guard restored else { return .refused }
+ if let refusal { return .refused(refusal) }
outcome = .changed
}
written.removeValue(forKey: name)
previous.removeValue(forKey: name)
saving(self)
} else if setting.switchKeys.contains(key), now != nil {
- guard await config.remove(key) else { return .refused }
+ if let refusal = await config.remove(key) { return .refused(refusal) }
outcome = .changed
}
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/GitSettingsTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/GitSettingsTests.swift
index d195c997..a364743f 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/GitSettingsTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/GitSettingsTests.swift
@@ -68,8 +68,8 @@ struct GitSettingsTests {
@Test func whatThePersonHadBeforeComesBack() async throws {
let git = try await GitHome()
- #expect(await git.config.set("pull.rebase", to: "false"))
- #expect(await git.config.set("merge.conflictStyle", to: "diff3"))
+ #expect(await git.config.set("pull.rebase", to: "false") == nil)
+ #expect(await git.config.set("merge.conflictStyle", to: "diff3") == nil)
var ledger = GitLedger()
#expect(await ledger.turnOn(.rebaseOnPull, signingKey: nil, in: git.config) == .changed)
#expect(await ledger.turnOn(.zdiff3Conflicts, signingKey: nil, in: git.config) == .changed)
@@ -117,7 +117,7 @@ struct GitSettingsTests {
let git = try await GitHome()
var ledger = GitLedger()
#expect(await ledger.turnOn(.rebaseOnPull, signingKey: nil, in: git.config) == .changed)
- #expect(await git.config.set("pull.rebase", to: "merges"))
+ #expect(await git.config.set("pull.rebase", to: "merges") == nil)
#expect(await ledger.turnOff(.rebaseOnPull, in: git.config) == .unchanged)
#expect(try await git.settings()["pull.rebase"] == "merges")
#expect(ledger.written.isEmpty)
@@ -127,7 +127,7 @@ struct GitSettingsTests {
let git = try await GitHome()
let key = try git.publicKey("id_ed25519.pub")
for value in GitSetting.signCommits.values(signingKey: key) {
- #expect(await git.config.set(value.key, to: value.value))
+ #expect(await git.config.set(value.key, to: value.value) == nil)
}
#expect(GitSetting.signCommits.isOn(in: try await git.settings()))
var ledger = GitLedger()
@@ -142,7 +142,7 @@ struct GitSettingsTests {
let git = try await GitHome()
let key = try git.publicKey("id_ed25519.pub")
for (name, value) in [("gpg.format", "openpgp"), ("user.signingKey", "ABCDEF0123"), ("commit.gpgSign", "true")] {
- #expect(await git.config.set(name, to: value))
+ #expect(await git.config.set(name, to: value) == nil)
}
var ledger = GitLedger()
#expect(await ledger.turnOn(.signCommits, signingKey: key, in: git.config) == .changed)
@@ -180,7 +180,11 @@ struct GitSettingsTests {
let outcome = await ledger.turnOn(.rebaseOnPull, signingKey: nil, in: git.config) { handed.append($0.written) }
- #expect(outcome == .refused)
+ guard case .refused(.said(let words)?) = outcome else {
+ Issue.record("Git's words were lost: \(outcome)")
+ return
+ }
+ #expect(words.hasPrefix("error: could not lock config file"), "\(words)")
#expect(handed == [["pull.rebase": "true"], [:]])
#expect(ledger.written.isEmpty && ledger.previous.isEmpty)
}
@@ -214,7 +218,7 @@ struct GitSettingsTests {
try "[pull\n\trebase = false\n".write(to: git.home.appending(path: ".gitconfig"), atomically: true, encoding: .utf8)
#expect(await git.config.settings() == nil)
var ledger = GitLedger()
- #expect(await ledger.turnOn(.rebaseOnPull, signingKey: nil, in: git.config) == .refused)
+ #expect(await ledger.turnOn(.rebaseOnPull, signingKey: nil, in: git.config) == .refused(nil))
#expect(git.file == "[pull\n\trebase = false\n")
}
@@ -222,7 +226,7 @@ struct GitSettingsTests {
let git = try await GitHome()
#expect(GitSetting.signingKey(in: [:], home: git.home) == nil)
var ledger = GitLedger()
- #expect(await ledger.turnOn(.signCommits, signingKey: nil, in: git.config) == .refused)
+ #expect(await ledger.turnOn(.signCommits, signingKey: nil, in: git.config) == .refused(nil))
let rsa = try git.publicKey("id_rsa.pub")
#expect(GitSetting.signingKey(in: [:], home: git.home) == rsa)
let ed25519 = try git.publicKey("id_ed25519.pub")
@@ -238,8 +242,8 @@ struct GitSettingsTests {
let git = try await GitHome()
_ = try git.publicKey("id_ed25519.pub")
let work = try git.publicKey("work.pub")
- #expect(await git.config.set("gpg.format", to: "ssh"))
- #expect(await git.config.set("user.signingKey", to: work))
+ #expect(await git.config.set("gpg.format", to: "ssh") == nil)
+ #expect(await git.config.set("user.signingKey", to: work) == nil)
let settings = try await git.settings()
let key = try #require(GitSetting.signingKey(in: settings, home: git.home))
var ledger = GitLedger()
diff --git a/Peel/Model/GitLibrary.swift b/Peel/Model/GitLibrary.swift
index 41bf2ac6..f2bfd089 100644
--- a/Peel/Model/GitLibrary.swift
+++ b/Peel/Model/GitLibrary.swift
@@ -21,6 +21,8 @@ final class GitLibrary {
private(set) var state: State?
private var asked: [GitSetting: Bool] = [:]
private(set) var wasRefused = false
+ /// What Git said when it refused, when it said something.
+ private(set) var whyRefused: GitConfig.Refusal?
private var waiting: [GitSetting: Int] = [:]
private var changes: Task<Void, Never>?
@@ -99,6 +101,7 @@ final class GitLibrary {
func forgetRefusal() {
wasRefused = false
+ whyRefused = nil
}
private func save(_ ledger: GitLedger) {
@@ -130,14 +133,19 @@ final class GitLibrary {
await QuitGuard.shared.run {
var ledger = ledger
var refused = false
+ var why: GitConfig.Refusal?
for setting in settings {
let outcome = isOn
? await ledger.turnOn(setting, signingKey: state?.signingKey, in: git) { save($0) }
: await ledger.turnOff(setting, in: git) { save($0) }
- refused = outcome == .refused || refused
+ if case .refused(let refusal) = outcome {
+ refused = true
+ why = why ?? refusal
+ }
}
self.ledger = ledger
wasRefused = refused
+ whyRefused = why
}
await read()
}
diff --git a/Peel/Views/Presentation.swift b/Peel/Views/Presentation.swift
index a132dc4e..e74fa37d 100644
--- a/Peel/Views/Presentation.swift
+++ b/Peel/Views/Presentation.swift
@@ -351,6 +351,18 @@ extension PreferenceBackup.CopyUnreadable {
}
}
+extension GitConfig.Refusal? {
+ /// What the Git tab says when Git didn't make a change.
+ var sentence: String {
+ switch self {
+ case .said(let words)? where !words.isEmpty:
+ [String(localized: "Git refused the change."), String(localized: "Git said: \(words)")].joined(separator: " ")
+ case .noAnswer?: String(localized: "Git didn’t answer, so nothing changed.")
+ default: String(localized: "Git refused the change.")
+ }
+ }
+}
+
extension HistoryWriteProblem {
/// What keeps History from being written, and that nothing moves meanwhile, read from `bundle`, or from the main
/// bundle when it is nil.
diff --git a/Peel/Views/Terminal/GitTab.swift b/Peel/Views/Terminal/GitTab.swift
index d0607102..2db3ae48 100644
--- a/Peel/Views/Terminal/GitTab.swift
+++ b/Peel/Views/Terminal/GitTab.swift
@@ -30,7 +30,7 @@ struct GitTab: View {
}
} else if git.wasRefused {
Section {
- StatusLabel(title: Text("Git refused it"), tint: .accentColor)
+ StatusLabel(title: Text(verbatim: git.whyRefused.sentence), tint: .accentColor)
}
}
ForEach(GitSetting.Group.allCases, id: \.self) { group in