Merge pull request #3729 from gitbutlerapp/update-branch-name-with-old-name

rename snapshots module names

crates/gitbutler-cli/src/main.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use gitbutler_core::{projects::Project, snapshots::snapshot::Oplog};
+use gitbutler_core::{ops::oplog::Oplog, projects::Project};
 
 use clap::{arg, Command};
 #[cfg(not(windows))]

crates/gitbutler-core/src/lib.rs

@@ -25,12 +25,12 @@ pub mod git;
 pub mod id;
 pub mod keys;
 pub mod lock;
+pub mod ops;
 pub mod path;
 pub mod project_repository;
 pub mod projects;
 pub mod reader;
 pub mod sessions;
-pub mod snapshots;
 pub mod ssh;
 pub mod storage;
 pub mod time;

crates/gitbutler-core/src/ops/mod.rs

@@ -1,5 +1,5 @@
 pub mod entry;
+pub mod oplog;
 mod reflog;
 pub mod snapshot;
-pub mod snapshoter;
 mod state;

crates/gitbutler-core/src/ops/snapshot.rs

@@ -1,9 +1,9 @@
 use crate::{
-    snapshots::entry::{OperationType, SnapshotDetails},
+    ops::entry::{OperationType, SnapshotDetails},
     virtual_branches::Branch,
 };
 
-use super::{entry::Trailer, snapshot::Oplog};
+use super::{entry::Trailer, oplog::Oplog};
 
 pub trait Snapshoter {
     fn snapshot_deletion(&self, oplog: &dyn Oplog) -> anyhow::Result<()>;

crates/gitbutler-core/src/virtual_branches/controller.rs

@@ -1,8 +1,8 @@
 use crate::{
     error::Error,
-    snapshots::{
+    ops::{
         entry::{OperationType, SnapshotDetails},
-        snapshot::Oplog,
+        oplog::Oplog,
     },
 };
 use std::{collections::HashMap, path::Path, sync::Arc};

crates/gitbutler-core/src/virtual_branches/virtual.rs

@@ -25,7 +25,7 @@ use super::{
     branch_to_remote_branch, errors, target, RemoteBranch, VirtualBranchesHandle,
 };
 use crate::git::diff::{diff_files_into_hunks, trees, FileDiff};
-use crate::snapshots::snapshoter::Snapshoter;
+use crate::ops::snapshot::Snapshoter;
 use crate::virtual_branches::branch::HunkHash;
 use crate::{
     dedup::{dedup, dedup_fmt},

crates/gitbutler-tauri/src/lib.rs

@@ -27,7 +27,7 @@ pub mod github;
 pub mod keys;
 pub mod projects;
 pub mod sessions;
-pub mod snapshots;
+pub mod undo;
 pub mod users;
 pub mod virtual_branches;
 pub mod zip;

crates/gitbutler-tauri/src/main.rs

@@ -17,7 +17,7 @@ use std::path::PathBuf;
 
 use gitbutler_core::{assets, database, git, storage};
 use gitbutler_tauri::{
-    app, askpass, commands, deltas, github, keys, logs, menu, projects, sessions, snapshots, users,
+    app, askpass, commands, deltas, github, keys, logs, menu, projects, sessions, undo, users,
     virtual_branches, watcher, zip,
 };
 use tauri::{generate_context, Manager};
@@ -232,8 +232,8 @@ fn main() {
                     virtual_branches::commands::squash_branch_commit,
                     virtual_branches::commands::fetch_from_target,
                     virtual_branches::commands::move_commit,
-                    snapshots::list_snapshots,
+                    undo::list_snapshots,
-                    snapshots::restore_snapshot,
+                    undo::restore_snapshot,
                     menu::menu_item_set_enabled,
                     keys::commands::get_public_key,
                     github::commands::init_device_oauth,

crates/gitbutler-tauri/src/undo.rs

@@ -1,8 +1,8 @@
 use crate::error::Error;
 use anyhow::Context;
 use gitbutler_core::{
+    ops::{entry::Snapshot, oplog::Oplog},
     projects::{self, ProjectId},
-    snapshots::{entry::Snapshot, snapshot::Oplog},
 };
 use tauri::Manager;
 use tracing::instrument;

crates/gitbutler-watcher/src/handler/mod.rs

@@ -7,10 +7,10 @@ use std::sync::Arc;
 use std::{path, time};
 
 use anyhow::{bail, Context, Result};
+use gitbutler_core::ops::entry::{OperationType, SnapshotDetails};
+use gitbutler_core::ops::oplog::Oplog;
 use gitbutler_core::projects::ProjectId;
 use gitbutler_core::sessions::SessionId;
-use gitbutler_core::snapshots::entry::{OperationType, SnapshotDetails};
-use gitbutler_core::snapshots::snapshot::Oplog;
 use gitbutler_core::virtual_branches::VirtualBranches;
 use gitbutler_core::{
     assets, deltas, gb_repository, git, project_repository, projects, reader, sessions, users,