mirror of
https://github.com/rojo-rbx/rojo.git
synced 2026-10-23 14:01:37 +00:00
Update dependencies and implement git-based sync direction defaults
- Updated `clap` and `unicode-ident` versions in `Cargo.lock` and `Cargo.toml`. - Added `sha1` crate to `Cargo.toml` for SHA1 hashing functionality. - Introduced a new `git.rs` module for handling git operations, including changed files and SHA1 computation. - Enhanced the sync confirmation dialog to auto-select defaults based on git status, improving user experience during two-way sync. - Updated `PatchTree` to utilize git metadata for determining default selections during patch application. These changes enhance the integration with git, providing smarter defaults and improving the overall sync process.
This commit is contained in:
parent
df22500102
commit
7ba04f7f6a
29 changed files with 1285 additions and 176 deletions
|
|
@ -1,5 +1,7 @@
|
|||
//! Defines the data structures used for describing instance patches.
|
||||
|
||||
use std::collections::HashSet;
|
||||
|
||||
use rbx_dom_weak::{
|
||||
types::{Ref, Variant},
|
||||
HashMapExt as _, Ustr, UstrMap,
|
||||
|
|
@ -18,6 +20,10 @@ pub struct PatchSet {
|
|||
pub removed_instances: Vec<Ref>,
|
||||
pub added_instances: Vec<PatchAdd>,
|
||||
pub updated_instances: Vec<PatchUpdate>,
|
||||
/// Instance IDs whose backing files should be staged via git add after writing.
|
||||
/// Populated from WriteRequest.stage_ids, consumed by change_processor.
|
||||
#[serde(default, skip)]
|
||||
pub stage_ids: HashSet<Ref>,
|
||||
}
|
||||
|
||||
impl PatchSet {
|
||||
|
|
@ -26,6 +32,7 @@ impl PatchSet {
|
|||
removed_instances: Vec::new(),
|
||||
added_instances: Vec::new(),
|
||||
updated_instances: Vec::new(),
|
||||
stage_ids: HashSet::new(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue