Merge pull request #10650 from Byron/fix

fix failure when encountering empty stacks

Author: Byron

.github/workflows/push.yaml

@@ -105,7 +105,7 @@ jobs:
       - name: Rust Cache
         uses: Swatinem/[email protected]
         with:
-          shared-key: rust-lint
+          shared-key: lint
           save-if: ${{ github.ref == 'refs/heads/master' }}
       - run: cargo fmt --check --all
       - run: cargo check --workspace --all-targets
@@ -127,7 +127,7 @@ jobs:
       - name: Rust Cache
         uses: Swatinem/[email protected]
         with:
-          shared-key: rust-but-binary
+          shared-key: but-binary
           save-if: ${{ github.ref == 'refs/heads/master' }}
       - run: |
           sudo apt update
@@ -149,7 +149,7 @@ jobs:
       - name: Rust Cache
         uses: Swatinem/[email protected]
         with:
-          shared-key: rust-docs
+          shared-key: docs
           save-if: ${{ github.ref == 'refs/heads/master' }}
       - run: cargo doc --no-deps --all-features --document-private-items -p gitbutler-git
         env:
@@ -185,7 +185,7 @@ jobs:
       - name: Rust Cache
         uses: Swatinem/[email protected]
         with:
-          shared-key: rust-testing
+          shared-key: cargo-test
           save-if: ${{ github.ref == 'refs/heads/master' }}
       - run: |
           cargo test --workspace
@@ -213,7 +213,7 @@ jobs:
       - name: Rust Cache
         uses: Swatinem/[email protected]
         with:
-          shared-key: rust-testing
+          shared-key: cargo-test
           save-if: ${{ github.ref == 'refs/heads/master' }}
       - name: 'cargo check'
         run: cargo check --workspace --all-targets --features windows

.github/workflows/test-e2e-playwright.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Rust Cache
         uses: Swatinem/[email protected]
         with:
-          shared-key: rust-but-server-gitbutler-git-but-testing-binary
+          shared-key: e2e-playwright-rust-binaries
           save-if: ${{ github.ref == 'refs/heads/master' }}
       - name: Preset Git Configuration and but-testing location
         run: |

crates/but-graph/src/ref_metadata_legacy.rs

@@ -323,7 +323,7 @@ impl RefMetadata for VirtualBranchesTomlMetadata {
                     }) {
                         Some(branch) => branch,
                         None => branches_to_create.pop().context(
-                            "BUG: do not pop off the last branch, remove the whole stack",
+                            "BUG: incoming stack is probably empty, caller should have removed the whole stack",
                         )?,
                     };
 
@@ -560,6 +560,8 @@ impl VirtualBranchesTomlMetadata {
             ref_info: managed_ref_info(),
             stacks: stacks
                 .iter()
+                // We aren't able to handle these well, so let's ignore them.
+                .filter(|stack| !stack.heads.is_empty())
                 .sorted_by_key(|s| s.order)
                 .map(|s| WorkspaceStack {
                     id: s.id,

crates/but-graph/tests/graph/ref_metadata_legacy.rs

@@ -1054,7 +1054,7 @@ fn create_workspace_from_scratch_workspace_first() -> anyhow::Result<()> {
     let err = store.set_workspace(&ws).unwrap_err();
     assert_eq!(
         err.to_string(),
-        "BUG: do not pop off the last branch, remove the whole stack"
+        "BUG: incoming stack is probably empty, caller should have removed the whole stack"
     );
     ws.stacks.pop();
     assert_eq!(ws.stacks.len(), 1);

crates/but-testing/src/args.rs

@@ -6,8 +6,8 @@ use std::path::PathBuf;
 #[clap(name = "gitbutler-cli", about = "A CLI for GitButler", version = option_env!("GIX_VERSION"))]
 pub struct Args {
     /// Enable tracing for debug and performance information printed to stderr.
-    #[clap(short = 'd', long)]
-    pub trace: bool,
+    #[clap(short = 'd', long, action = clap::ArgAction::Count,)]
+    pub trace: u8,
     /// Run as if gitbutler-cli was started in PATH instead of the current working directory.
     #[clap(short = 'C', long, default_value = ".", value_name = "PATH")]
     pub current_dir: PathBuf,

crates/but-testing/src/main.rs

@@ -18,8 +18,8 @@ mod command;
 async fn main() -> Result<()> {
     let args: Args = clap::Parser::parse();
 
-    if args.trace {
-        trace::init()?;
+    if args.trace > 0 {
+        trace::init(args.trace)?;
     }
     let _op_span = tracing::info_span!("cli-op").entered();
     static CHANNEL: Option<&str> = option_env!("CHANNEL");
@@ -224,13 +224,17 @@ mod trace {
     use tracing_subscriber::layer::SubscriberExt;
     use tracing_subscriber::util::SubscriberInitExt;
 
-    pub fn init() -> anyhow::Result<()> {
+    pub fn init(level: u8) -> anyhow::Result<()> {
         tracing_subscriber::registry()
             .with(
                 tracing_forest::ForestLayer::from(
                     tracing_forest::printer::PrettyPrinter::new().writer(std::io::stderr),
                 )
-                .with_filter(LevelFilter::DEBUG),
+                .with_filter(match level {
+                    1 => LevelFilter::INFO,
+                    2 => LevelFilter::DEBUG,
+                    _ => LevelFilter::TRACE,
+                }),
             )
             .init();
         Ok(())