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.

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

added timeout to gitstatus.py #96

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
b5705d9
added timeout to gitstatus.py
thomasrebele Nov 27, 2016
e05a3c8
removed superfluous calls to git diff
thomasrebele Nov 27, 2016
0daf121
added number of untracked files
thomasrebele Nov 27, 2016
cf1607d
count staged added files
thomasrebele Dec 1, 2016
7ef3016
count function
thomasrebele Dec 28, 2016
1efd4a4
find path of repository
thomasrebele Dec 28, 2016
1a7218f
working on client/server
thomasrebele Dec 29, 2016
6706cb4
server as daemon
thomasrebele Dec 29, 2016
ebc0e4f
merge to one file
thomasrebele Dec 29, 2016
e89c85a
don't register repos with many directories
thomasrebele Dec 29, 2016
b9ed3c6
don't start server if it runs already; client command
thomasrebele Dec 30, 2016
0484310
map instead of if...elif
thomasrebele Jan 2, 2017
9e454d8
also watch .git directory, to track
thomasrebele Apr 22, 2017
d05f1bf
update to python3
thomasrebele Dec 24, 2018
82d327e
migrate to python3
thomasrebele Dec 24, 2018
52974ca
cleanup
thomasrebele Dec 25, 2018
2da9af1
option for using watchdog
thomasrebele Dec 25, 2018
90b6614
rename src -> haskell
thomasrebele Dec 25, 2018
43cf566
working on rust port
thomasrebele Dec 26, 2018
ec6525b
remove haskel; move python
thomasrebele Dec 26, 2018
a546bd2
only trim end
thomasrebele Dec 26, 2018
058617b
add build script
thomasrebele Dec 26, 2018
31aa3f0
compile with stable rust
thomasrebele Dec 26, 2018
7e9a3df
ignore directories which are not a git repository
thomasrebele Apr 15, 2019
0057f9c
NO_COMMIT branch name
thomasrebele Jan 2, 2019
f69dd44
refactor passing info
thomasrebele Nov 6, 2019
bf4e20a
fix for non-git dirs
thomasrebele Nov 6, 2019
bb1bddf
avoid call to grep
thomasrebele Nov 6, 2019
ca10a2d
add remote
thomasrebele Nov 6, 2019
3317b5f
do not show remote if it does not exist
thomasrebele Nov 7, 2019
5b0c5c2
deleted files
thomasrebele Nov 7, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
src/.bin
src/.bin

rust/target/
16 changes: 3 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,26 +60,16 @@ When the branch name starts with a colon `:`, it means it’s actually a hash, n
## Install

1. Clone this repository somewhere on your hard drive.
2. Source the file `zshrc.sh` from your `~/.zshrc` config file, and
2. Install Rust and execute `install.sh`
3. Source the file `zshrc.sh` from your `~/.zshrc` config file, and
configure your prompt. So, somewhere in `~/.zshrc`, you should have:

```sh
source path/to/zshrc.sh
# an example prompt
PROMPT='%B%m%~%b$(git_super_status) %# '
```
3. Go in a git repository and test it!

### Haskell (optional)

There is now a Haskell implementation as well, which can be four to six times faster than the Python one. The reason is not that Haskell is faster in itself (although it is), but that this implementation calls `git` only once. To install, do the following:

1. Make sure [Haskell's stack](http://docs.haskellstack.org/en/stable/README.html#how-to-install) is installed on your system
2. `cd` to this folder
2. Run `stack setup` to install the Haskell compiler, if it is not already there
3. Run `stack build && stack install` (don't worry, the executable is only “installed” in this folder, not on your system)
4. Define the variable `GIT_PROMPT_EXECUTABLE="haskell"` somewhere in
your `.zshrc`
4. Go in a git repository and test it!

## Customisation

Expand Down
2 changes: 0 additions & 2 deletions Setup.hs

This file was deleted.

7 changes: 7 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

(
cd rust
cargo build --release
)

65 changes: 0 additions & 65 deletions gitstatus.py

This file was deleted.

Loading