Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
!hyper_cgi
!hyper-reverse-proxy
!josh-core
!josh-cli
!josh-filter
!josh-proxy
!josh-rpc
Expand Down
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ updates:
- "/"
- "hyper_cgi"
- "josh-core"
- "josh-cli"
- "josh-filter"
- "josh-graphql"
- "josh-proxy"
Expand Down
17 changes: 17 additions & 0 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ members = [
"hyper_cgi",
"hyper-reverse-proxy",
"josh-core",
"josh-cli",
"josh-filter",
"josh-graphql",
"josh-proxy",
Expand All @@ -22,6 +23,7 @@ codegen-units = 1
base64 = "0.22.1"
defer = "0.2.1"
env_logger = "0.11.5"
log = "0.4.28"
futures = "0.3.31"
gix = { version = "0.73.0", default-features = false }
hyper-reverse-proxy = { path = "hyper-reverse-proxy", version = "0.0.1" }
Expand Down
16 changes: 16 additions & 0 deletions docs/src/reference/filters.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,22 @@ tree.
Normally Josh will keep all commits in the filtered history whose tree differs from any of it's
parents.

### Freeze tree updates

`:freeze` filter prevents appearance of selected subtrees for a given revision.

In practical terms, it means that file and folder updates are "held off" or "frozen".
If a tree entry already existed in the parent revision, that version will be chosen.
Otherwise, the tree entry will not appear in the filtered commit.

The source of the parent revision is always the first commit parent.

Note that this filter is only practical when used with `:hook` or `workspace.josh`,
as it should apply per-revision only. Applying `:freeze` for the whole history
will result in the subtree being excluded from all revisions.

Refer to `freeze_filter_workspace.t` and `freeze_filter_hook.t` for reference.

Filter order matters
--------------------

Expand Down
23 changes: 23 additions & 0 deletions josh-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[package]
authors = ["Christian Schilling <[email protected]>"]
description = "Josh CLI"
edition = "2024"
keywords = ["git", "monorepo", "workflow", "scm"]
license-file = "LICENSE"
name = "josh-cli"
readme = "../README.md"
repository = "https://github.com/josh-project/josh"
version = "22.4.15"

[dependencies]
josh = { path = "../josh-core" }
josh-graphql = { path = "../josh-graphql" }
josh-templates = { path = "../josh-templates" }
env_logger = { workspace = true }
log = { workspace = true }
serde_json = { workspace = true }
defer = { workspace = true }
clap = { workspace = true }
rs_tracing = { workspace = true }
juniper = { workspace = true }
git2 = { workspace = true }
Loading