Wrap all the various way of doing checkouts in GTCheckoutOptions #459

tiennou · 2015-04-10T20:27:54Z

Fixes #457

tiennou · 2015-04-10T20:33:25Z

I hit some "disappointment" while transitioning the clone API. I'm not sure what to do, so I wrote a wrapper for the current BOOL option, but I'd like some feedback on that.

Tests are passing here, and right now it handles the same thing as before, but now it can be more easily extended for the other use cases. I might take a look this week-end at adding path support for the checkout case (since I think clone is pretty complete).

@jspahrsummers Feel free to hint me at some use cases you need to switch to Objectified glory ;-).

joshaber · 2015-04-14T14:11:06Z

I don't feel strongly about this one way or the other. Anyone else?

mdiep · 2015-04-14T14:21:58Z

I'd rather not wrap these in a class, personally.

jspahrsummers · 2015-04-15T20:30:53Z

I think this approach makes sense if there are many different operations that may need “checkout options.” I don't know if that's the case or not.

tiennou · 2015-04-15T22:10:15Z

Here's a list : cherrypick, clone (we're handling that already), merge, rebase, reset, reset, revert, submodule.

Note that some of them have those options as a parameter, others have them included in another git_*_options.

tiennou · 2015-09-08T21:19:52Z

Rebased that against master, and added support for the just-landed stash API.

Note that b4d5816, fcbcf23 and cc41976 have nothing to do with proposal, so cherry-picking them MIGHT be good.

joshaber · 2015-09-09T14:09:36Z

🤘

Looks like some tests need to be updated still.

tiennou · 2015-09-09T23:08:44Z

My bad, forgot to run the tests :-S. It should pass now.

joshaber · 2015-09-10T15:01:17Z

Looks like there are still some legit build failures 😞

tiennou · 2015-09-10T18:13:44Z

Really, that thing was built, and tested here...

http://i.imgur.com/JESUH96.jpg

joshaber · 2015-09-10T18:15:40Z

👏

tiennou · 2015-09-10T18:20:51Z

Should be good now. Maybe. Who Knows.

joshaber · 2015-09-10T19:51:32Z

ObjectiveGit/GTRepository+Stashing.m

+		stash_options.checkout_options = *options.git_checkoutOptions;
+	}
+
+	if (pop == NO) {


This combining of the methods feels off to me since they're pretty different things.

Yeah, I wasn't really proud of that when I DRYed it... I'll revert that one.

joshaber · 2015-09-10T19:59:24Z

🤘

Some 📝 above.

tiennou · 2015-09-10T20:57:29Z

ObjectiveGit/GTRepository.h

@@ -216,7 +191,7 @@ extern NSString * const GTRepositoryInitOptionsOriginURLString;
 /// options               - A dictionary consisting of the options:
 ///                         `GTRepositoryCloneOptionsTransportFlags`,
 ///                         `GTRepositoryCloneOptionsBare`,
-///                         `GTRepositoryCloneOptionsCheckout`,
+///                         `GTRepositoryCloneCheckoutOptions`,


Bikeshedding welcome ;-).

pietbrauer · 2016-01-11T04:56:53Z

@joshaber @tiennou Whats the state of this one? Seems, comments were applied, tests run through and everything seems fine 🤔

tiennou · 2016-01-11T12:16:39Z

Well, apart from my own questions on naming things and copying blocks, it still looks fine ;-).

joshaber · 2016-01-11T16:30:28Z

Ah, I didn't realize it was ready for re-review 😄

joshaber · 2016-01-11T16:32:31Z

Just 1️⃣ 📔 about deprecating the old methods.

tiennou · 2016-06-28T08:06:36Z

Rebased because Xcode decided to eat my submodules (thanks Xcode). Sorry about that. I've removed all stuff related to my tentative merging of the stash machinery since that was unrelated and added 8449a34 to handle pathspecs.

@joshaber I can't seem to parse your emojies, what did you meant ?

For a finer control over the unstash process, propogate checkout strategy to Objective-Git from the underlying libgit2 stash methods.

tiennou · 2016-12-18T13:49:10Z

@pietbrauer Can this be reviewed/merged ? It seems @slavikus has made a few commits that add checkout customization support to stash, which was the point of this PR.

pietbrauer · 2016-12-19T09:13:25Z

@tiennou Can you and @slavikus sort that out? I don't have a huge stake in this PR and just pinged people so we can merge/close some PRs.

tiennou · 2016-12-22T00:27:23Z

I just am generally cautious about abusing my own merge rights, that's all. Let's say that if there's no movement here until next year, I'll merge.

slavikus · 2017-01-11T10:23:07Z

@tiennou the new year is here, what should we do? :)

Fixes #457

tiennou · 2017-01-15T14:07:24Z

Added documentation and fixed a few dangling things. @slavikus can you review that ? I just want to make sure it's 👍 by at least another set of eyes before merging...

pietbrauer · 2017-02-27T09:36:07Z

I felt adventurous today so I thought I would merge this. Looked good to me and it's not that the world would stop moving if we merge this. Thanks for the effort @tiennou!

slavikus · 2017-02-27T09:37:23Z

Dangit, missed the initial notification back in January for some reason. I've been following this merge for a while, and I think it's looking good. Thanks guys!

# Conflicts: # ObjectiveGit/GTRepository+Stashing.m

