+1

.gitignore

··· 1 1 /target 2 2 + .jj/

+121

Cargo.lock

··· 33 33 ] 34 34 35 35 [[package]] 36 36 + name = "anstream" 37 37 + version = "0.6.19" 38 38 + source = "registry+https://github.com/rust-lang/crates.io-index" 39 39 + checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" 40 40 + dependencies = [ 41 41 + "anstyle", 42 42 + "anstyle-parse", 43 43 + "anstyle-query", 44 44 + "anstyle-wincon", 45 45 + "colorchoice", 46 46 + "is_terminal_polyfill", 47 47 + "utf8parse", 48 48 + ] 49 49 + 50 50 + [[package]] 51 51 + name = "anstyle" 52 52 + version = "1.0.11" 53 53 + source = "registry+https://github.com/rust-lang/crates.io-index" 54 54 + checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" 55 55 + 56 56 + [[package]] 57 57 + name = "anstyle-parse" 58 58 + version = "0.2.7" 59 59 + source = "registry+https://github.com/rust-lang/crates.io-index" 60 60 + checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" 61 61 + dependencies = [ 62 62 + "utf8parse", 63 63 + ] 64 64 + 65 65 + [[package]] 66 66 + name = "anstyle-query" 67 67 + version = "1.1.3" 68 68 + source = "registry+https://github.com/rust-lang/crates.io-index" 69 69 + checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" 70 70 + dependencies = [ 71 71 + "windows-sys 0.59.0", 72 72 + ] 73 73 + 74 74 + [[package]] 75 75 + name = "anstyle-wincon" 76 76 + version = "3.0.9" 77 77 + source = "registry+https://github.com/rust-lang/crates.io-index" 78 78 + checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" 79 79 + dependencies = [ 80 80 + "anstyle", 81 81 + "once_cell_polyfill", 82 82 + "windows-sys 0.59.0", 83 83 + ] 84 84 + 85 85 + [[package]] 36 86 name = "arc-swap" 37 87 version = "1.7.1" 38 88 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 125 175 ] 126 176 127 177 [[package]] 178 178 + name = "clap" 179 179 + version = "4.5.41" 180 180 + source = "registry+https://github.com/rust-lang/crates.io-index" 181 181 + checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9" 182 182 + dependencies = [ 183 183 + "clap_builder", 184 184 + "clap_derive", 185 185 + ] 186 186 + 187 187 + [[package]] 188 188 + name = "clap_builder" 189 189 + version = "4.5.41" 190 190 + source = "registry+https://github.com/rust-lang/crates.io-index" 191 191 + checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d" 192 192 + dependencies = [ 193 193 + "anstream", 194 194 + "anstyle", 195 195 + "clap_lex", 196 196 + "strsim", 197 197 + ] 198 198 + 199 199 + [[package]] 200 200 + name = "clap_derive" 201 201 + version = "4.5.41" 202 202 + source = "registry+https://github.com/rust-lang/crates.io-index" 203 203 + checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491" 204 204 + dependencies = [ 205 205 + "heck", 206 206 + "proc-macro2", 207 207 + "quote", 208 208 + "syn", 209 209 + ] 210 210 + 211 211 + [[package]] 212 212 + name = "clap_lex" 213 213 + version = "0.7.5" 214 214 + source = "registry+https://github.com/rust-lang/crates.io-index" 215 215 + checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" 216 216 + 217 217 + [[package]] 128 218 name = "color-eyre" 129 219 version = "0.6.5" 130 220 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 152 242 ] 153 243 154 244 [[package]] 245 245 + name = "colorchoice" 246 246 + version = "1.0.4" 247 247 + source = "registry+https://github.com/rust-lang/crates.io-index" 248 248 + checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" 249 249 + 250 250 + [[package]] 155 251 name = "console" 156 252 version = "0.15.11" 157 253 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 662 758 ] 663 759 664 760 [[package]] 761 761 + name = "is_terminal_polyfill" 762 762 + version = "1.70.1" 763 763 + source = "registry+https://github.com/rust-lang/crates.io-index" 764 764 + checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" 765 765 + 766 766 + [[package]] 665 767 name = "itoa" 666 768 version = "1.0.15" 667 769 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 671 773 name = "jj-sync-prs" 672 774 version = "0.1.0" 673 775 dependencies = [ 776 776 + "clap", 674 777 "color-eyre", 675 778 "dialoguer", 676 779 "futures", ··· 862 965 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" 863 966 864 967 [[package]] 968 968 + name = "once_cell_polyfill" 969 969 + version = "1.70.1" 970 970 + source = "registry+https://github.com/rust-lang/crates.io-index" 971 971 + checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" 972 972 + 973 973 + [[package]] 865 974 name = "openssl-probe" 866 975 version = "0.1.6" 867 976 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1277 1386 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" 1278 1387 1279 1388 [[package]] 1389 1389 + name = "strsim" 1390 1390 + version = "0.11.1" 1391 1391 + source = "registry+https://github.com/rust-lang/crates.io-index" 1392 1392 + checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" 1393 1393 + 1394 1394 + [[package]] 1280 1395 name = "subtle" 1281 1396 version = "2.6.1" 1282 1397 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1610 1725 version = "1.0.4" 1611 1726 source = "registry+https://github.com/rust-lang/crates.io-index" 1612 1727 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" 1728 1728 + 1729 1729 + [[package]] 1730 1730 + name = "utf8parse" 1731 1731 + version = "0.2.2" 1732 1732 + source = "registry+https://github.com/rust-lang/crates.io-index" 1733 1733 + checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" 1613 1734 1614 1735 [[package]] 1615 1736 name = "valuable"

