gitorii 0.1.1

A human-first Git client with simplified commands, snapshots, multi-platform mirrors and built-in secret scanning
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64

use crate::core::GitRepo;
use crate::error::Result;
use crate::snapshot::SnapshotManager;
use crate::integrate::IntegrateHelper;

impl GitRepo {
    /// Integrate changes from another branch (smart merge/rebase)
    pub fn integrate(&self, branch: &str, force_merge: bool, force_rebase: bool, preview: bool) -> Result<()> {
        let helper = IntegrateHelper::new(&self.repo);
        
        // Create safety snapshot
        let snapshot_mgr = SnapshotManager::new(".")?;
        let snapshot_id = snapshot_mgr.create_snapshot(Some(&format!("before-integrate-{}", branch)))?;
        println!("📸 Safety snapshot created: {}", snapshot_id);
        println!();
        
        // Get recommendation
        let recommendation = helper.get_recommendation(branch)?;
        let should_rebase = helper.should_rebase(branch)?;
        
        // Determine action
        let use_rebase = if force_merge {
            false
        } else if force_rebase {
            true
        } else {
            should_rebase
        };
        
        // Show analysis
        println!("🔍 Analyzing integration...\n");
        println!("{}", recommendation);
        println!();
        
        if preview {
            println!("💡 Preview mode - no changes made");
            println!();
            if use_rebase {
                println!("To proceed with rebase:");
                println!("  torii integrate {} --rebase", branch);
            } else {
                println!("To proceed with merge:");
                println!("  torii integrate {} --merge", branch);
            }
            return Ok(());
        }
        
        // Perform integration
        if use_rebase {
            println!("🔄 Rebasing onto {}...", branch);
            helper.rebase(branch)?;
            println!("✅ Rebase complete");
        } else {
            println!("🔄 Merging {}...", branch);
            helper.merge(branch)?;
            println!("✅ Merge complete");
        }
        
        println!();
        println!("💡 To undo: torii snapshot restore {}", snapshot_id);
        
        Ok(())
    }
}