Skip to content

Commit

Permalink
Merge branch 'master' of github.com:orf/git-workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
orf committed Dec 9, 2022
2 parents e9d6cd2 + bd46fda commit 04cf179
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 39 deletions.
87 changes: 56 additions & 31 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ exclude = ["workspace/**", "images/**", ".github/**"]

[dependencies]
toml = "0.5.7"
serde = { version = "1.0.117", features = ["derive"] }
anyhow = "1.0.34"
serde = { version = "1.0.145", features = ["derive"] }
anyhow = "1.0.65"
structopt = "0.3.20"
rayon = "1.5.0"
graphql_client = "0.10.0"
graphql_client = "0.11.0"
walkdir = "2.3.1"
fs_extra = "1.2.0"
indicatif = { version = "0.16.2", features = ["with_rayon"] }
console = { version = "0.15.0", features = ["ansi-parsing"], default_features = false } # We don't care about unicode widths
console = { version = "0.15.2", features = ["ansi-parsing"], default_features = false } # We don't care about unicode widths
atomic-counter = "1.0.1"
ureq = { version = "2.4.0", features = ["json"] }
serde_json = "1.0.81"
globset = "0.4.6"
ureq = { version = "2.5.0", features = ["json"] }
serde_json = "1.0.86"
globset = "0.4.9"
# Workaround for https://github.com/rust-lang/git2-rs/issues/838
git2 = { version = "<0.14.0", default_features=false }
git2 = { version = "<0.16.0", default_features=false }

[target."cfg(unix)".dependencies]
expanduser = "1.2.1"
Expand Down
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,18 @@ function open-project -d "Open a project"
end
```

## Zsh, with [fzf](https://github.com/junegunn/fzf)

```
function project {
local filter="$@"
local chosen_project=$(git workspace list | fzf -q "$filter")
if [[ -n $chosen_project ]]; then
pushd "$GIT_WORKSPACE/$chosen_project"
fi
}
```

## Bash, with [fzf](https://github.com/junegunn/fzf)

Contributed by a user (@kreyren:github.com):
Expand Down Expand Up @@ -211,6 +223,7 @@ wsp() {

Consider using [shfmt](https://github.com/patrickvane/shfmt) to optimize the file size.


# Contributing :bug:

This is my first 'proper' Rust project. If you're experienced with Rust you might puke at the code, but any feedback to help me improve would be greatly appreciated!
Expand Down

0 comments on commit 04cf179

Please sign in to comment.