+1

Cargo.toml

··· 4 4 edition = "2024" 5 5 6 6 [dependencies] 7 7 + clap = { version = "4.0", features = ["derive", "env"] } 7 8 color-eyre = "0.6.5" 8 9 dialoguer = "0.11.0" 9 10 futures = "0.3.31"

-27

commands

··· 1 1 - jj log --no-graph -r 'bookmarks()' -T 'bookmarks ++ "\n"' 2 2 - 3 3 - jj log --no-graph -r 'children(push-wtqmqortkzry) & bookmarks()' -T 'bookmarks ++ "\n"' 4 4 - 5 5 - jj log --no-graph -r '..push-wtqmqortkzry & ..ng-3088-button-to-create-windows-from-window-notes' 6 6 - 7 7 - jj log --no-graph -r '..bookmarks()' 8 8 - 9 9 - jj log --no-graph -r 'root().. & bookmarks()' 10 10 - 11 11 - jj -r 'main---::' 12 12 - 13 13 - jj log --no-graph -T 'change_id ++ "\n"' 14 14 - 15 15 - jj log --no-graph -r 'children(ztzxrsrskxmyopropwxolytvzwlmlylu, 1)' -T 'change_id ++ " " ++ bookmarks ++ "\n"' 16 16 - 17 17 - jj log --no-graph -r 'ztzxrsrskxmyopropwxolytvzwlmlylu' -T 'change_id ++ " " ++ bookmarks ++ "\n"' 18 18 - 19 19 - ztzxrsrskxmyopropwxolytvzwlmlylu 20 20 - 21 21 - push-wtqmqortkzry 22 22 - ng-3088-button-to-create-windows-from-window-notes 23 23 - david/debug-menu-for-camera-layers 24 24 - david/port-ruler-to-new-snapping-25-07-04 25 25 - david/move-snapping-into-core-state 26 26 - david/simplify-coordinate-spaces 27 27 - main

+61

flake.lock

··· 1 1 + { 2 2 + "nodes": { 3 3 + "flake-utils": { 4 4 + "inputs": { 5 5 + "systems": "systems" 6 6 + }, 7 7 + "locked": { 8 8 + "lastModified": 1731533236, 9 9 + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", 10 10 + "owner": "numtide", 11 11 + "repo": "flake-utils", 12 12 + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", 13 13 + "type": "github" 14 14 + }, 15 15 + "original": { 16 16 + "owner": "numtide", 17 17 + "repo": "flake-utils", 18 18 + "type": "github" 19 19 + } 20 20 + }, 21 21 + "nixpkgs": { 22 22 + "locked": { 23 23 + "lastModified": 1751984180, 24 24 + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", 25 25 + "owner": "NixOS", 26 26 + "repo": "nixpkgs", 27 27 + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", 28 28 + "type": "github" 29 29 + }, 30 30 + "original": { 31 31 + "owner": "NixOS", 32 32 + "ref": "nixos-unstable", 33 33 + "repo": "nixpkgs", 34 34 + "type": "github" 35 35 + } 36 36 + }, 37 37 + "root": { 38 38 + "inputs": { 39 39 + "flake-utils": "flake-utils", 40 40 + "nixpkgs": "nixpkgs" 41 41 + } 42 42 + }, 43 43 + "systems": { 44 44 + "locked": { 45 45 + "lastModified": 1681028828, 46 46 + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", 47 47 + "owner": "nix-systems", 48 48 + "repo": "default", 49 49 + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", 50 50 + "type": "github" 51 51 + }, 52 52 + "original": { 53 53 + "owner": "nix-systems", 54 54 + "repo": "default", 55 55 + "type": "github" 56 56 + } 57 57 + } 58 58 + }, 59 59 + "root": "root", 60 60 + "version": 7 61 61 + }

