iesahin · iesahin · Dec 30, 2024 · Nov 30, 2024 · Dec 13, 2024 · Dec 13, 2024
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -134,12 +134,17 @@ jobs:
 
   deploy-linux:
     name: deploy-linux
-    # needs: [coverage]
+    needs: [coverage]
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [x86_64-unknown-linux-gnu]
+        target:
+          [
+            x86_64-unknown-linux-gnu,
+            aarch64-unknown-linux-gnu,
+            aarch64-linux-android,
+          ]
 
     steps:
       - name: Checkout
@@ -172,7 +177,7 @@ jobs:
 
   deploy-windows:
     name: deploy-windows
-    # needs: [coverage]
+    needs: [coverage]
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: windows-latest
     strategy:
@@ -209,12 +214,13 @@ jobs:
 
   deploy-macos:
     name: deploy-macos
-    # needs: [coverage]
+    needs: [coverage]
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: macos-latest
     strategy:
       matrix:
-        target: [x86_64-apple-darwin]
+        target:
+          [x86_64-apple-darwin, aarch64-apple-darwin, x86_64-unknown-freebsd]
 
     steps:
       - name: Checkout

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Xvc Changelog
 
+## Unreleased
+
+- Fixed xvc file remove bug that panics when content digests not found
+- Fixed xvc file list help text and added a test/example for ignored files
+- Added more targets to Github builds
+
 ## 0.6.12 (2024-11-30)
 
 - PR: <https://github.com/iesahin/xvc/pull/262>

diff --git a/book/src/ref/xvc-file-list.md b/book/src/ref/xvc-file-list.md
@@ -28,9 +28,9 @@ Options:
             GB and TB to represent sizes larger than 1MB.
           - {{ats}}:  actual timestamp. The timestamp of the workspace file.
           - {{name}}: The name of the file or directory.
-          - {{cst}}:  cache status. One of "=", ">", "<", "X", or "?" to show
+          - {{cst}}:  cache status. One of "=", ">", "<", or "X" to show
             whether the file timestamp is the same as the cached timestamp, newer,
-            older, not cached or not tracked.
+            older, and not tracked.
           - {{rcd8}}:  recorded content digest stored in the cache. First 8 digits.
           - {{rcd64}}:  recorded content digest stored in the cache. All 64 digits.
           - {{rrm}}:  recorded recheck method. Whether the entry is linked to the workspace
@@ -457,7 +457,7 @@ Total #: 5 Workspace Size:       10015 Cached Size:       10015
 ```
 
 ```admonish info
