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.

Write down what a Git key held before Git writes it

Țugui Dragoș6cbc55c64939
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ed37a3e..c4250e2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -124,7 +124,7 @@ its changes the way [Keep a Changelog](https://keepachangelog.com/) suggests.
no newline after it keeps that line, and the tab says that zsh reads Peel's settings only for a line that reads them.
- Turning off Sign commits with your SSH key puts back every key as it was, so signing you had with another format, such
as GPG, goes on as before.
-- The Git tab saves its record of what each key held after every key it writes, and quitting Peel waits for the change.
+- The Git tab writes down what each key held before Git writes the key, and quitting Peel waits for the change.
- Turn All Off on the Shell and SSH tabs never writes over a file of Peel's own that couldn't be read.
- The Terminal tab says from the start when Terminal's profiles can't be read, instead of asking you to choose a theme.
- Quitting Terminal from Peel's question applies the theme at once: Terminal counts as closed as soon as its process has
diff --git a/Packages/PeelCore/Sources/PeelCore/Terminal/GitLedger.swift b/Packages/PeelCore/Sources/PeelCore/Terminal/GitLedger.swift
index 37c866da..09e16335 100644
--- a/Packages/PeelCore/Sources/PeelCore/Terminal/GitLedger.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Terminal/GitLedger.swift
@@ -20,8 +20,8 @@ public struct GitLedger {
["previous": previous, "written": written]
}
- /// Turns `setting` on through Git, and hands the ledger to `saving` after each key it takes in, so what a key
- /// held before is kept even if Peel ends before the setting's other keys are written.
+ /// Turns `setting` on through Git, and hands the ledger to `saving` with each key before Git writes it, so what a
+ /// key held is kept even if Peel ends right after; a key Git refuses is taken out again and handed over once more.
public mutating func turnOn(
_ setting: GitSetting, signingKey: String?, in config: GitConfig, saving: (GitLedger) -> Void = { _ in }
) async -> Outcome {
@@ -33,10 +33,7 @@ public struct GitLedger {
let name = wanted.key.lowercased()
let before = settings[name]
let isPeels = written[name].map { before == .some(.some($0)) } ?? false
- if before != .some(.some(wanted.value)) {
- guard await config.set(wanted.key, to: wanted.value) else { return .refused }
- outcome = .changed
- }
+ let kept = (previous: previous[name], written: written[name])
if !isPeels {
switch before {
case .none: previous.removeValue(forKey: name)
@@ -46,6 +43,15 @@ 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 {
+ previous[name] = kept.previous
+ written[name] = kept.written
+ saving(self)
+ return .refused
+ }
+ outcome = .changed
+ }
}
return outcome
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/GitSettingsTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/GitSettingsTests.swift
index 58af6393..0de5e726 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/GitSettingsTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/GitSettingsTests.swift
@@ -134,7 +134,36 @@ struct GitSettingsTests {
#expect(ledger.written.isEmpty && ledger.previous.isEmpty)
}
- @Test func theLedgerIsHandedOverAfterEveryKeyItChanges() async throws {
+ @Test func writesDownWhatAKeyHeldBeforeGitWritesIt() async throws {
+ let git = try await GitHome()
+ var ledger = GitLedger()
+ var files: [String] = []
+
+ let outcome = await ledger.turnOn(.rebaseOnPull, signingKey: nil, in: git.config) { _ in
+ files.append(git.file)
+ }
+
+ #expect(outcome == .changed)
+ #expect(files.count == 1 && !files[0].contains("rebase"), "\(files)")
+ #expect(git.file.contains("rebase = true"))
+ }
+
+ @Test func takesAKeyGitRefusedBackOutOfTheLedger() async throws {
+ let git = try await GitHome()
+ let home = git.home.path(percentEncoded: false)
+ try FileManager.default.setAttributes([.posixPermissions: 0o555], ofItemAtPath: home)
+ defer { try? FileManager.default.setAttributes([.posixPermissions: 0o755], ofItemAtPath: home) }
+ var ledger = GitLedger()
+ var handed: [[String: String]] = []
+
+ let outcome = await ledger.turnOn(.rebaseOnPull, signingKey: nil, in: git.config) { handed.append($0.written) }
+
+ #expect(outcome == .refused)
+ #expect(handed == [["pull.rebase": "true"], [:]])
+ #expect(ledger.written.isEmpty && ledger.previous.isEmpty)
+ }
+
+ @Test func theLedgerIsHandedOverForEveryKeyItChanges() async throws {
let git = try await GitHome()
let key = try git.publicKey("id_ed25519.pub")
var ledger = GitLedger()
diff --git a/Peel/Model/GitLibrary.swift b/Peel/Model/GitLibrary.swift
index 8f619cc1..7376bd06 100644
--- a/Peel/Model/GitLibrary.swift
+++ b/Peel/Model/GitLibrary.swift
@@ -113,8 +113,8 @@ final class GitLibrary {
return task
}
- /// Changes the settings through Git, saving the ledger after each key, and a quit asked meanwhile waits: ended
- /// between a key Git wrote and the ledger's note of what it held, the note would be lost.
+ /// Changes the settings through Git, saving the ledger before each key Git writes, and a quit asked meanwhile
+ /// waits for the change to end.
private func change(_ settings: [GitSetting], to isOn: Bool) async {
if let git {
await QuitGuard.shared.run {