Skip to content

Commit 5e23137

Browse files
committed
Change bin names from 'gio' to 'gix' and 'gixp'
Fixes #4
1 parent 11a32eb commit 5e23137

File tree

7 files changed

+28
-21
lines changed

7 files changed

+28
-21
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
TARGET_DIR: ./target
7474
# Emit backtraces on panics.
7575
RUST_BACKTRACE: 1
76-
BIN_NAME: gio
76+
BIN_NAME: gix
7777
strategy:
7878
matrix:
7979
build: [linux, linux-arm, macos]
@@ -199,7 +199,7 @@ jobs:
199199
TARGET_DIR: ./target
200200
# Emit backtraces on panics.
201201
RUST_BACKTRACE: 1
202-
BIN_NAME: gio
202+
BIN_NAME: gix
203203
strategy:
204204
matrix:
205205
build: [win-msvc, win-gnu, win32-msvc]

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ authors = ["Sebastian Thiel <[email protected]>"]
66
edition = "2018"
77
license = "MIT"
88
version = "0.1.0"
9-
default-run = "gio"
9+
default-run = "gix"
1010
include = ["src/**/*", "LICENSE.md", "README.md", "CHANGELOG.md"]
1111

1212
[[bin]]
13-
name="gio"
13+
name="gix"
1414
path="src/porcelain-cli.rs"
1515
test = false
1616
doctest = false
1717

1818

1919
[[bin]]
20-
name="giop"
20+
name="gixp"
2121
path="src/plumbing-cli.rs"
2222
test = false
2323
doctest = false

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ debug-small: always ## minimal dependencies, at cost of performance
3737

3838
##@ Development
3939

40-
target/release/gio: always
40+
target/release/gix: always
4141
cargo build --release --no-default-features --features small
4242

4343
lint: ## Run lints with clippy
4444
cargo clippy
4545

46-
profile: target/release/gio ## run callgrind and annotate its output - linux only
46+
profile: target/release/gix ## run callgrind and annotate its output - linux only
4747
valgrind --callgrind-out-file=callgrind.profile --tool=callgrind $< >/dev/null
4848
callgrind_annotate --auto=yes callgrind.profile
4949

50-
benchmark: target/release/gio ## see how fast things are, powered by hyperfine
50+
benchmark: target/release/gix ## see how fast things are, powered by hyperfine
5151
hyperfine '$<'
5252

5353
##@ Testing
@@ -81,11 +81,11 @@ continuous-unit-tests: ## run all unit tests whenever something changes
8181

8282
journey-tests: always ## run stateless journey tests (max)
8383
cargo build
84-
./tests/stateless-journey.sh target/debug/gio target/debug/giop max
84+
./tests/stateless-journey.sh target/debug/gix target/debug/gixp max
8585

8686
journey-tests-small: always ## run stateless journey tests (lean-cli)
8787
cargo build --no-default-features --features small
88-
./tests/stateless-journey.sh target/debug/gio target/debug/giop small
88+
./tests/stateless-journey.sh target/debug/gix target/debug/gixp small
8989

9090
continuous-journey-tests: ## run stateless journey tests whenever something changes
9191
watchexec $(MAKE) journey-tests
@@ -102,10 +102,10 @@ $(linux_repo):
102102