-If `{{acd8}}` or `{{acd64}}` is not present in the format string, Xvc doesn't calculate these hashes. If you have large number of files where the default format (that includes actual content hashes) runs slowly, you may customize it to not to include these columns.
+If `{{acd8}}` or `{{acd64}}` is not present in the format string, Xvc doesn't calculate these hashes. If you have large number of files where the default format (that includes actual content hashes) runs slowly, you can customize it to not to include these columns.
 ```
 
 If you want to get a quick glimpse of what needs to carried in, or rechecked,
@@ -483,3 +483,40 @@ The cache status column shows `=` for unchanged files in the cache, `X` for
 untracked files, `>` for files that there is newer version in the cache, and `<`
 for files that there is a newer version in the workspace. The comparison is done
 between recorded timestamp and actual timestamp with an accuracy of 1 second.
+
+## Ignored Files
+
+Ignored files and directories in `.xvcignore` are not listed in the results. 
+
+```console
+$ zsh -c "echo 'dir-0005' > .xvcignore"
+
+$ xvc file list --format='{{name}}' --no-summary
+dir-0004/file-0005.bin
+dir-0004/file-0004.bin
+dir-0004/file-0003.bin
+dir-0004/file-0002.bin
+dir-0004/file-0001.bin
+dir-0004
+dir-0003/file-0005.bin
+dir-0003/file-0004.bin
+dir-0003/file-0003.bin
+dir-0003/file-0002.bin
+dir-0003/file-0001.bin
+dir-0003
+dir-0002/file-0005.bin
+dir-0002/file-0004.bin
+dir-0002/file-0003.bin
+dir-0002/file-0002.bin
+dir-0002/file-0001.bin
+dir-0002
+dir-0001/file-0005.bin
+dir-0001/file-0004.bin
+dir-0001/file-0003.bin
+dir-0001/file-0002.bin
+dir-0001/file-0001.bin
+dir-0001/a-new-file.bin
+dir-0001
+
+
+```
diff --git a/config/Cargo.toml b/config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xvc-config"
-version = "0.6.12"
+version = "0.6.13-alpha.1"
 edition = "2021"
 description = "Xvc configuration management"
 authors = ["Emre Şahin <[email protected]>"]
@@ -16,8 +16,8 @@ name = "xvc_config"
 crate-type = ["rlib"]
 
 [dependencies]
-xvc-logging = { version = "0.6.12", path = "../logging" }
-xvc-walker = { version = "0.6.12", path = "../walker" }
+xvc-logging = { version = "0.6.13-alpha.1", path = "../logging" }
+xvc-walker = { version = "0.6.13-alpha.1", path = "../walker" }
 
 
 ## Cli and config

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xvc-core"
-version = "0.6.12"
+version = "0.6.13-alpha.1"
 edition = "2021"
 description = "Xvc core for common elements for all commands"
 authors = ["Emre Şahin <[email protected]>"]
@@ -16,10 +16,10 @@ name = "xvc_core"
 crate-type = ["rlib"]
 
 [dependencies]
-xvc-config = { version = "0.6.12", path = "../config" }
-xvc-logging = { version = "0.6.12", path = "../logging" }
-xvc-ecs = { version = "0.6.12", path = "../ecs" }
-xvc-walker = { version = "0.6.12", path = "../walker" }
+xvc-config = { version = "0.6.13-alpha.1", path = "../config" }
+xvc-logging = { version = "0.6.13-alpha.1", path = "../logging" }
+xvc-ecs = { version = "0.6.13-alpha.1", path = "../ecs" }
+xvc-walker = { version = "0.6.13-alpha.1", path = "../walker" }
 
 ## Cli and config
 clap = { version = "^4.5", features = ["derive"] }
@@ -83,6 +83,6 @@ itertools = "^0.13"
 
 
 [dev-dependencies]
-xvc-test-helper = { version = "0.6.12", path = "../test_helper/" }
+xvc-test-helper = { version = "0.6.13-alpha.1", path = "../test_helper/" }
 proptest = "^1.5"
 test-case = "^3.3"
diff --git a/ecs/Cargo.toml b/ecs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xvc-ecs"
-version = "0.6.12"
+version = "0.6.13-alpha.1"
 edition = "2021"
 description = "Entity-Component System for Xvc"
 authors = ["Emre Şahin <[email protected]>"]
@@ -16,7 +16,7 @@ name = "xvc_ecs"
 crate-type = ["rlib"]
 
 [dependencies]
-xvc-logging = { version = "0.6.12", path = "../logging" }
+xvc-logging = { version = "0.6.13-alpha.1", path = "../logging" }
 
 ## Serialization
 serde = { version = "^1.0", features = ["derive"] }

diff --git a/file/Cargo.toml b/file/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xvc-file"
-version = "0.6.12"
+version = "0.6.13-alpha.1"
 edition = "2021"
 description = "File tracking, versioning, upload and download functions for Xvc"
 authors = ["Emre Şahin <[email protected]>"]
@@ -21,12 +21,12 @@ test = true
 bench = true
 
 [dependencies]
-xvc-logging = { version = "0.6.12", path = "../logging" }
-xvc-config = { version = "0.6.12", path = "../config" }
-xvc-core = { version = "0.6.12", path = "../core" }
-xvc-ecs = { version = "0.6.12", path = "../ecs" }
-xvc-walker = { version = "0.6.12", path = "../walker" }
-xvc-storage = { version = "0.6.12", path = "../storage", default-features = false }
+xvc-logging = { version = "0.6.13-alpha.1", path = "../logging" }
+xvc-config = { version = "0.6.13-alpha.1", path = "../config" }
+xvc-core = { version = "0.6.13-alpha.1", path = "../core" }
+xvc-ecs = { version = "0.6.13-alpha.1", path = "../ecs" }
+xvc-walker = { version = "0.6.13-alpha.1", path = "../walker" }
+xvc-storage = { version = "0.6.13-alpha.1", path = "../storage", default-features = false }
 
 
 ## Cli and config
@@ -95,5 +95,5 @@ default = ["reflink"]
 reflink = ["dep:reflink"]
 
 [dev-dependencies]
-xvc-test-helper = { version = "0.6.12", path = "../test_helper/" }
+xvc-test-helper = { version = "0.6.13-alpha.1", path = "../test_helper/" }
 shellfn = "^0.1"
diff --git a/file/src/list/mod.rs b/file/src/list/mod.rs
@@ -527,9 +527,9 @@ pub struct ListCLI {
     ///   GB and TB to represent sizes larger than 1MB.
     /// - {{ats}}:  actual timestamp. The timestamp of the workspace file.
     /// - {{name}}: The name of the file or directory.
-    /// - {{cst}}:  cache status. One of "=", ">", "<", "X", or "?" to show
+    /// - {{cst}}:  cache status. One of "=", ">", "<", or "X" to show
     ///   whether the file timestamp is the same as the cached timestamp, newer,
-    ///   older, not cached or not tracked.
+    ///   older, and not tracked.
     /// - {{rcd8}}:  recorded content digest stored in the cache. First 8 digits.
     /// - {{rcd64}}:  recorded content digest stored in the cache. All 64 digits.
     /// - {{rrm}}:  recorded recheck method. Whether the entry is linked to the workspace

diff --git a/file/src/remove/mod.rs b/file/src/remove/mod.rs
@@ -140,11 +140,10 @@ pub fn cmd_remove(output_snd: &XvcOutputSender, xvc_root: &XvcRoot, opts: Remove
     } else {
         remove_targets
             .iter()
-            .map(|(xe, xp)| {
-                (
-                    *xe,
-                    XvcCachePath::new(xp, all_content_digests.get(xe).unwrap()).unwrap(),
-                )
+            .filter_map(|(xe, xp)| {
+                all_content_digests
+                    .get(xe)
+                    .map(|cd| (*xe, XvcCachePath::new(xp, cd).unwrap()))
             })
-            .filter_map(|(xe, xp)| {
-                all_content_digests
-                    .get(xe)
-                    .map(|cd| (*xe, XvcCachePath::new(xp, cd).unwrap()))
-            })
+            .filter_map(|(xe, xp)| {
+                all_content_digests
+                    .get(xe)
+                    .and_then(|cd| XvcCachePath::new(xp, cd))
+                    .map(|cp| (*xe, cp))
+            })
-            .filter_map(|(xe, xp)| {
-                all_content_digests
-                    .get(xe)
-                    .map(|cd| (*xe, XvcCachePath::new(xp, cd).unwrap()))
-            })
+            .filter_map(|(xe, xp)| {
+                all_content_digests
+                    .get(xe)
+                    .and_then(|cd| XvcCachePath::new(xp, cd))
+                    .map(|cp| (*xe, cp))
+            })
             .collect::<Vec<(XvcEntity, XvcCachePath)>>()
     };

diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xvc"
-version = "0.6.12"
+version = "0.6.13-alpha.1"
 edition = "2021"
 description = "An MLOps tool to manage data files and pipelines on top of Git"
 authors = ["Emre Şahin <[email protected]>"]
@@ -20,14 +20,14 @@ name = "xvc"
 path = "src/main.rs"
 
 [dependencies]
-xvc-config = { version = "0.6.12", path = "../config" }
-xvc-core = { version = "0.6.12", path = "../core" }
-xvc-logging = { version = "0.6.12", path = "../logging" }
-xvc-ecs = { version = "0.6.12", path = "../ecs" }
-xvc-file = { version = "0.6.12", path = "../file", default-features = false }
-xvc-pipeline = { version = "0.6.12", path = "../pipeline" }
-xvc-walker = { version = "0.6.12", path = "../walker" }
-xvc-storage = { version = "0.6.12", path = "../storage", default-features = false }
+xvc-config = { version = "0.6.13-alpha.1", path = "../config" }
+xvc-core = { version = "0.6.13-alpha.1", path = "../core" }
+xvc-logging = { version = "0.6.13-alpha.1", path = "../logging" }
+xvc-ecs = { version = "0.6.13-alpha.1", path = "../ecs" }
+xvc-file = { version = "0.6.13-alpha.1", path = "../file", default-features = false }
+xvc-pipeline = { version = "0.6.13-alpha.1", path = "../pipeline" }
+xvc-walker = { version = "0.6.13-alpha.1", path = "../walker" }
+xvc-storage = { version = "0.6.13-alpha.1", path = "../storage", default-features = false }
 
 ## Cli and config
 clap = { version = "^4.5", features = ["derive", "cargo"] }
@@ -133,4 +133,4 @@ shellfn = "^0.1"
 test-case = "^3.3"
 trycmd = "^0.15"
 which = "^7.0"
-xvc-test-helper = { version = "0.6.12", path = "../test_helper/" }
+xvc-test-helper = { version = "0.6.13-alpha.1", path = "../test_helper/" }
diff --git a/logging/Cargo.toml b/logging/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xvc-logging"
-version = "0.6.12"
+version = "0.6.13-alpha.1"
 edition = "2021"
 description = "Logging crate for Xvc"
 authors = ["Emre Şahin <[email protected]>"]

diff --git a/pipeline/Cargo.toml b/pipeline/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xvc-pipeline"
-version = "0.6.12"
+version = "0.6.13-alpha.1"
 edition = "2021"
 description = "Xvc data pipeline management"
 authors = ["Emre Şahin <[email protected]>"]
@@ -19,12 +19,12 @@ default = []
 bundled-sqlite = ["rusqlite/bundled"]
 
 [dependencies]
-xvc-config = { version = "0.6.12", path = "../config" }
-xvc-core = { version = "0.6.12", path = "../core" }
-xvc-ecs = { version = "0.6.12", path = "../ecs" }
-xvc-logging = { version = "0.6.12", path = "../logging" }
-xvc-walker = { version = "0.6.12", path = "../walker" }
-xvc-file = { version = "0.6.12", path = "../file", default-features = false }
+xvc-config = { version = "0.6.13-alpha.1", path = "../config" }
+xvc-core = { version = "0.6.13-alpha.1", path = "../core" }
+xvc-ecs = { version = "0.6.13-alpha.1", path = "../ecs" }
+xvc-logging = { version = "0.6.13-alpha.1", path = "../logging" }
+xvc-walker = { version = "0.6.13-alpha.1", path = "../walker" }
+xvc-file = { version = "0.6.13-alpha.1", path = "../file", default-features = false }
 
 ## Cli and config
 clap = { version = "^4.5", features = ["derive"] }
@@ -99,5 +99,5 @@ itertools = "^0.13"
 derive_more = { version = "^1.0", features = ["full"] }
 
 [dev-dependencies]
-xvc-test-helper = { version = "0.6.12", path = "../test_helper/" }
+xvc-test-helper = { version = "0.6.13-alpha.1", path = "../test_helper/" }
 test-case = "^3.3"
diff --git a/storage/Cargo.toml b/storage/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xvc-storage"
-version = "0.6.12"
+version = "0.6.13-alpha.1"
 edition = "2021"
 description = "Xvc remote and local storage management"
 authors = ["Emre Şahin <[email protected]>"]
@@ -16,11 +16,11 @@ name = "xvc_storage"
 crate-type = ["rlib"]
 
 [dependencies]
-xvc-logging = { version = "0.6.12", path = "../logging" }
-xvc-config = { version = "0.6.12", path = "../config" }
-xvc-core = { version = "0.6.12", path = "../core" }
-xvc-ecs = { version = "0.6.12", path = "../ecs" }
-xvc-walker = { version = "0.6.12", path = "../walker" }
+xvc-logging = { version = "0.6.13-alpha.1", path = "../logging" }
+xvc-config = { version = "0.6.13-alpha.1", path = "../config" }
+xvc-core = { version = "0.6.13-alpha.1", path = "../core" }
+xvc-ecs = { version = "0.6.13-alpha.1", path = "../ecs" }
+xvc-walker = { version = "0.6.13-alpha.1", path = "../walker" }
 
 ## Cli and config
 clap = { version = "^4.5", features = ["derive"] }
@@ -105,7 +105,7 @@ bundled-openssl = ["openssl/vendored"]
 
 
 [dev-dependencies]
-xvc-test-helper = { version = "0.6.12", path = "../test_helper/" }
+xvc-test-helper = { version = "0.6.13-alpha.1", path = "../test_helper/" }
 shellfn = "^0.1"
 
 [package.metadata.cargo-udeps.ignore]

diff --git a/test_helper/Cargo.toml b/test_helper/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xvc-test-helper"
-version = "0.6.12"
+version = "0.6.13-alpha.1"
 edition = "2021"
 description = "Unit test helper functions for Xvc"
 authors = ["Emre Şahin <[email protected]>"]
@@ -20,7 +20,7 @@ path = "src/main.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-xvc-logging = { version = "0.6.12", path = "../logging/" }
+xvc-logging = { version = "0.6.13-alpha.1", path = "../logging/" }
 
 rand = "^0.8"
 log = "^0.4"