Skip to content

fix: Handle dry-run for all commands #1546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aawsome merged 1 commit into from
Aug 31, 2025
Merged

fix: Handle dry-run for all commands #1546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/commands/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::{Application, RUSTIC_APP, status_err};

use abscissa_core::{Command, Runnable, Shutdown};

use anyhow::Result;
use anyhow::{Result, bail};

use rustic_core::ConfigOptions;

Expand All @@ -29,6 +29,11 @@ impl ConfigCmd {
fn inner_run(&self) -> Result<()> {
let config = RUSTIC_APP.config();

// Handle dry-run mode
if config.global.dry_run {
bail!("cannot modify config in dry-run mode!",);
}

let changed = config
.repository
.run_open(|mut repo| Ok(repo.apply_config(&self.config_opts)?))?;
Expand Down
7 changes: 6 additions & 1 deletion src/commands/merge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,13 @@ impl MergeCmd {
repo.get_snapshots(&self.ids)?
};

let snap = SnapshotFile::from_options(&self.snap_opts)?;
// Handle dry-run mode
if config.global.dry_run {
println!("would have modified the following snapshots:\n {snapshots:?}");
return Ok(());
}

let snap = SnapshotFile::from_options(&self.snap_opts)?;
let snap = repo.merge_snapshots(&snapshots, &last_modified_node, snap)?;

if self.json {
Expand Down