+45

flake.nix

··· 1 1 + { 2 2 + description = "A Rust project built with Nix"; 3 3 + 4 4 + inputs = { 5 5 + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; 6 6 + flake-utils.url = "github:numtide/flake-utils"; 7 7 + }; 8 8 + 9 9 + outputs = { 10 10 + self, 11 11 + nixpkgs, 12 12 + flake-utils, 13 13 + }: 14 14 + flake-utils.lib.eachDefaultSystem ( 15 15 + system: let 16 16 + pkgs = import nixpkgs { 17 17 + inherit system; 18 18 + }; 19 19 + in { 20 20 + packages.default = pkgs.rustPlatform.buildRustPackage { 21 21 + pname = "jj-sync-prs"; 22 22 + version = "0.1.0"; 23 23 + 24 24 + src = ./.; 25 25 + 26 26 + cargoLock = { 27 27 + lockFile = ./Cargo.lock; 28 28 + }; 29 29 + 30 30 + nativeBuildInputs = [ 31 31 + pkgs.makeWrapper 32 32 + ]; 33 33 + 34 34 + buildInputs = [ 35 35 + pkgs.graphviz 36 36 + ]; 37 37 + 38 38 + postInstall = '' 39 39 + wrapProgram $out/bin/jj-sync-prs \ 40 40 + --prefix PATH : ${pkgs.lib.makeBinPath [pkgs.graphviz]} 41 41 + ''; 42 42 + }; 43 43 + } 44 44 + ); 45 45 + }

-15

graph.dot

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

+1

result

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

+1 -1

src/graph.rs

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

+101 -41

src/main.rs

