feat: add CLI

Cargo.toml

@@ -14,8 +14,9 @@ missing_docs = "warn"
 [workspace.dependencies]
 clap = { version = "4.5.60", features = ["derive"] }
 clap_mangen = "0.2.31"
-gix = { version = "0.83", features = ["merge", "tree-editor", "blocking-network-client", "worktree-mutation"] }
+gix = { version = "0.83", features = ["attributes", "merge", "tree-editor", "blocking-network-client", "worktree-mutation", "blocking-http-transport-reqwest-rust-tls"] }
 gix-glob = "0.26.0"
+gix-quote = "0.7"
 tempfile = "3"
 thiserror = "2"
 

crates/git-vendor/Cargo.toml

@@ -28,6 +28,7 @@ git-set-attr = { version = "0.1.2", path = "../git-set-attr" }
 tempfile.workspace = true
 thiserror.workspace = true
 gix-glob.workspace = true
+gix-quote.workspace = true
 
 [dev-dependencies]
 proptest = "1.5.0"

crates/git-vendor/src/attr_tests.rs

@@ -0,0 +1,44 @@
+use rstest::rstest;
+
+use super::{check_attr_pattern, split_attr_line};
+
+#[rstest]
+#[case(b"vendor/a.txt")]
+#[case(b"src/lib.rs")]
+#[case(b"deep/nested/path.txt")]
+fn check_plain_path_ok(#[case] path: &[u8]) {
+    assert!(check_attr_pattern(path).is_ok());
+}
+
+#[rstest]
+#[case(b"vendor/a b.txt")]
+#[case(b"#readme")]
+#[case(b"say \"hi\"")]
+#[case(b"a\tb")]
+#[case(b"a\x01b")]
+#[case(b"a\x7fb")]
+fn check_path_with_special_chars_errors(#[case] path: &[u8]) {
+    assert!(check_attr_pattern(path).is_err());
+}
+
+#[rstest]
+#[case(b"vendor/a.txt vendor=mylib", b"vendor/a.txt", b"vendor=mylib")]
+#[case(b"vendor/a.txt\tvendor=mylib", b"vendor/a.txt", b"vendor=mylib")]
+#[case(b"\"vendor/a b.txt\" vendor=mylib", b"vendor/a b.txt", b"vendor=mylib")]
+#[case(b"\"say \\\"hi\\\"\" vendor=mylib", b"say \"hi\"", b"vendor=mylib")]
+fn split_line(#[case] line: &[u8], #[case] pattern: &[u8], #[case] attr: &[u8]) {
+    let (p, a) = split_attr_line(line).unwrap();
+    assert_eq!(p.as_ref(), pattern);
+    assert_eq!(a, attr);
+}
+
+#[rstest]
+#[case(b"vendor/a.txt")]
+#[case(b"")]
+#[case(b"# comment line")]
+#[case(b"# vendor=mylib")]
+#[case(b"  ")]
+#[case(b" vendor/a.txt attr")]
+fn split_no_attr_returns_none(#[case] line: &[u8]) {
+    assert!(split_attr_line(line).is_none());
+}

crates/git-vendor/src/cli.rs

@@ -0,0 +1,114 @@
+//! Command-line interface shape for `git-vendor`.
+
+use clap::{Parser, Subcommand};
+
+/// Manage vendored external repository content.
+#[derive(Parser)]
+#[command(name = "git-vendor", bin_name = "git vendor")]
+pub struct Cli {
+    #[command(subcommand)]
+    pub command: Command,
+}
+
+#[derive(Subcommand)]
+pub enum Command {
+    /// Add a new vendor dependency and integrate it into the current branch.
+    ///
+    /// Fetches the upstream ref and three-way merges it into the working
+    /// tree, staging the result for review. Run `git commit` to complete,
+    /// mirroring `git submodule add` (which also never commits on your
+    /// behalf).
+    Add {
+        /// Remote URL of the upstream repository.
+        url: String,
+
+        /// Unique name for this vendor (used in `.gitvendors` and `.gitattributes`).
+        /// Defaults to the last path component of the URL, stripped of `.git`.
+        name: Option<String>,
+
+        /// Branch, tag, or SHA to track on the upstream (defaults to `HEAD`).
+        #[arg(long = "ref", value_name = "REF")]
+        ref_name: Option<String>,
+
+        /// Destination directory for vendored files (defaults to `vendor/<name>/`).
+        /// Ignored when `--pattern` is also given.
+        #[arg(long, value_name = "DIR")]
+        prefix: Option<String>,
+
+        /// File pattern used to filter the upstream vendor content with optional
+        /// remapping into the working copy, e.g. `src/**:vendor/lib/`. May be
+        /// repeated to select multiple paths.
+        #[arg(long = "pattern", short = 'p', value_name = "GLOB[:DEST]")]
+        patterns: Vec<String>,
+
+        /// Record upstream history as a parentless squash commit instead of a
+        /// full merge.
+        #[arg(long)]
+        squash: bool,
+
+        /// Show what would be fetched and merged without making any changes.
+        #[arg(long)]
+        dry_run: bool,
+
+        /// Commit message (defaults to `vendor: add <name>`).
+        #[arg(long, short = 'm', value_name = "MSG")]
+        message: Option<String>,
+    },
+
+    /// Fetch and integrate upstream updates for one or all vendors.
+    ///
+    /// Equivalent to `git subtree pull` or `git submodule update --remote`.
+    /// Stages the result for review; run `git commit` to complete, mirroring
+    /// `git submodule` (which never commits on your behalf).
+    Update {
+        /// Vendor name to update; updates all configured vendors if omitted.
+        name: Option<String>,
+
+        /// Commit message (defaults to `vendor: update <name>`).
+        #[arg(long, short = 'm', value_name = "MSG")]
+        message: Option<String>,
+
+        /// Allow integrating an upstream that was force-pushed (rewound
+        /// history). Without this flag, a force-push is reported as an error.
+        #[arg(long)]
+        force: bool,
+
+        /// Rebuild from the recorded upstream base instead of fetching. Use
+        /// after editing a vendor's `pattern` entries to move or refilter its
+        /// files. Local modifications to vendored files would be discarded,
+        /// so this refuses to proceed on a modified vendor unless `--force`
+        /// is also given.
+        #[arg(long)]
+        no_fetch: bool,
+
+        /// Show what would be fetched and merged without making any changes.
+        #[arg(long)]
+        dry_run: bool,
+    },
+
+    /// Show synchronization status for one or all vendors.
+    Status {
+        /// Vendor name to check; checks all configured vendors if omitted.
+        name: Option<String>,
+
+        /// Fetch from upstream before reporting status.
+        #[arg(long, short = 'f')]
+        fetch: bool,
+    },
+
+    /// Remove a vendor dependency and its files from the working tree.
+    #[command(visible_alias = "rm")]
+    Remove {
+        /// Vendor name to remove.
+        name: String,
+
+        /// Remove the config entry and `.gitattributes` tracking but leave the
+        /// vendored files in the working tree.
+        #[arg(long)]
+        keep_files: bool,
+    },
+
+    /// List all configured vendor dependencies.
+    #[command(visible_alias = "ls")]
+    List,
+}

crates/git-vendor/src/error.rs

@@ -15,6 +15,8 @@ pub enum Error {
     Fetch(String),
     #[error("merge conflict: {0}")]
     Conflict(String),
+    #[error("path requires quoting in .gitattributes: {0}")]
+    InvalidPath(String),
     #[error(transparent)]
     Gix(Box<dyn std::error::Error + Send + Sync + 'static>),
 }