103103
stress: ## Run various algorithms on big repositories
104104
$(MAKE) -j3 $(linux_repo) $(rust_repo) release-lean
105-
time ./target/release/giop verify-pack --verbose --statistics $(rust_repo)/.git/objects/pack/*.idx
106-
time ./target/release/giop verify-pack --verbose --algorithm less-memory $(rust_repo)/.git/objects/pack/*.idx
107-
time ./target/release/giop verify-pack --verbose --re-encode $(rust_repo)/.git/objects/pack/*.idx
108-
time ./target/release/giop verify-pack --verbose --re-encode $(linux_repo)/objects/pack/*.idx
105+
time ./target/release/gixp verify-pack --verbose --statistics $(rust_repo)/.git/objects/pack/*.idx
106+
time ./target/release/gixp verify-pack --verbose --algorithm less-memory $(rust_repo)/.git/objects/pack/*.idx
107+
time ./target/release/gixp verify-pack --verbose --re-encode $(rust_repo)/.git/objects/pack/*.idx
108+
time ./target/release/gixp verify-pack --verbose --re-encode $(linux_repo)/objects/pack/*.idx
109109

110110
##@ Maintenance
111111

README.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[![Rust](https://github.com/Byron/git-oxide/workflows/Rust/badge.svg)](https://github.com/Byron/git-oxide/actions)
22
[![Crates.io](https://img.shields.io/crates/v/gitoxide.svg)](https://crates.io/crates/gitoxide)
33

4-
**gio** is a command-line interface (*CLI*) to access git repositories. It's written to optimize the
4+
**gix** is a command-line interface (*CLI*) to access git repositories. It's written to optimize the
55
user-experience, and perform as good or better than the native implementation, and make git tooling more
66
hackable.
77

@@ -40,17 +40,23 @@ The CLI uses various crates, please see _'Development Status'_ for details.
4040
* [ ] streaming write
4141
* **packs**
4242
* [x] traverse pack index
43-
* [ ] decode
43+
* [x] decode
4444
* [x] full objects
4545
* [x] deltified objects
46+
* **advanced**
4647
* [ ] Multi-Pack index file (MIDX)
4748
* [ ] 'bitmap' file
4849
* [ ] encode
4950
* [ ] create new packs
51+
* [ ] create 'thin' pack
5052
* [x] verify pack with statistics
5153
* [ ] pack streaming (i.e. indexing + resolution)
5254
* [ ] use pack streaming for verification for performance and correctness
5355
* [ ] API documentation with examples
56+
* **sink**
57+
* [x] write objects and obtain id
58+
* **multi-odb**
59+
* [ ] _an ODB for object lookup from multiple lower level ODB at once_
5460
* **promisor**
5561
* It's vague, but these seems to be like index files allowing to fetch objects from a server on demand.
5662
* **git-repository**
@@ -111,7 +117,7 @@ The CLI uses various crates, please see _'Development Status'_ for details.
111117

112118
```sh
113119
curl -LSfs https://raw.githubusercontent.com/byron/git-oxide/master/ci/install.sh | \
114-
sh -s -- --git byron/git-oxide --crate gio-max-termion
120+
sh -s -- --git byron/git-oxide --crate gix-max-termion
115121
```
116122

117123
See the [releases section][releases] for manual installation and various alternative builds that are _slimmer_ or _smaller_, depending
@@ -143,9 +149,9 @@ cargo install gitoxide --no-default-features --features lean
143149

144150
Once installed, there are two binaries:
145151

146-
* **gio**
152+
* **gix**
147153
* high level commands, _porcelain_, for every-day use, optimized for a pleasant user experience
148-
* **giop**
154+
* **gixp**
149155
* low level commands, _plumbing_, for use in more specialized cases
150156

151157
## Project Goals

src/plumbing/lean.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ mod options {
44
use std::path::PathBuf;
55

66
#[derive(FromArgs)]
7-
#[argh(name = "gio-plumbing")]
7+
#[argh(name = "gix-plumbing")]
88
/// The lean git underworld
99
pub struct Args {
1010
#[argh(switch)]

src/plumbing/pretty.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ mod options {
1111
use structopt::{clap::AppSettings, StructOpt};
1212

1313
#[derive(Debug, StructOpt)]
14-
#[structopt(name = "gio-plumbing", about = "The git underworld")]
14+
#[structopt(name = "gix-plumbing", about = "The git underworld")]
1515
#[structopt(settings = &[AppSettings::SubcommandRequired, AppSettings::ColoredHelp])]
1616
pub struct Args {
1717
#[structopt(long, short = "t")]

tasks.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
preventing pack buildup_
3131
* **write loose object to…**
3232
* [x] sink
33+
* [ ] Deflate stream
3334
* [ ] disk - with decent errors
3435
* [ ] size as u64 (properly)
3536
* [ ] generalize pack reading algorithm

0 commit comments

Comments
 (0)