Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Git client part 2: HTTP #418

Merged
merged 34 commits into from
Jun 28, 2024
Merged

Git client part 2: HTTP #418

merged 34 commits into from
Jun 28, 2024

Conversation

AtkinsSJ
Copy link
Collaborator

@AtkinsSJ AtkinsSJ commented May 22, 2024 •
edited
Loading

Initially this was just about HTTP but it's ended up being many things. Enjoy!

New commands:

  • git clone
  • git remote
  • git branch
  • git fetch
  • git pull
  • git push
  • git checkout
  • git diff
  • git restore
  • git cherry-pick

Other noteworthy features:

  • Coloured output
  • Diff display
  • Ref names show up when looking at commits
  • Bug fixes

@AtkinsSJ AtkinsSJ mentioned this pull request May 22, 2024
Merged
@AtkinsSJ AtkinsSJ force-pushed the git-client-http branch 4 times, most recently from f991278 to c8c9901 Compare June 4, 2024 15:43
@AtkinsSJ
Copy link
Collaborator Author

AtkinsSJ commented Jun 4, 2024

git checkout <from> -- <pathspec>... is... interesting. I have a stash where I added the functionality, which isogit actually does for you as part of their git.checkout() function... except it just does a bunch of processing, after which the files haven't changed. So I might be missing something.

@AtkinsSJ AtkinsSJ mentioned this pull request Jun 5, 2024
Draft
@AtkinsSJ AtkinsSJ force-pushed the git-client-http branch 5 times, most recently from 29845e2 to b48f3ca Compare June 11, 2024 15:34
@AtkinsSJ AtkinsSJ force-pushed the git-client-http branch 7 times, most recently from f64f482 to 6abae0a Compare June 24, 2024 16:49
@AtkinsSJ AtkinsSJ marked this pull request as ready for review June 26, 2024 16:44
@AtkinsSJ
Copy link
Collaborator Author

Marking this as ready, so people have a chance to ask for changes! 😅

There's more I'd like to do, particularly making commit references like HEAD~2, or master^1, work, but that doesn't have to delay this PR. I'll just add that if this isn't merged, or submit another PR with it. :^)

git is far more pleasant to use with the changes in #498, too.

@jelveh
Copy link
Contributor

jelveh commented Jun 26, 2024

Can't wait to merge this 💙

@AtkinsSJ AtkinsSJ mentioned this pull request Jun 27, 2024
Open
@AtkinsSJ
Copy link
Collaborator Author

Parsing foo^ and HEAD~3 turned out to be relatively straightforward, so that's added here. :^)

@AtkinsSJ
feat(git): Implement git clone
96f047d
@AtkinsSJ
feat(git): Implement git remote
9226bf3
@AtkinsSJ
feat(git): Implement git branch
8fc90c6 
Create, delete, copy, rename, and list branches.
@AtkinsSJ
Remove unused imports from git subcommands
eeeb193
@AtkinsSJ
feat(git): Implement git fetch
ae5ae43 
Sporadically we hang while trying to fetch. I haven't been able to
identify why but it seems like a race condition in isomorphic-git
somewhere.
@AtkinsSJ
feat(git): Add start-revision and file arguments to git log
69c589f
@AtkinsSJ
feat(git): Implement git diff
2d87b6a
@AtkinsSJ
docs(git): Document git client
f4dc7e4
@AtkinsSJ
tweak(git): Check for 'ENOENT' instead of ErrorCodes.ENOENT
323cb7a 
This is functionally the same, but removes one place where we
unnecessarily relied on Puter code.
@AtkinsSJ
tweak(git): Move proxy url definition into config files
8d26f7b 
We'll likely want to host our own proxy. Self-hosters likewise may have
their own, but it's convenient to use isomorphic-git's for development.
@AtkinsSJ
feat(git): Add diff display to show and log subcommands
9c42d8c
@AtkinsSJ
feat(git): Implement git push
95e1cf2 
For now, the authentication is by --username and --password options,
which obviously is not good because the password is visible. But doing
it in a nicer way requires features that Phoenix or Puter are currently
missing.
@AtkinsSJ
feat(git): Add authentication to clone, fetch, and pull.
49b3b53
@AtkinsSJ
feat(git): Add --color and --no-color options
7bda9e0 
These allow the user to force color on or off. The chalk library is used
for the output, because it's already used elsewhere in Puter and seems
like a good choice.

Ideally, the default will be based on whether stdout is a tty, but Puter
doesn't yet have that concept, so we just default to color.
@AtkinsSJ
feat(git): Handle detached HEAD in git status and git branch --list
f372137
@AtkinsSJ
feat(git): Allow checking out a commit instead of a branch
7418ca2
@AtkinsSJ
feat(git): Make git add work for deleted files
8705546 
Previously, this:

```sh
> rm deleted.txt
> git add deleted.txt
```

...would unhelpfully complain that deleted.txt cannot be found. Now, it
records the deleted file to the index, just as canonical git does.
@AtkinsSJ
feat(git): Format output closer to canonical git
7197dcf 
Make some parts colored or bold, and indent commit messages.
@AtkinsSJ
feat(git): Resolve more forms of commit reference
63c7572 
Specifically, we previously didn't resolve short commit hashes into the
full ones.

These functions provide a single place to later add more ways of
selection a commit, such as `HEAD~1`.
@AtkinsSJ
feat(git): Display file contents as a string for git show FILE_OID
e43af75
@AtkinsSJ
feat(git): Implement git restore
1a6eb13 
I tried implementing --source=foo too, but was bumping into weird
behaviour with isomorphic-git, so I've removed that for now. Eventually
we'll want it, but it seems fairly niche.
@AtkinsSJ
feat(git): Color output for git status files
6b9fe0e 
Matching canonical git, staged changes are green and unstaged/untracked
are red.
@AtkinsSJ
feat(git): Implement git cherry-pick
226dcd4 
This is quite manual, and only handles the simple cases where no merge
conflicts occur. Should be useful for basing a `rebase` command off of
though.
@AtkinsSJ
feat(git): Add a --debug option, which sets the DEBUG global
da0d217 
I ended up removing the debugging code that used this, but it seems
useful anyway for future debug logs.
@AtkinsSJ
feat(git): Make shorten_hash() guaranteed to produce a unique hash
40ea438 
Until now we just relied on it being very unlikely that there would be a
collision. This new method ensures that the returned hash is unique.
@AtkinsSJ
fix(git): Make git commit display detached HEAD correctly
fe7fed7
@AtkinsSJ
tweak(git): List git subcommands in git help with no arguments
4e77b16
@AtkinsSJ
feat(git): Display ref names in git log and git show
e3945d8
@AtkinsSJ
refactor: Move parsely into top-level packages directory
c1c5983 
Parsely was missed by fa7bec3 because
it got merged afterwards.
@AtkinsSJ
feat(git): Understand references like HEAD^ and main~3
84c957a 
There are a lot of ways of specifying a revision, but these are a couple
of common ones.
@KernelDeimos KernelDeimos merged commit d077504 into HeyPuter:main Jun 28, 2024
5 checks passed
@AtkinsSJ AtkinsSJ deleted the git-client-http branch June 28, 2024 20:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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.
3 participants
@AtkinsSJ @jelveh @KernelDeimos