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 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268
|
use subversion::{
client::{CheckoutOptions, CommitOptions, Context, UpdateOptions},
Depth, Revision,
};
/// Example demonstrating the new conflict resolution API
///
/// This example shows how to:
/// 1. Create a repository with conflicts
/// 2. Detect conflicts using conflict_get
/// 3. Examine conflict details
/// 4. Resolve conflicts using various methods
fn main() -> Result<(), Box<dyn std::error::Error + 'static>> {
println!("Conflict Resolution API Example\n");
// Create a temporary directory for our test
let temp_dir = tempfile::tempdir()?;
let repo_path = temp_dir.path().join("repo");
let wc1_path = temp_dir.path().join("wc1");
let wc2_path = temp_dir.path().join("wc2");
// Create a repository
println!("Creating repository...");
subversion::repos::Repos::create(&repo_path)?;
let mut ctx = Context::new()?;
let url = format!("file://{}", repo_path.display());
// Checkout first working copy
println!("Checking out working copy 1...");
ctx.checkout(
url.as_str(),
&wc1_path,
&CheckoutOptions {
peg_revision: Revision::Head,
revision: Revision::Head,
depth: Depth::Infinity,
ignore_externals: false,
allow_unver_obstructions: false,
},
)?;
// Create a file and commit
println!("Creating initial file...");
let file1 = wc1_path.join("test.txt");
std::fs::write(&file1, "Line 1\nLine 2\nLine 3\n")?;
ctx.add(
&file1,
&subversion::client::AddOptions {
depth: Depth::Empty,
force: false,
no_ignore: false,
no_autoprops: false,
add_parents: false,
},
)?;
ctx.commit(
&[wc1_path.to_str().unwrap()],
&CommitOptions::default(),
std::collections::HashMap::new(),
None,
&mut |_| Ok(()),
)?;
// Checkout second working copy
println!("Checking out working copy 2...");
ctx.checkout(
url.as_str(),
&wc2_path,
&CheckoutOptions {
peg_revision: Revision::Head,
revision: Revision::Head,
depth: Depth::Infinity,
ignore_externals: false,
allow_unver_obstructions: false,
},
)?;
// Modify file in wc1 and commit
println!("Modifying file in wc1...");
std::fs::write(&file1, "Line 1\nModified by WC1\nLine 3\n")?;
ctx.commit(
&[wc1_path.to_str().unwrap()],
&CommitOptions::default(),
std::collections::HashMap::new(),
None,
&mut |_| Ok(()),
)?;
// Modify same file in wc2 (different change)
println!("Modifying file in wc2 (creating conflict)...");
let file2 = wc2_path.join("test.txt");
std::fs::write(&file2, "Line 1\nModified by WC2\nLine 3\n")?;
// Update wc2 - this will create a conflict
println!("Updating wc2 (conflict will occur)...");
let _ = ctx.update(
&[wc2_path.to_str().unwrap()],
Revision::Head,
&UpdateOptions {
depth: Depth::Infinity,
depth_is_sticky: false,
ignore_externals: false,
allow_unver_obstructions: false,
adds_as_modifications: false,
make_parents: false,
},
);
// Now demonstrate the conflict resolution API
println!("\n=== Demonstrating Conflict Resolution API ===\n");
// 1. Get the conflict
println!("1. Getting conflict information...");
let mut conflict = ctx.conflict_get(&file2)?;
// 2. Check what types of conflicts exist
let (has_text, prop_conflicts, has_tree) =
conflict.get_conflicted().map_err(|e| e.to_string())?;
// Clone prop_conflicts to avoid borrowing issues
let prop_conflicts: Vec<String> = prop_conflicts.iter().map(|s| s.to_string()).collect();
println!(" Text conflict: {}", has_text);
println!(" Property conflicts: {:?}", prop_conflicts);
println!(" Tree conflict: {}", has_tree);
if has_text {
// 3. Get conflict details
println!("\n2. Examining text conflict details...");
let local_abspath = conflict.get_local_abspath();
println!(" Conflicted file: {}", local_abspath);
let mime_type = conflict.text_get_mime_type().map_err(|e| e.to_string())?;
let mime_type = mime_type.map(|s| s.to_string()); // Clone to owned
println!(" MIME type: {:?}", mime_type);
let incoming_change = conflict.get_incoming_change();
let local_change = conflict.get_local_change();
println!(" Incoming change: {:?}", incoming_change);
println!(" Local change: {:?}", local_change);
// 4. Get available resolution options
println!("\n3. Getting resolution options...");
let options = conflict
.text_get_resolution_options(&mut ctx)
.map_err(|e| e.to_string())?;
println!(" Available options:");
for (i, opt) in options.iter().enumerate() {
let id = opt.get_id();
let label = opt.get_label();
let desc = opt.get_description();
println!(" {}. {} - {} (ID: {:?})", i + 1, label, desc, id);
}
// 5. Find a specific option by ID
println!("\n4. Finding 'merged text' option...");
let merged_option = subversion::client::ConflictOption::find_by_id(
&options,
subversion::ClientConflictOptionId::MergedText,
);
if let Some(opt) = merged_option {
println!(" Found option: {}", opt.get_label());
// 6. Resolve the conflict using the merged text option
println!("\n5. Resolving conflict with merged text...");
conflict
.text_resolve_by_id(subversion::TextConflictChoice::Merged, &mut ctx)
.map_err(|e| e.to_string())?;
let resolution = conflict.text_get_resolution();
println!(" Resolution applied: {:?}", resolution);
} else {
// Alternative: use working text
println!("\n5. Resolving conflict with working version...");
conflict
.text_resolve_by_id(subversion::TextConflictChoice::MineFull, &mut ctx)
.map_err(|e| e.to_string())?;
}
println!("\n✓ Conflict resolved successfully!");
}
// Example with property conflicts
println!("\n=== Property Conflict Example ===\n");
println!("Creating property conflict...");
// Set a property
ctx.propset(
"custom:prop",
Some(b"value1"),
file1.to_str().unwrap(),
&subversion::client::PropSetOptions::default(),
)?;
ctx.commit(
&[wc1_path.to_str().unwrap()],
&CommitOptions::default(),
std::collections::HashMap::new(),
None,
&mut |_| Ok(()),
)?;
// Set different value in wc2
ctx.propset(
"custom:prop",
Some(b"value2"),
file2.to_str().unwrap(),
&subversion::client::PropSetOptions::default(),
)?;
// Update to create conflict
let _ = ctx.update(
&[wc2_path.to_str().unwrap()],
Revision::Head,
&UpdateOptions::default(),
);
// Get property conflict
if let Ok(mut prop_conflict) = ctx.conflict_get(&file2) {
let (_, props, _) = prop_conflict.get_conflicted().map_err(|e| e.to_string())?;
// Clone props to owned strings to avoid borrowing issues
let props: Vec<String> = props.iter().map(|s| s.to_string()).collect();
if !props.is_empty() {
println!("Property conflict detected on: {:?}", props);
// Get property values
let propvals = prop_conflict
.prop_get_propvals(&props[0])
.map_err(|e| e.to_string())?;
println!(" Base value: {:?}", propvals.0);
println!(" Working value: {:?}", propvals.1);
println!(" Incoming old value: {:?}", propvals.2);
println!(" Incoming new value: {:?}", propvals.3);
// Get resolution options
let prop_options = prop_conflict
.prop_get_resolution_options(&mut ctx)
.map_err(|e| e.to_string())?;
println!(
" Available property resolution options: {}",
prop_options.len()
);
// Resolve by choosing working version
prop_conflict
.prop_resolve_by_id(
&props[0],
subversion::TextConflictChoice::MineFull,
&mut ctx,
)
.map_err(|e| e.to_string())?;
println!(" ✓ Property conflict resolved");
}
}
println!("\n=== Example completed successfully! ===");
println!("\nThis example demonstrated:");
println!(" • Getting conflict information with conflict_get");
println!(" • Examining conflict details and types");
println!(" • Listing available resolution options");
println!(" • Finding specific options by ID");
println!(" • Resolving text and property conflicts");
println!(" • Using prop_get_propvals to examine property values");
Ok(())
}
|