# Conflicts: # ObjectiveGit/GTRepository.h # ObjectiveGit/GTRepository.m

tiennou mentioned this pull request Sep 8, 2015

Add stash apply & pop support #501

Merged

tiennou force-pushed the checkout-options branch from de9f512 to d4583ba Compare September 8, 2015 21:15

joshaber self-assigned this Sep 9, 2015

joshaber reviewed Sep 10, 2015
View reviewed changes

tiennou reviewed Sep 10, 2015
View reviewed changes

tiennou force-pushed the checkout-options branch from 460f397 to 5d7f98a Compare June 28, 2016 08:00

tiennou force-pushed the checkout-options branch from 8361d3c to 2c5338a Compare December 18, 2016 12:28

tiennou referenced this pull request Dec 18, 2016

Add checkout strategy to stash apply/pop methods

54b50cd

For a finer control over the unstash process, propogate checkout strategy to Objective-Git from the underlying libgit2 stash methods.

tiennou added 12 commits January 15, 2017 14:38

Wrap all the various way of doing checkouts in GTCheckoutOptions

311ca45

Fixes #457

0xdeadbeef

3cb36a8

Missing documentation for parameter

f66d713

Add checkout options support to stash API.

84fd119

Fix stash tests

dea9507

Switch to the modern object-wrap syntax

e03bee9

Explicit comparison with nil

af07357

Add pathspec support to GTCheckoutOptions

7e6719f

Fix a newly added checkout strategy call

a5ed471

Remove deprecated method on GTRepository

8841ce7

Ability to checkout from an index

9d131a3

Missing newline at EOF

24fb88d

tiennou force-pushed the checkout-options branch from 2c5338a to 24fb88d Compare January 15, 2017 13:38

tiennou added 3 commits January 15, 2017 14:54

Documentation

261d619

Add new checkout strategies

4fe2e03

Options has gone away

3c515b0

pietbrauer merged commit c0e98a2 into master Feb 27, 2017

pietbrauer deleted the checkout-options branch February 27, 2017 09:35

pietbrauer mentioned this pull request Feb 27, 2017

Add checkout strategy to stash apply/pop methods #606

Merged

slavikus added a commit to slavikus/objective-git that referenced this pull request Feb 27, 2017

Fix conflicts with pull request libgit2#459

00a5bc4

# Conflicts: # ObjectiveGit/GTRepository+Stashing.m

slavikus added a commit to slavikus/objective-git that referenced this pull request Feb 27, 2017

Fix conflicts from libgit2#459

ed7e21a

# Conflicts: # ObjectiveGit/GTRepository.h # ObjectiveGit/GTRepository.m

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Wrap all the various way of doing checkouts in GTCheckoutOptions #459

Wrap all the various way of doing checkouts in GTCheckoutOptions #459

tiennou commented Apr 10, 2015

tiennou commented Apr 10, 2015

joshaber commented Apr 14, 2015

mdiep commented Apr 14, 2015

jspahrsummers commented Apr 15, 2015

tiennou commented Apr 15, 2015

tiennou commented Sep 8, 2015

joshaber commented Sep 9, 2015

tiennou commented Sep 9, 2015

joshaber commented Sep 10, 2015

tiennou commented Sep 10, 2015

joshaber commented Sep 10, 2015

tiennou commented Sep 10, 2015

joshaber Sep 10, 2015

tiennou Sep 10, 2015

joshaber commented Sep 10, 2015

tiennou Sep 10, 2015

pietbrauer commented Jan 11, 2016

tiennou commented Jan 11, 2016

joshaber commented Jan 11, 2016

joshaber commented Jan 11, 2016

tiennou commented Jun 28, 2016

tiennou commented Dec 18, 2016

pietbrauer commented Dec 19, 2016

tiennou commented Dec 22, 2016

slavikus commented Jan 11, 2017

tiennou commented Jan 15, 2017

pietbrauer commented Feb 27, 2017

slavikus commented Feb 27, 2017

Wrap all the various way of doing checkouts in GTCheckoutOptions #459

Wrap all the various way of doing checkouts in GTCheckoutOptions #459

Conversation

tiennou commented Apr 10, 2015

tiennou commented Apr 10, 2015

joshaber commented Apr 14, 2015

mdiep commented Apr 14, 2015

jspahrsummers commented Apr 15, 2015

tiennou commented Apr 15, 2015

tiennou commented Sep 8, 2015

joshaber commented Sep 9, 2015

tiennou commented Sep 9, 2015

joshaber commented Sep 10, 2015

tiennou commented Sep 10, 2015

joshaber commented Sep 10, 2015

tiennou commented Sep 10, 2015

joshaber Sep 10, 2015

Choose a reason for hiding this comment

tiennou Sep 10, 2015

Choose a reason for hiding this comment

joshaber commented Sep 10, 2015

tiennou Sep 10, 2015

Choose a reason for hiding this comment

pietbrauer commented Jan 11, 2016

tiennou commented Jan 11, 2016

joshaber commented Jan 11, 2016

joshaber commented Jan 11, 2016

tiennou commented Jun 28, 2016

tiennou commented Dec 18, 2016

pietbrauer commented Dec 19, 2016

tiennou commented Dec 22, 2016

slavikus commented Jan 11, 2017

tiennou commented Jan 15, 2017

pietbrauer commented Feb 27, 2017

slavikus commented Feb 27, 2017