Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Fetch/push/pull #121

Merged
merged 59 commits into from
Apr 7, 2016
Merged

Fetch/push/pull #121

merged 59 commits into from
Apr 7, 2016

Conversation

joshaber
Copy link
Contributor

@joshaber joshaber commented Apr 5, 2016

⚠️ Dependent on #63. ⚠️

Fixes #85 and #123. Currently terribly ugly but functional.

  • Write config entries after pushing a new branch.
  • Verify that pull does The Right Thing.
  • Command to fetch.
  • Command to push.
  • Command to pull.
  • Are we getting progress info?
  • Figure out how to test it.

screen shot 2016-04-05 at 2 44 41 pm

joshaber added 30 commits April 1, 2016 17:20
@joshaber
Dummy out the push/pull component.
2f729b0
@joshaber
We don't really need to hold on to this.
6de1b74
@joshaber
Dummy out the PushPull view model.
7e19776
@joshaber
Add type declarations for fetch + cred.
debc9c5
@joshaber
Dummy out the fetch call.
fa0ecbc
@joshaber
Add type more type information for Remote.
45dd1e7
@joshaber
Add function to get remotes.
1903721
@joshaber
Try fetching with a remote.
af01b1f
@joshaber
It helps if your type declarations are right.
d987ab5
@joshaber
s/onClick/onclick
e47185c
@joshaber
Silence standard.
c437822
@joshaber
Alot more type declarations.
2982ee2
@joshaber
Stub out push.
dd6206f
@joshaber
Maybe some pulling too?
ddc0c98
@joshaber
Display errors and a progress spinner.
1564ca0
@joshaber
Don't shadow the username.
feeea3d
@joshaber
Provide a reasonable default refspec.
7b5a428
@joshaber
A nu todo.
98f8127
@joshaber
Fixed the type declaration for #upstream.
d456f0e
@joshaber
Build a reasonable default push refspec.
cf87b43
@joshaber
Consume the token the GitHub package provides.
425d29c
@joshaber
Pass the token down to the push/pull view model.
5cdc397
@joshaber
This should really be optional.
375d209
@joshaber
Pass the token through.
094e418
@joshaber
Fetch from all remotes.
c2a58b2
@joshaber
Pokemon.
e2d816c
@joshaber
Don't need this anymore.
5e8356f
@joshaber
Use a more appropriate error.
6e5508e
@joshaber
Support pushing new branches.
1a3f7bb
@joshaber
Don't need to do it anymore. Because we todid it.
755dc1b
joshaber added 16 commits April 6, 2016 14:40
@joshaber
Let's try it without actually pushing.
d54ac72
@joshaber
Put 'cloned' in the path so it's easier to see which part is failing.
5877fea
@joshaber
Clone bare to setup the remote repo.
bd67397
@joshaber
Verify the commit was pushed.
dc6e85d
@joshaber
Just use FETCH_HEAD.
d62fc5d
@joshaber
Put a commit on the remote to pull.
5573504
@joshaber
Test the events.
060757c
@joshaber
Just return null here and it'll do The Right Thing.
ad4e0ac
@joshaber
Don't need to log this anymore.
443772f
@joshaber
Always change in flight requests count even if the action throws.
13b250c
@joshaber
Clear the error after a timeout.
992e8f7
@joshaber
s/requestsInFlight/hasRequestsInFlight
a2f964e 
Make it clearer that it's a boolean.
@joshaber
Type declaration for TransferProgress.
1f976e6
@joshaber
Push doesn't need to be async anymore.
a223d43
@joshaber
Calculate the percentage for the progress callback.
d2bbf89
@joshaber
Make fetch progress more right.
7437031
@joshaber joshaber mentioned this pull request Apr 6, 2016
Closed
@joshaber
Copy link
Contributor Author

joshaber commented Apr 6, 2016

This is close. Just need to verify that the pull implementation does the right thing.

@joshaber
Copy link
Contributor Author

joshaber commented Apr 6, 2016

libgit2/objective-git#464 (comment) is the most thorough mechanical description of pull I've found to date.

@joshaber joshaber changed the title [WIP] Fetch/push/pull Fetch/push/pull Apr 7, 2016
@joshaber
Copy link
Contributor Author

joshaber commented Apr 7, 2016

This is working well enough to land and iterate on 🤘

@joshaber
Copy link
Contributor Author

joshaber commented Apr 7, 2016

/cc @simurai as it could use your 🎨 👀 when you get a chance.

@joshaber joshaber merged commit ab5160d into master Apr 7, 2016
@joshaber joshaber deleted the push-pull branch April 7, 2016 17:36
@joshaber
Copy link
Contributor Author

joshaber commented Apr 7, 2016

Also worth noting that this will only work if you have the GitHub package installed with #63 checked out.

@thedaniel
Copy link
Contributor

#63 is merged, yo

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@joshaber @thedaniel