lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Fix issue #60

Browse source 
- fix the logic for "git add" and "git commit"
- update the logic for "git remove" (useless function, not tested yet)
This commit is contained in:
Yishi Lin 2017-03-16 00:01:17 +08:00
parent 3b4a8b76f8
commit 5ae6de8f23
1 changed files with 6 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

43
pass/Models/PasswordStore.swift
View file

@ -415,44 +415,11 @@ class PasswordStore {
func updateRemoteRepo() { 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? { func createAddCommitInRepository(message: String, fileData: Data, filename: String, progressBlock: (_ progress: Float) -> Void) -> GTCommit? {
do { 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 headReference = try storeRepository!.headReference()
let commitEnum = try GTEnumerator(repository: storeRepository!) let commitEnum = try GTEnumerator(repository: storeRepository!)
try commitEnum.pushSHA(headReference.targetOID.sha!) try commitEnum.pushSHA(headReference.targetOID.sha!)
@ -469,7 +436,9 @@ class PasswordStore {
func createRemoveCommitInRepository(message: String, filename: String, progressBlock: (_ progress: Float) -> Void) -> GTCommit? { func createRemoveCommitInRepository(message: String, filename: String, progressBlock: (_ progress: Float) -> Void) -> GTCommit? {
do { 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 headReference = try storeRepository!.headReference()
let commitEnum = try GTEnumerator(repository: storeRepository!) let commitEnum = try GTEnumerator(repository: storeRepository!)
try commitEnum.pushSHA(headReference.targetOID.sha!) try commitEnum.pushSHA(headReference.targetOID.sha!)