How to "unstage" a file with Objective-Git (libgit2)? -


i writing app allows performing basic git operations using objective-git, having trouble figuring out how "unstage" file. more specifically, have file changes have been added current gtindex , want discard changes (without losing file's current state on disk).

here rough outline of relevant logic program follows when toggling "staged" state of file:

- fetch current gtindex using gtrepository.indexwitherror: - fetch gtindexentry file using gtindex.entrywithpath: - if file has index , gtindexentry.status == gtindexentrystatusupdated:     - here's i'm stuck

according old unanswered question need lookup file's info in current head. in case, logic arrived at:

- fetch head's gtreference using gtrepository.headreferencewitherror: - if reference resolves gtcommit object:     - fetch gttree using gtcommit.tree     - fetch file's gttreeentry using gttree.entrywithpath:error:     - stuck again! convert gttreeentry gtindexentry somehow?

any guidance appreciated! i'm not scared of jumping directly libgit2 if have (this project has necessitated once or twice), since i'm working in swift i'd avoid if can , "unstaging" file seems such standard procedure figured must not understanding how objective-git classes tie together.

after letting sit little longer, discovered it's lot easier making it; rather comparing head tree active index, can use gtrepository.statusforfile:success:error: determine whether file staged, unstaged, etc. , add, remove, or add blob file based on that.

original approach

(on off chance contains useful info others down road.)

this turned out simpler seemed @ first, because transitioning between gttreeentry , gtindexentry unnecessary. instead, needed grab gttreeentry's gtobject (which blob files), pass blob's data gtindex.

i ended code flow goes this:

- fetch head's gtreference using gtrepository.headreferencewitherror: - if reference resolves gtcommit =>     - fetch gtindexentry using gtindex.entrywithpath:     - if have index entry =>         - fetch gttree using gtcommit.tree         - fetch gttreeentry using gttree.entrywithpath:error:         - if gttreeentry.sha == gtindexentry.oid.sha =>             - gtindex.addfile:error:             (using approach, it's possible end identical              tree , index entries, means file unstaged)         - else if gttreeentry.type == gtobjecttypeblob =>             - fetch gtblob using gttreeentry.gtobject:error:             - pass gtblob.data gtindex.adddata:withpath:error:         - else if no gttreeentry => gtindex.removefile:error:     - else add file/directory gtindex (since have no index entry)     - write changes disk gtindex.write:

a couple of notes in hopes helpful future generations of people bashing heads against objective-git's largely undocumented hide:

  • gtindexentry.status useless in scenario; references flags used internally libgit2 during construction of index not helpful determining status of files afterward (i'm frankly not sure why these flags exposed objective-git @ all)
  • if want un/stage files in working directory, can have objective-git lot of legwork using gtdiff's +diffindexfromtree:inrepository:options:error:

Comments

Post a Comment

Popular posts from this blog

authentication - Mongodb revoke acccess to connect test database -

i have ec2 instance mongodb 3.2.0 installed. have user admin access. can connect user , perform operation remotely. 1 can connect database test remote if knows ip mongo 11.11.11.11. although not able make operations, want restrict access user credentials can connect server. first need create users , grant roles users, example: use admin db.createuser( { user: "myuseradmin", pwd: "abc123", roles: [ { role: "useradminanydatabase", db: "admin" } ] } ) then need start server --auth parameter mongod --auth more information here
Read more

r - Update two sets of radiobuttons reactively - shiny -

i have read ( how make choices in radiobuttons reactive in shiny? ) shows me how update radiobutton s in reactive way. however, when try , update 2 sets of buttons same data, 1 set renders. example: server: # create example data wafer <- rep(c(1:3), each=3) length <- c(1,1,2,1,1,1,3,5,1) width <- c(3,1,6,1,1,1,1,1,6) dd <- data.frame(wafer, length, width) shinyserver(function(input, output, session){ # create reactive dataframe store data values <- reactivevalues() values$df <- data.frame() # lengths , widths of wafer user input <- eventreactive(input$do, { subset(dd, wafer %in% input$wafer, select = length:width) }) # update reactive data frame lengths , widths have been selected user input observe({ if(!is.null(a())) { values$df <- rbind(isolate(values$df), a()) } }) output$wl <- renderdatatable({ a() }) # update radio buttons unique length , widths stored in values$df # ever "observe" put first in co...
Read more

ios - Realm over CoreData should I use NSFetchedResultController or a Dictionary? -

i'm working on app using core data , nsfetchedresultcontroller many reasons switch use realm. saw there "realm version" of nsfetchedresultcontroller on github wouldn't compatible current code using core data. the view controller displaying list of people same school, address book. list sublist of people studied in same city. so thinking make 1 unique request database retrieve list of people , filter locally list within 1 dictionary per school [string: anyobject] string section name within tableview , anyobject array of people. first solution, make nsfetchedresultcontroller each school predicate filtering location. delete actions etc.. handled delegates -> not compatible realm create dictionaries , update them each actions... -> works realm it's annoying code. any better solution? edit: i need clarify request: i'd write class inherit uitableviewcontroller. this class has list of people sorted in alphabetical order the tableview has ...
Read more