Skip to content

Commit

Permalink
Merge branch 'adjustments-for-cargo'
Browse files Browse the repository at this point in the history
  • Loading branch information
Byron committed Dec 9, 2022
2 parents 3e27550 + 13c4fef commit 70ccbb2
Show file tree
Hide file tree
Showing 64 changed files with 672 additions and 1,293 deletions.
80 changes: 11 additions & 69 deletions Cargo.lock

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

6 changes: 1 addition & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ git-features = { version = "^0.24.1", path = "git-features" }
git-repository = { version = "^0.29.0", path = "git-repository", default-features = false }

clap = { version = "3.2.5", features = ["derive", "cargo"] }
prodash = { version = "21.1", optional = true, default-features = false }
prodash = { version = "22.0", optional = true, default-features = false }
is-terminal = { version = "0.4.0", optional = true }
env_logger = { version = "0.10.0", default-features = false }
crosstermion = { version = "0.10.1", optional = true, default-features = false }
Expand Down Expand Up @@ -180,10 +180,6 @@ members = [

"cargo-smart-release",

"experiments/object-access",
"experiments/diffing",
"experiments/traversal",

"tests/tools",
]
exclude = ["cargo-smart-release/tests/fixtures/tri-depth-workspace/a",
Expand Down
4 changes: 2 additions & 2 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ A bunch of notes collected to keep track of what's needed to eventually support
- Use `Context` when potential optional data is required to perform an operation at all. See `git_config::path::Context` as reference. It can't be defaulted and the
fields could also be parameters.

## Examples, Experiments, Porcelain CLI and Plumbing CLI - which does what?
## Examples, Porcelain CLI and Plumbing CLI - which does what?

### Plumbing vs Porcelain

Expand Down Expand Up @@ -222,7 +222,7 @@ _Experiments_ are the quickest ways to obtain some insights. _Examples_ are mate
the polish (or the potential) to move up to _plumbing_ or _porcelain_. _Plumbing_ is programs for use in scripts, whereas _porcelain_ is for use
by humans.

* **Experiments**
* **Experiments** (out of tree due to `git2` builds sometimes failing CI)
* quick, potentially one-off programs to learn about an aspect of gitoxide potentially in comparison to other implementations like `libgit2`.
* No need for tests of any kind, but it must compile and be idiomatic Rust and `gitoxide`.
* Manual command-line parsing is OK
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,6 @@ check: ## Build all code in suitable configurations
&& cargo check --no-default-features
cd git-odb && cargo check --features serde1
cd cargo-smart-release && cargo check --all
cd experiments/object-access && cargo check
cd experiments/diffing && cargo check
cd experiments/traversal && cargo check

unit-tests: ## run all unit tests
cargo test --all
Expand Down
4 changes: 2 additions & 2 deletions etc/check-package-size.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ echo "in root: gitoxide CLI"
(enter git-ref && indent cargo diet -n --package-size-limit 50KB)
(enter git-diff && indent cargo diet -n --package-size-limit 10KB)
(enter git-traverse && indent cargo diet -n --package-size-limit 10KB)
(enter git-url && indent cargo diet -n --package-size-limit 20KB)
(enter git-url && indent cargo diet -n --package-size-limit 25KB)
(enter git-validate && indent cargo diet -n --package-size-limit 5KB)
(enter git-date && indent cargo diet -n --package-size-limit 15KB)
(enter git-hashtable && indent cargo diet -n --package-size-limit 5KB)
Expand All @@ -58,6 +58,6 @@ echo "in root: gitoxide CLI"
(enter git-odb && indent cargo diet -n --package-size-limit 130KB)
(enter git-protocol && indent cargo diet -n --package-size-limit 80KB)
(enter git-packetline && indent cargo diet -n --package-size-limit 35KB)
(enter git-repository && indent cargo diet -n --package-size-limit 230KB)
(enter git-repository && indent cargo diet -n --package-size-limit 240KB)
(enter git-transport && indent cargo diet -n --package-size-limit 70KB)
(enter gitoxide-core && indent cargo diet -n --package-size-limit 100KB)
1 change: 0 additions & 1 deletion experiments/.gitignore

This file was deleted.

15 changes: 0 additions & 15 deletions experiments/diffing/Cargo.toml

This file was deleted.

9 changes: 0 additions & 9 deletions experiments/diffing/README.md

This file was deleted.

Loading

0 comments on commit 70ccbb2

Please sign in to comment.