Add flake.nix

.gitignore

···
 /target
+.jj/

Cargo.lock

···
 ]
 
 [[package]]
+name = "anstream"
+version = "0.6.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
 name = "arc-swap"
 version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
+name = "clap"
+version = "4.5.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+
+[[package]]
 name = "color-eyre"
 version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
+name = "colorchoice"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+
+[[package]]
 name = "console"
 version = "0.15.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
 name = "itoa"
 version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 name = "jj-sync-prs"
 version = "0.1.0"
 dependencies = [
+ "clap",
  "color-eyre",
  "dialoguer",
  "futures",
···
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+
+[[package]]
 name = "openssl-probe"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
 name = "subtle"
 version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "valuable"

Cargo.toml

···
 edition = "2024"
 
 [dependencies]
+clap = { version = "4.0", features = ["derive", "env"] }
 color-eyre = "0.6.5"
 dialoguer = "0.11.0"
 futures = "0.3.31"

commands

···
-jj log --no-graph -r 'bookmarks()' -T 'bookmarks ++ "\n"'
-
-jj log --no-graph -r 'children(push-wtqmqortkzry) & bookmarks()' -T 'bookmarks ++ "\n"'
-
-jj log --no-graph -r '..push-wtqmqortkzry & ..ng-3088-button-to-create-windows-from-window-notes'
-
-jj log --no-graph -r '..bookmarks()'
-
-jj log --no-graph -r 'root().. & bookmarks()'
-
-jj -r 'main---::'
-
-jj log --no-graph -T 'change_id ++ "\n"'
-
-jj log --no-graph -r 'children(ztzxrsrskxmyopropwxolytvzwlmlylu, 1)' -T 'change_id ++ " " ++ bookmarks ++ "\n"'
-
-jj log --no-graph -r 'ztzxrsrskxmyopropwxolytvzwlmlylu' -T 'change_id ++ " " ++ bookmarks ++ "\n"'
-
-ztzxrsrskxmyopropwxolytvzwlmlylu
-
-push-wtqmqortkzry
-ng-3088-button-to-create-windows-from-window-notes
-david/debug-menu-for-camera-layers
-david/port-ruler-to-new-snapping-25-07-04
-david/move-snapping-into-core-state
-david/simplify-coordinate-spaces
-main

flake.lock

···
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1751984180,
+        "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

···
+{
+  description = "A Rust project built with Nix";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = {
+    self,
+    nixpkgs,
+    flake-utils,
+  }:
+    flake-utils.lib.eachDefaultSystem (
+      system: let
+        pkgs = import nixpkgs {
+          inherit system;
+        };
+      in {
+        packages.default = pkgs.rustPlatform.buildRustPackage {
+          pname = "jj-sync-prs";
+          version = "0.1.0";
+
+          src = ./.;
+
+          cargoLock = {
+            lockFile = ./Cargo.lock;
+          };
+
+          nativeBuildInputs = [
+            pkgs.makeWrapper
+          ];
+
+          buildInputs = [
+            pkgs.graphviz
+          ];
+
+          postInstall = ''
+            wrapProgram $out/bin/jj-sync-prs \
+              --prefix PATH : ${pkgs.lib.makeBinPath [pkgs.graphviz]}
+          '';
+        };
+      }
+    );
+}

graph.dot

···
-digraph Workflow {
-    0 [label="main"];
-    1 [label="david/simplify-coordinate-spaces"];
-    2 [label="david/move-snapping-into-core-state"];
-    3 [label="david/port-ruler-to-new-snapping-25-07-04"];
-    4 [label="david/debug-menu-for-camera-layers"];
-    5 [label="ng-3088-button-to-create-windows-from-window-notes"];
-    6 [label="push-wtqmqortkzry"];
-    0 -> 1;
-    1 -> 2;
-    2 -> 3;
-    3 -> 4;
-    4 -> 5;
-    5 -> 6;
-}

result

···
+/nix/store/pz7q3hlh7vc9b5j9r7vz560bphq3py3j-jj-sync-prs-0.1.0

src/graph.rs

···
     pub fn to_dot(&self) -> String {
         let mut out = String::new();
 
-        writeln!(&mut out, "digraph Workflow {{").unwrap();
+        writeln!(&mut out, "digraph Branches {{").unwrap();
         for (i, node) in self.nodes.iter().enumerate() {
             writeln!(&mut out, "    {i} [label=\"{node}\"];").unwrap();
         }

src/main.rs

···
 use std::fmt::Write;
+use std::io::Write as _;
+use std::path::PathBuf;
 use std::pin::pin;
 use std::{ffi::OsStr, path::Path};
 
+use clap::Parser;
 use color_eyre::eyre::{Context as _, ContextCompat};
 use dialoguer::{Confirm, Editor};
 use futures::TryStreamExt as _;
···
 
 mod graph;
 
+#[derive(Parser, Debug)]
+#[command(name = "jj-sync-prs")]
+#[command(about = "Sync jujutsu branches with GitHub pull requests")]
+struct Args {
+    #[command(subcommand)]
+    subcommand: Option<Subcommand>,
+}
+
+#[derive(clap::Subcommand, Debug)]
+enum Subcommand {
+    /// Sync branches with pull requests
+    Sync {
+        /// GitHub authentication token
+        #[arg(long, env = "GH_AUTH_TOKEN")]
+        github_token: String,
+    },
+    /// Save the branch graph as an image
+    Graph {
+        /// File to write the image to
+        #[arg(short, long)]
+        out: Option<PathBuf>,
+    },
+}
+
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
 
-    let graph = build_branch_graph().context("failed to build graph")?;
+    let args = Args::parse();
 
-    let repo_info = repo_info().context("failed to find repo info")?;
+    if let Some(subcommand) = args.subcommand {
+        run_subcommand(subcommand).await?;
+    } else {
+        run_subcommand(Subcommand::Sync {
+            github_token: std::env::var("GH_AUTH_TOKEN").context("GH_AUTH_TOKEN is not set")?,
+        })
+        .await?;
+    }
 
-    let token = command("gh", ["auth", "token"]).context("failed to find github auth token")?;
-    let token = token.trim().to_owned();
-    let octocrab = octocrab::OctocrabBuilder::default()
-        .personal_token(token)
-        .build()
-        .context("failed to build github client")?;
-    let mut pulls = octocrab
-        .pulls(&repo_info.owner, &repo_info.name)
-        .list()
-        .send()
-        .await
-        .context("failed to fetch pull requests")?
-        .into_stream(&octocrab)
-        .try_collect::<Vec<_>>()
-        .await
-        .context("failed to fetch all pull requests")?;
+    Ok(())
+}
 
-    for stack_root in graph.iter_edges_from("main") {
-        find_or_create_prs(
-            stack_root, "main", &graph, &repo_info, &octocrab, &mut pulls,
-        )
-        .await
-        .context("failed to sync prs")?;
-    }
+async fn run_subcommand(subcommand: Subcommand) -> color_eyre::Result<()> {
+    match subcommand {
+        Subcommand::Sync { github_token } => {
+            let graph = build_branch_graph().context("failed to build graph")?;
 
-    for stack_root in graph.iter_edges_from("main") {
-        let mut comment_lines = Vec::new();
-        write_pr_comment(&graph, stack_root, 0, &mut comment_lines);
+            let repo_info = repo_info().context("failed to find repo info")?;
 
-        if comment_lines.len() > 1 {
-            // if the comment contains just one line then its not
-            // part of a stack
-            create_or_update_comments(
-                &comment_lines,
-                stack_root,
-                &graph,
-                &pulls,
-                &octocrab,
-                &repo_info,
-            )
-            .await
-            .context("failed to sync stack comment")?;
+            let octocrab = octocrab::OctocrabBuilder::default()
+                .personal_token(github_token)
+                .build()
+                .context("failed to build github client")?;
+            let mut pulls = octocrab
+                .pulls(&repo_info.owner, &repo_info.name)
+                .list()
+                .send()
+                .await
+                .context("failed to fetch pull requests")?
+                .into_stream(&octocrab)
+                .try_collect::<Vec<_>>()
+                .await
+                .context("failed to fetch all pull requests")?;
+
+            for stack_root in graph.iter_edges_from("main") {
+                find_or_create_prs(
+                    stack_root, "main", &graph, &repo_info, &octocrab, &mut pulls,
+                )
+                .await
+                .context("failed to sync prs")?;
+            }
+
+            for stack_root in graph.iter_edges_from("main") {
+                let mut comment_lines = Vec::new();
+                write_pr_comment(&graph, stack_root, 0, &mut comment_lines);
+
+                if comment_lines.len() > 1 {
+                    // if the comment contains just one line then its not
+                    // part of a stack
+                    create_or_update_comments(
+                        &comment_lines,
+                        stack_root,
+                        &graph,
+                        &pulls,
+                        &octocrab,
+                        &repo_info,
+                    )
+                    .await
+                    .context("failed to sync stack comment")?;
+                }
+            }
+        }
+        Subcommand::Graph { out } => {
+            let graph = build_branch_graph().context("failed to build graph")?;
+            let dot = graph.to_dot();
+            let (read, mut write) = std::io::pipe()?;
+            let out = out.as_deref().unwrap_or_else(|| Path::new("branches.png"));
+            let mut cmd = std::process::Command::new("dot");
+            cmd.arg("-Tpng");
+            cmd.arg("-o");
+            cmd.args(out);
+            cmd.stdin(read);
+            let mut child = cmd.spawn().with_context(|| format!("{cmd:?} failed"))?;
+            write.write_all(dot.as_bytes())?;
+            drop(write);
+            color_eyre::eyre::ensure!(child.wait()?.success());
+            eprintln!("Wrote {out:?}");
         }
     }