··· 1 1 use std::fmt::Write; 2 2 + use std::io::Write as _; 3 3 + use std::path::PathBuf; 2 4 use std::pin::pin; 3 5 use std::{ffi::OsStr, path::Path}; 4 6 7 7 + use clap::Parser; 5 8 use color_eyre::eyre::{Context as _, ContextCompat}; 6 9 use dialoguer::{Confirm, Editor}; 7 10 use futures::TryStreamExt as _; ··· 12 15 13 16 mod graph; 14 17 18 18 + #[derive(Parser, Debug)] 19 19 + #[command(name = "jj-sync-prs")] 20 20 + #[command(about = "Sync jujutsu branches with GitHub pull requests")] 21 21 + struct Args { 22 22 + #[command(subcommand)] 23 23 + subcommand: Option<Subcommand>, 24 24 + } 25 25 + 26 26 + #[derive(clap::Subcommand, Debug)] 27 27 + enum Subcommand { 28 28 + /// Sync branches with pull requests 29 29 + Sync { 30 30 + /// GitHub authentication token 31 31 + #[arg(long, env = "GH_AUTH_TOKEN")] 32 32 + github_token: String, 33 33 + }, 34 34 + /// Save the branch graph as an image 35 35 + Graph { 36 36 + /// File to write the image to 37 37 + #[arg(short, long)] 38 38 + out: Option<PathBuf>, 39 39 + }, 40 40 + } 41 41 + 15 42 #[tokio::main(flavor = "current_thread")] 16 43 async fn main() -> color_eyre::Result<()> { 17 44 color_eyre::install()?; 18 45 19 19 - let graph = build_branch_graph().context("failed to build graph")?; 46 46 + let args = Args::parse(); 20 47 21 21 - let repo_info = repo_info().context("failed to find repo info")?; 48 48 + if let Some(subcommand) = args.subcommand { 49 49 + run_subcommand(subcommand).await?; 50 50 + } else { 51 51 + run_subcommand(Subcommand::Sync { 52 52 + github_token: std::env::var("GH_AUTH_TOKEN").context("GH_AUTH_TOKEN is not set")?, 53 53 + }) 54 54 + .await?; 55 55 + } 22 56 23 23 - let token = command("gh", ["auth", "token"]).context("failed to find github auth token")?; 24 24 - let token = token.trim().to_owned(); 25 25 - let octocrab = octocrab::OctocrabBuilder::default() 26 26 - .personal_token(token) 27 27 - .build() 28 28 - .context("failed to build github client")?; 29 29 - let mut pulls = octocrab 30 30 - .pulls(&repo_info.owner, &repo_info.name) 31 31 - .list() 32 32 - .send() 33 33 - .await 34 34 - .context("failed to fetch pull requests")? 35 35 - .into_stream(&octocrab) 36 36 - .try_collect::<Vec<_>>() 37 37 - .await 38 38 - .context("failed to fetch all pull requests")?; 57 57 + Ok(()) 58 58 + } 39 59 40 40 - for stack_root in graph.iter_edges_from("main") { 41 41 - find_or_create_prs( 42 42 - stack_root, "main", &graph, &repo_info, &octocrab, &mut pulls, 43 43 - ) 44 44 - .await 45 45 - .context("failed to sync prs")?; 46 46 - } 60 60 + async fn run_subcommand(subcommand: Subcommand) -> color_eyre::Result<()> { 61 61 + match subcommand { 62 62 + Subcommand::Sync { github_token } => { 63 63 + let graph = build_branch_graph().context("failed to build graph")?; 47 64 48 48 - for stack_root in graph.iter_edges_from("main") { 49 49 - let mut comment_lines = Vec::new(); 50 50 - write_pr_comment(&graph, stack_root, 0, &mut comment_lines); 65 65 + let repo_info = repo_info().context("failed to find repo info")?; 51 66 52 52 - if comment_lines.len() > 1 { 53 53 - // if the comment contains just one line then its not 54 54 - // part of a stack 55 55 - create_or_update_comments( 56 56 - &comment_lines, 57 57 - stack_root, 58 58 - &graph, 59 59 - &pulls, 60 60 - &octocrab, 61 61 - &repo_info, 62 62 - ) 63 63 - .await 64 64 - .context("failed to sync stack comment")?; 67 67 + let octocrab = octocrab::OctocrabBuilder::default() 68 68 + .personal_token(github_token) 69 69 + .build() 70 70 + .context("failed to build github client")?; 71 71 + let mut pulls = octocrab 72 72 + .pulls(&repo_info.owner, &repo_info.name) 73 73 + .list() 74 74 + .send() 75 75 + .await 76 76 + .context("failed to fetch pull requests")? 77 77 + .into_stream(&octocrab) 78 78 + .try_collect::<Vec<_>>() 79 79 + .await 80 80 + .context("failed to fetch all pull requests")?; 81 81 + 82 82 + for stack_root in graph.iter_edges_from("main") { 83 83 + find_or_create_prs( 84 84 + stack_root, "main", &graph, &repo_info, &octocrab, &mut pulls, 85 85 + ) 86 86 + .await 87 87 + .context("failed to sync prs")?; 88 88 + } 89 89 + 90 90 + for stack_root in graph.iter_edges_from("main") { 91 91 + let mut comment_lines = Vec::new(); 92 92 + write_pr_comment(&graph, stack_root, 0, &mut comment_lines); 93 93 + 94 94 + if comment_lines.len() > 1 { 95 95 + // if the comment contains just one line then its not 96 96 + // part of a stack 97 97 + create_or_update_comments( 98 98 + &comment_lines, 99 99 + stack_root, 100 100 + &graph, 101 101 + &pulls, 102 102 + &octocrab, 103 103 + &repo_info, 104 104 + ) 105 105 + .await 106 106 + .context("failed to sync stack comment")?; 107 107 + } 108 108 + } 109 109 + } 110 110 + Subcommand::Graph { out } => { 111 111 + let graph = build_branch_graph().context("failed to build graph")?; 112 112 + let dot = graph.to_dot(); 113 113 + let (read, mut write) = std::io::pipe()?; 114 114 + let out = out.as_deref().unwrap_or_else(|| Path::new("branches.png")); 115 115 + let mut cmd = std::process::Command::new("dot"); 116 116 + cmd.arg("-Tpng"); 117 117 + cmd.arg("-o"); 118 118 + cmd.args(out); 119 119 + cmd.stdin(read); 120 120 + let mut child = cmd.spawn().with_context(|| format!("{cmd:?} failed"))?; 121 121 + write.write_all(dot.as_bytes())?; 122 122 + drop(write); 123 123 + color_eyre::eyre::ensure!(child.wait()?.success()); 124 124 + eprintln!("Wrote {out:?}"); 65 125 } 66 126 } 67 127

workflow.png

This is a binary file and will not be displayed.