Implement showing of git branch in the prompt #67
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We keep track of if we are inside a git repository inside the ShellState struct as well as if the branch was updated in the last command. In the main loop we then update the branch name if it wasn't already updated, and then show the branch in the prompt if we are inside a repository. We only visit `.git/HEAD` once per `set_cwd()` call and we only run again in the main loop if we did not run in that iteration yet. However I discovered that the `set_cwd()` call is being called twice in every iteration for some reason, and so we also read `.git/HEAD` twice. This is a separate issue so it should be fixed in a separate PR once this is merged.
|
@wolfv this is ready. |
|
Cool! I am fine with merging this, but I think for the future we should come up with e.g. a notification system where you could register functions that should run "on cwd change". Because this is pretty specific and only useful in the interactive shell mode. |
|
@prsabahrami also OK with merging for now? |
|
Maybe one thing we could do is create a new struct for all the Git related stuff. So that it's bundled in one object inside the shell state. |
|
This looks good to me. But I also agree with @wolfv on creating a separate struct for git stuff. I think it makes more sense. |
|
Let's merge for now, and refactor later! :) |
|
I already started to depend on the functionality haha |
|
Thanks. I created #74 for the refactoring. |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We keep track of if we are inside a git repository inside the ShellState struct as well as if the branch was updated in the last command. In the main loop we then update the branch name if it wasn't already updated, and then show the branch in the prompt if we are inside a repository.
We only visit
.git/HEADonce perset_cwd()call and we only run again in the main loop if we did not run in that iteration yet.However I discovered that the
set_cwd()call is being called twice in every iteration for some reason (#76), and so we also read.git/HEADtwice. This is a separate issue so it should be fixed in a separate PR once this is merged.