From 5ae6de8f23f246de0fab3fd8baee33b469d36d1a Mon Sep 17 00:00:00 2001 From: Yishi Lin Date: Thu, 16 Mar 2017 00:01:17 +0800 Subject: [PATCH] Fix issue #60 - fix the logic for "git add" and "git commit" - update the logic for "git remove" (useless function, not tested yet) --- pass/Models/PasswordStore.swift | 43 +++++---------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/pass/Models/PasswordStore.swift b/pass/Models/PasswordStore.swift index 0168e7d..2f4f3f3 100644 --- a/pass/Models/PasswordStore.swift +++ b/pass/Models/PasswordStore.swift @@ -415,44 +415,11 @@ class PasswordStore { func updateRemoteRepo() { } - - func addEntryToGTTree(fileData: Data, filename: String) -> GTTree { - do { - let head = try storeRepository!.headReference() - let branch = GTBranch(reference: head, repository: storeRepository!) - let headCommit = try branch?.targetCommit() - - let treeBulider = try GTTreeBuilder(tree: headCommit?.tree, repository: storeRepository!) - try treeBulider.addEntry(with: fileData, fileName: filename, fileMode: GTFileMode.blob) - - let newTree = try treeBulider.writeTree() - return newTree - } catch { - fatalError("Failed to add entries to GTTree: \(error)") - - } - } - - func removeEntryFromGTTree(filename: String) -> GTTree { - do { - let head = try storeRepository!.headReference() - let branch = GTBranch(reference: head, repository: storeRepository!) - let headCommit = try branch?.targetCommit() - - let treeBulider = try GTTreeBuilder(tree: headCommit?.tree, repository: storeRepository!) - try treeBulider.removeEntry(withFileName: filename) - - let newTree = try treeBulider.writeTree() - return newTree - } catch { - fatalError("Failed to remove entries to GTTree: \(error)") - - } - } - func createAddCommitInRepository(message: String, fileData: Data, filename: String, progressBlock: (_ progress: Float) -> Void) -> GTCommit? { do { - let newTree = addEntryToGTTree(fileData: fileData, filename: filename) + try storeRepository?.index().add(fileData, withPath: filename) + try storeRepository?.index().write() + let newTree = try storeRepository!.index().writeTree() let headReference = try storeRepository!.headReference() let commitEnum = try GTEnumerator(repository: storeRepository!) try commitEnum.pushSHA(headReference.targetOID.sha!) @@ -469,7 +436,9 @@ class PasswordStore { func createRemoveCommitInRepository(message: String, filename: String, progressBlock: (_ progress: Float) -> Void) -> GTCommit? { do { - let newTree = removeEntryFromGTTree(filename: filename) + try storeRepository?.index().removeFile(filename) + try storeRepository?.index().write() + let newTree = try storeRepository!.index().writeTree() let headReference = try storeRepository!.headReference() let commitEnum = try GTEnumerator(repository: storeRepository!) try commitEnum.pushSHA(headReference.targetOID.sha!)