Status Next #239

dannygreg · 2013-08-09T21:07:27Z

This brings Objective-Git's wrapping of the status up-to-date with the lurvely new status list API. Adding some unit tests in the process.

We also fix up our horrendous handling of fixtures, including their creation and cleanup.

This time we use our GTStatusDelta objects.

It was never meant for just pathspecs so that name didn't really make any sense at all. This also makes the method slightly more resilient to arrays with more than just strings in them. Generics in Objective C would sure be nice!

This is just in the working directory right now. Need to figure out the best way to change stages in this test.

rowanj · 2013-08-19T02:49:14Z

I like the look of this; the status enumeration was tougher to get right than I'd like in my GUI project, so 👍 for any work to improve that.

Seems to still be missing a wrapper to get the status of a particular file (git_status_file(...)); have you got any thoughts on adding something like that?

dannygreg · 2013-08-20T18:54:21Z

As of yet no… as I thought there would be very few cases where you would actually want to do that.

We could go with a GTStatusList object to match the API from libgit2 but I'm not sold on how great an idea that is.

dannygreg · 2013-08-21T00:37:03Z

Removed the [WIP] tag so folks can review this for reals now. Still not sure how on earth we should test the staged status.

jspahrsummers · 2013-08-21T03:37:18Z

I haven't reviewed this yet, but you can test staged stuff by manually manipulating GTIndex in the tests.

dannygreg · 2013-08-22T00:54:02Z

Ended up using the libgit2 index API directly in the end. GTIndex could certainly use some love.

dannygreg · 2013-08-22T00:54:50Z

Just noticed I need to document a bunch of stuff in this PR. Chucking [WIP] back on till I have cleared that up.

Conflicts: Classes/GTRepository.h Classes/ObjectiveGit.h External/libextobjc/extobjc/EXTScope.h External/libextobjc/extobjc/EXTScope.m ObjectiveGitFramework.xcodeproj/project.pbxproj

dannygreg · 2013-10-08T16:43:49Z

🍍

It was all commented out anyway ¬.¬.

We seemed to have 2 completely different codepaths, which depending on which you picked, would lead to a different set of fixtures being used by your test. This was also the root cause of our faulty clean up. Now there is but one set of fixtures and it's set up and torn down properly.

Some test case classes needed to be changed to be GTTestCase but there were no ill-effects. Hell yeah duplicated code --;

dannygreg · 2013-10-08T19:31:34Z

OK I yak shaved our horrendous fixture creation and management. Unfortunately that now makes this changeset huge, but hey.

@jspahrsummers this is good for another look through now.

jspahrsummers · 2013-10-09T01:18:45Z

Classes/GTDiff.m

+	git_strarray strArray = pathSpec.git_strarray;
+	if (pathSpec != nil) newOptions.pathspec = strArray;
+	@onExit {
+		git_strarray_free((git_strarray *)&strArray);


lol blocks and const

Not entirely sure what you mean :p

jspahrsummers · 2013-10-09T01:26:15Z

💖 for fixing up the unit tests.

dannygreg · 2013-10-09T21:24:49Z

🚑

jspahrsummers · 2013-10-10T07:08:03Z

🚒

Status Next

boidanny added 22 commits August 8, 2013 15:38

Sketch out a status delta.

6d8ba17

Flesh out the status delta.

fae803d

Abstract out the string array creation.

15e510e

Remove status API from GTRepository.h/m

62469e2

Sketch status API in a category.

cc7f9ac

Re-implement status enumeration.

809464f

This time we use our GTStatusDelta objects.

Fix ARC complaint.

5b4af26

Xcode project updates.

95ff2ad

NSArray+Pathspec -> NSArray+StringArray

79f358c

It was never meant for just pathspecs so that name didn't really make any sense at all. This also makes the method slightly more resilient to arrays with more than just strings in them. Generics in Objective C would sure be nice!

Unnecessary double import --;

d940362

Import GTRepository.h rather than all of ObjGit.

712a8ef

Update catch-all header.

f8af19f

Project changes that XDacted seemed determined to miss.

8713e5b

Don't initialise with a nil delta.

e6be32e

Go back to pointer school Danny.

dfa4f1d

Options typo --

223f61b

Add the status delta to the catch-all header.

7c6a0f8

Add a test spec stub and test for untracked files.

257d20b

Remove the repo+status spec from the iOS lib target.

233fb28

Add tests for untracked, modified and deleted files.

b09f4b9

This is just in the working directory right now. Need to figure out the best way to change stages in this test.

Handle copying and renaming.

06b3b94

Test ignored files.

953b997

rowanj mentioned this pull request Aug 19, 2013

Add API for individual file status #241

Closed

Update tests to also take the index into account.

c633bfc

Merge branch 'master' into status-take-2

e6265e5

Conflicts: Classes/GTRepository.h Classes/ObjectiveGit.h External/libextobjc/extobjc/EXTScope.h External/libextobjc/extobjc/EXTScope.m ObjectiveGitFramework.xcodeproj/project.pbxproj

boidanny added 4 commits October 8, 2013 10:44

Go with double rather than CGFloat.

097b649

Remove the repository pack test.

fabe8ab

It was all commented out anyway ¬.¬.

Update all tests to use the updated fixture management.

bbcec9e

Some test case classes needed to be changed to be GTTestCase but there were no ill-effects. Hell yeah duplicated code --;

jspahrsummers reviewed Oct 9, 2013
View reviewed changes

boidanny added 6 commits October 9, 2013 14:00

Lol newline --

468eebf

100 -> 1

73720b8

Floats EVERYWHERE!

892b186

You get a public header, and you get a public header and…

9514717

Indentation lulz --

ead9af3

Temporaries ftw.

90468c4

Fix some more headers' visibility

fda710d

jspahrsummers added a commit that referenced this pull request Oct 10, 2013

Merge pull request #239 from libgit2/status-take-2

64e32d2

Status Next

jspahrsummers merged commit 64e32d2 into master Oct 10, 2013

jspahrsummers deleted the status-take-2 branch October 10, 2013 07:08

phatblat pushed a commit to phatblat/objective-git that referenced this pull request Sep 13, 2014

Merge pull request libgit2#239 from libgit2/status-take-2

610b033

Status Next

jspahrsummers removed their assignment May 22, 2015

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Status Next #239

Status Next #239

dannygreg commented Aug 9, 2013

rowanj commented Aug 19, 2013

dannygreg commented Aug 20, 2013

dannygreg commented Aug 21, 2013

jspahrsummers commented Aug 21, 2013

dannygreg commented Aug 22, 2013

dannygreg commented Aug 22, 2013

dannygreg commented Oct 8, 2013

dannygreg commented Oct 8, 2013

jspahrsummers Oct 9, 2013

dannygreg Oct 9, 2013

jspahrsummers commented Oct 9, 2013

dannygreg commented Oct 9, 2013

jspahrsummers commented Oct 10, 2013

Status Next #239

Status Next #239

Conversation

dannygreg commented Aug 9, 2013

rowanj commented Aug 19, 2013

dannygreg commented Aug 20, 2013

dannygreg commented Aug 21, 2013

jspahrsummers commented Aug 21, 2013

dannygreg commented Aug 22, 2013

dannygreg commented Aug 22, 2013

dannygreg commented Oct 8, 2013

dannygreg commented Oct 8, 2013

jspahrsummers Oct 9, 2013

Choose a reason for hiding this comment

dannygreg Oct 9, 2013

Choose a reason for hiding this comment

jspahrsummers commented Oct 9, 2013

dannygreg commented Oct 9, 2013

jspahrsummers commented Oct 10, 2013