subversion 0.1.10

Rust bindings for Subversion
Documentation
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
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
use crate::{svn_result, Error, Revision, Revnum};
use std::collections::HashMap;
use std::marker::PhantomData;
use subversion_sys::svn_mergeinfo_t;

/// Mergeinfo handle with RAII cleanup
pub struct Mergeinfo {
    ptr: svn_mergeinfo_t,
    pool: apr::Pool<'static>,
    _phantom: PhantomData<*mut ()>, // !Send + !Sync
}

impl Mergeinfo {
    pub(crate) unsafe fn from_ptr_and_pool(ptr: svn_mergeinfo_t, pool: apr::Pool<'static>) -> Self {
        Self {
            ptr,
            pool,
            _phantom: PhantomData,
        }
    }

    /// Parse a mergeinfo string into a Mergeinfo struct.
    ///
    /// The input string should be in the standard mergeinfo format:
    /// `/path:rev1,rev2-rev3\n/other/path:rev4`
    pub fn parse(input: &str) -> Result<Self, Error<'static>> {
        let pool = apr::Pool::new();
        let input_cstr = std::ffi::CString::new(input)
            .map_err(|_| Error::from_message("Invalid mergeinfo string"))?;

        unsafe {
            let mut mergeinfo: svn_mergeinfo_t = std::ptr::null_mut();
            let err = subversion_sys::svn_mergeinfo_parse(
                &mut mergeinfo,
                input_cstr.as_ptr(),
                pool.as_mut_ptr(),
            );
            svn_result(err)?;
            Ok(Self::from_ptr_and_pool(mergeinfo, pool))
        }
    }

    /// Convert this mergeinfo to a string representation.
    pub fn to_string(&self) -> Result<String, Error<'static>> {
        unsafe {
            let mut output: *mut subversion_sys::svn_string_t = std::ptr::null_mut();
            let err = subversion_sys::svn_mergeinfo_to_string(
                &mut output,
                self.ptr,
                self.pool.as_mut_ptr(),
            );
            svn_result(err)?;

            if output.is_null() || (*output).data.is_null() {
                return Ok(String::new());
            }

            let data_slice = std::slice::from_raw_parts((*output).data as *const u8, (*output).len);
            Ok(std::str::from_utf8(data_slice)
                .map_err(|_| Error::from_message("Mergeinfo string is not valid UTF-8"))?
                .to_string())
        }
    }

    /// Merge another mergeinfo into this one.
    pub fn merge(&mut self, other: &Mergeinfo) -> Result<(), Error<'static>> {
        unsafe {
            let err = subversion_sys::svn_mergeinfo_merge2(
                self.ptr,
                other.ptr,
                self.pool.as_mut_ptr(),
                self.pool.as_mut_ptr(),
            );
            svn_result(err)
        }
    }

    /// Remove revisions in `eraser` from this mergeinfo.
    pub fn remove(&self, eraser: &Mergeinfo) -> Result<Mergeinfo, Error<'static>> {
        let pool = apr::Pool::new();
        unsafe {
            let mut result: svn_mergeinfo_t = std::ptr::null_mut();
            let err = subversion_sys::svn_mergeinfo_remove2(
                &mut result,
                eraser.ptr,
                self.ptr,
                1, // consider_inheritance
                pool.as_mut_ptr(),
                pool.as_mut_ptr(),
            );
            svn_result(err)?;
            Ok(Mergeinfo::from_ptr_and_pool(result, pool))
        }
    }

    /// Compute the intersection of this mergeinfo with another.
    pub fn intersect(&self, other: &Mergeinfo) -> Result<Mergeinfo, Error<'static>> {
        let pool = apr::Pool::new();
        unsafe {
            let mut result: svn_mergeinfo_t = std::ptr::null_mut();
            let err = subversion_sys::svn_mergeinfo_intersect2(
                &mut result,
                self.ptr,
                other.ptr,
                1, // consider_inheritance
                pool.as_mut_ptr(),
                pool.as_mut_ptr(),
            );
            svn_result(err)?;
            Ok(Mergeinfo::from_ptr_and_pool(result, pool))
        }
    }

    /// Compute the difference between this mergeinfo and another.
    ///
    /// Returns (deleted, added) where:
    /// - deleted: mergeinfo in `self` but not in `other`
    /// - added: mergeinfo in `other` but not in `self`
    pub fn diff(&self, other: &Mergeinfo) -> Result<(Mergeinfo, Mergeinfo), Error<'static>> {
        let pool1 = apr::Pool::new();
        let pool2 = apr::Pool::new();
        unsafe {
            let mut deleted: svn_mergeinfo_t = std::ptr::null_mut();
            let mut added: svn_mergeinfo_t = std::ptr::null_mut();
            let err = subversion_sys::svn_mergeinfo_diff2(
                &mut deleted,
                &mut added,
                self.ptr,
                other.ptr,
                1, // consider_inheritance
                pool1.as_mut_ptr(),
                pool1.as_mut_ptr(),
            );
            svn_result(err)?;
            Ok((
                Mergeinfo::from_ptr_and_pool(deleted, pool1),
                Mergeinfo::from_ptr_and_pool(added, pool2),
            ))
        }
    }

    /// Duplicate this mergeinfo.
    pub fn dup(&self) -> Mergeinfo {
        let pool = apr::Pool::new();
        unsafe {
            let result = subversion_sys::svn_mergeinfo_dup(self.ptr, pool.as_mut_ptr());
            Mergeinfo::from_ptr_and_pool(result, pool)
        }
    }

    /// Sort the mergeinfo.
    pub fn sort(&mut self) -> Result<(), Error<'static>> {
        unsafe {
            let err = subversion_sys::svn_mergeinfo_sort(self.ptr, self.pool.as_mut_ptr());
            svn_result(err)
        }
    }

    /// Get the inheritable or non-inheritable portions of mergeinfo.
    ///
    /// If `path` is Some, only examine the mergeinfo for that path.
    /// If `inheritable` is true, returns inheritable mergeinfo.
    /// If `inheritable` is false, returns non-inheritable mergeinfo.
    pub fn inheritable(
        &self,
        path: Option<&str>,
        start: Revnum,
        end: Revnum,
        inheritable: bool,
    ) -> Result<Mergeinfo, Error<'static>> {
        let pool = apr::Pool::new();
        unsafe {
            let path_cstr = path
                .map(|p| std::ffi::CString::new(p).expect("path contains null byte"))
                .map(|c| c.as_ptr())
                .unwrap_or(std::ptr::null());
            let mut result: svn_mergeinfo_t = std::ptr::null_mut();
            let err = subversion_sys::svn_mergeinfo_inheritable2(
                &mut result,
                self.ptr,
                path_cstr,
                start.0,
                end.0,
                inheritable as i32,
                pool.as_mut_ptr(),
                pool.as_mut_ptr(),
            );
            svn_result(err)?;
            Ok(Mergeinfo::from_ptr_and_pool(result, pool))
        }
    }

    /// Get the paths in this mergeinfo as a HashMap of path -> revision ranges.
    pub fn paths(&self) -> HashMap<String, Vec<crate::RevisionRange>> {
        let mut result = HashMap::new();

        if self.ptr.is_null() {
            return result;
        }

        unsafe {
            let hash =
                apr::hash::TypedHash::<subversion_sys::svn_rangelist_t>::from_ptr(self.ptr as _);

            for (key, rangelist) in hash.iter() {
                let path = std::str::from_utf8(key)
                    .expect("mergeinfo path is not valid UTF-8")
                    .to_string();

                let mut ranges = Vec::new();
                let array = apr::tables::TypedArray::<subversion_sys::svn_merge_range_t>::from_ptr(
                    rangelist as *const _ as *mut _,
                );

                for range in array.iter() {
                    ranges.push(crate::RevisionRange {
                        start: Revision::Number(Revnum(range.start)),
                        end: Revision::Number(Revnum(range.end)),
                    });
                }

                result.insert(path, ranges);
            }
        }

        result
    }
}

impl Drop for Mergeinfo {
    fn drop(&mut self) {
        // Pool drop will clean up mergeinfo
    }
}

/// Specifies how merge information is inherited.
#[derive(Debug, PartialEq, Clone, Copy)]
pub enum MergeinfoInheritance {
    /// Merge information is explicit.
    Explicit,
    /// Merge information is inherited.
    Inherited,
    /// Merge information comes from the nearest ancestor.
    NearestAncestor,
}

impl From<subversion_sys::svn_mergeinfo_inheritance_t> for MergeinfoInheritance {
    fn from(value: subversion_sys::svn_mergeinfo_inheritance_t) -> Self {
        match value {
            subversion_sys::svn_mergeinfo_inheritance_t_svn_mergeinfo_nearest_ancestor => {
                MergeinfoInheritance::NearestAncestor
            }
            subversion_sys::svn_mergeinfo_inheritance_t_svn_mergeinfo_explicit => {
                MergeinfoInheritance::Explicit
            }
            subversion_sys::svn_mergeinfo_inheritance_t_svn_mergeinfo_inherited => {
                MergeinfoInheritance::Inherited
            }
            _ => unreachable!(),
        }
    }
}

impl From<MergeinfoInheritance> for subversion_sys::svn_mergeinfo_inheritance_t {
    fn from(value: MergeinfoInheritance) -> Self {
        match value {
            MergeinfoInheritance::NearestAncestor => {
                subversion_sys::svn_mergeinfo_inheritance_t_svn_mergeinfo_nearest_ancestor
            }
            MergeinfoInheritance::Explicit => {
                subversion_sys::svn_mergeinfo_inheritance_t_svn_mergeinfo_explicit
            }
            MergeinfoInheritance::Inherited => {
                subversion_sys::svn_mergeinfo_inheritance_t_svn_mergeinfo_inherited
            }
        }
    }
}

impl MergeinfoInheritance {
    /// Convert to the canonical string representation.
    pub fn to_word(self) -> &'static str {
        unsafe {
            let ptr = subversion_sys::svn_inheritance_to_word(self.into());
            std::ffi::CStr::from_ptr(ptr)
                .to_str()
                .expect("inheritance word is not valid UTF-8")
        }
    }

    /// Parse from a string representation.
    pub fn from_word(word: &str) -> Self {
        let word_cstr = std::ffi::CString::new(word).expect("inheritance word contains null byte");
        unsafe { subversion_sys::svn_inheritance_from_word(word_cstr.as_ptr()).into() }
    }
}

/// A merge range with start/end revisions and inheritability.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub struct MergeRange {
    /// Start revision (exclusive)
    pub start: Revnum,
    /// End revision (inclusive)
    pub end: Revnum,
    /// Whether this range is inheritable
    pub inheritable: bool,
}

impl MergeRange {
    /// Create a new merge range.
    pub fn new(start: Revnum, end: Revnum, inheritable: bool) -> Self {
        Self {
            start,
            end,
            inheritable,
        }
    }
}

impl From<&subversion_sys::svn_merge_range_t> for MergeRange {
    fn from(r: &subversion_sys::svn_merge_range_t) -> Self {
        Self {
            start: Revnum(r.start),
            end: Revnum(r.end),
            inheritable: r.inheritable != 0,
        }
    }
}

impl From<subversion_sys::svn_merge_range_t> for MergeRange {
    fn from(r: subversion_sys::svn_merge_range_t) -> Self {
        Self {
            start: Revnum(r.start),
            end: Revnum(r.end),
            inheritable: r.inheritable != 0,
        }
    }
}

/// A list of merge ranges.
pub struct Rangelist {
    ptr: *mut subversion_sys::svn_rangelist_t,
    pool: apr::Pool<'static>,
}

impl Rangelist {
    /// Create a new empty rangelist.
    pub fn new() -> Self {
        let pool = apr::Pool::new();
        let ptr = unsafe {
            apr_sys::apr_array_make(
                pool.as_mut_ptr(),
                0,
                std::mem::size_of::<subversion_sys::svn_merge_range_t>() as i32,
            )
        };
        Self { ptr, pool }
    }

    /// Create a rangelist from a raw pointer and pool.
    ///
    /// # Safety
    /// The pointer must be valid and the pool must own the memory.
    pub(crate) unsafe fn from_ptr_and_pool(
        ptr: *mut subversion_sys::svn_rangelist_t,
        pool: apr::Pool<'static>,
    ) -> Self {
        Self { ptr, pool }
    }

    /// Convert the rangelist to a string representation.
    pub fn to_string(&self) -> Result<String, Error<'static>> {
        unsafe {
            let mut output: *mut subversion_sys::svn_string_t = std::ptr::null_mut();
            let err = subversion_sys::svn_rangelist_to_string(
                &mut output,
                self.ptr,
                self.pool.as_mut_ptr(),
            );
            svn_result(err)?;

            if output.is_null() || (*output).data.is_null() {
                return Ok(String::new());
            }

            let data_slice = std::slice::from_raw_parts((*output).data as *const u8, (*output).len);
            Ok(std::str::from_utf8(data_slice)
                .map_err(|_| Error::from_message("Rangelist string is not valid UTF-8"))?
                .to_string())
        }
    }

    /// Compute the difference between two rangelists.
    ///
    /// Returns (deleted, added) where:
    /// - deleted: ranges in `from` but not in `to`
    /// - added: ranges in `to` but not in `from`
    pub fn diff(
        from: &Rangelist,
        to: &Rangelist,
        consider_inheritance: bool,
    ) -> Result<(Rangelist, Rangelist), Error<'static>> {
        let pool1 = apr::Pool::new();
        let pool2 = apr::Pool::new();
        unsafe {
            let mut deleted: *mut subversion_sys::svn_rangelist_t = std::ptr::null_mut();
            let mut added: *mut subversion_sys::svn_rangelist_t = std::ptr::null_mut();
            let err = subversion_sys::svn_rangelist_diff(
                &mut deleted,
                &mut added,
                from.ptr,
                to.ptr,
                consider_inheritance.into(),
                pool1.as_mut_ptr(),
            );
            svn_result(err)?;
            Ok((
                Rangelist::from_ptr_and_pool(deleted, pool1),
                Rangelist::from_ptr_and_pool(added, pool2),
            ))
        }
    }

    /// Merge changes into this rangelist.
    pub fn merge(&mut self, changes: &Rangelist) -> Result<(), Error<'static>> {
        unsafe {
            let err = subversion_sys::svn_rangelist_merge2(
                self.ptr,
                changes.ptr,
                self.pool.as_mut_ptr(),
                self.pool.as_mut_ptr(),
            );
            svn_result(err)
        }
    }

    /// Remove ranges in `eraser` from `whiteboard`.
    pub fn remove(
        eraser: &Rangelist,
        whiteboard: &Rangelist,
        consider_inheritance: bool,
    ) -> Result<Rangelist, Error<'static>> {
        let pool = apr::Pool::new();
        unsafe {
            let mut output: *mut subversion_sys::svn_rangelist_t = std::ptr::null_mut();
            let err = subversion_sys::svn_rangelist_remove(
                &mut output,
                eraser.ptr,
                whiteboard.ptr,
                consider_inheritance.into(),
                pool.as_mut_ptr(),
            );
            svn_result(err)?;
            Ok(Rangelist::from_ptr_and_pool(output, pool))
        }
    }

    /// Compute the intersection of two rangelists.
    pub fn intersect(
        rangelist1: &Rangelist,
        rangelist2: &Rangelist,
        consider_inheritance: bool,
    ) -> Result<Rangelist, Error<'static>> {
        let pool = apr::Pool::new();
        unsafe {
            let mut output: *mut subversion_sys::svn_rangelist_t = std::ptr::null_mut();
            let err = subversion_sys::svn_rangelist_intersect(
                &mut output,
                rangelist1.ptr,
                rangelist2.ptr,
                consider_inheritance.into(),
                pool.as_mut_ptr(),
            );
            svn_result(err)?;
            Ok(Rangelist::from_ptr_and_pool(output, pool))
        }
    }

    /// Reverse this rangelist in place.
    pub fn reverse(&mut self) -> Result<(), Error<'static>> {
        unsafe {
            let err = subversion_sys::svn_rangelist_reverse(self.ptr, self.pool.as_mut_ptr());
            svn_result(err)
        }
    }

    /// Duplicate this rangelist.
    pub fn dup(&self) -> Rangelist {
        let pool = apr::Pool::new();
        unsafe {
            let result = subversion_sys::svn_rangelist_dup(self.ptr, pool.as_mut_ptr());
            Rangelist::from_ptr_and_pool(result, pool)
        }
    }

    /// Get the ranges as a Vec.
    pub fn ranges(&self) -> Vec<MergeRange> {
        if self.ptr.is_null() {
            return Vec::new();
        }

        unsafe {
            let array =
                apr::tables::TypedArray::<subversion_sys::svn_merge_range_t>::from_ptr(self.ptr);
            array.iter().map(MergeRange::from).collect()
        }
    }

    /// Check if the rangelist is empty.
    pub fn is_empty(&self) -> bool {
        if self.ptr.is_null() {
            return true;
        }
        unsafe { (*self.ptr).nelts == 0 }
    }

    /// Get the number of ranges.
    pub fn len(&self) -> usize {
        if self.ptr.is_null() {
            return 0;
        }
        unsafe { (*self.ptr).nelts as usize }
    }

    /// Get the inheritable or non-inheritable ranges within a revision range.
    ///
    /// If `inheritable` is true, returns ranges that are inheritable.
    /// If `inheritable` is false, returns ranges that are non-inheritable.
    pub fn inheritable(
        &self,
        start: Revnum,
        end: Revnum,
        inheritable: bool,
    ) -> Result<Rangelist, Error<'static>> {
        let pool = apr::Pool::new();
        unsafe {
            let mut result: *mut subversion_sys::svn_rangelist_t = std::ptr::null_mut();
            let err = subversion_sys::svn_rangelist_inheritable2(
                &mut result,
                self.ptr,
                start.0,
                end.0,
                inheritable as i32,
                pool.as_mut_ptr(),
                pool.as_mut_ptr(),
            );
            svn_result(err)?;
            Ok(Rangelist::from_ptr_and_pool(result, pool))
        }
    }
}

impl Default for Rangelist {
    fn default() -> Self {
        Self::new()
    }
}

/// A catalog of mergeinfo, mapping paths to their mergeinfo.
///
/// This is essentially a hash table where keys are repository paths
/// and values are Mergeinfo objects.
pub struct MergeinfoCatalog {
    ptr: subversion_sys::svn_mergeinfo_catalog_t,
    pool: apr::Pool<'static>,
}

impl MergeinfoCatalog {
    /// Create a new empty mergeinfo catalog.
    pub fn new() -> Self {
        let pool = apr::Pool::new();
        let ptr = unsafe { apr_sys::apr_hash_make(pool.as_mut_ptr()) };
        Self { ptr, pool }
    }

    /// Create a catalog from a raw pointer and pool.
    ///
    /// # Safety
    /// The pointer must be valid and the pool must own the memory.
    pub(crate) unsafe fn from_ptr_and_pool(
        ptr: subversion_sys::svn_mergeinfo_catalog_t,
        pool: apr::Pool<'static>,
    ) -> Self {
        Self { ptr, pool }
    }

    /// Merge changes from another catalog into this one.
    pub fn merge(&mut self, changes: &MergeinfoCatalog) -> Result<(), Error<'static>> {
        unsafe {
            let err = subversion_sys::svn_mergeinfo_catalog_merge(
                self.ptr,
                changes.ptr,
                self.pool.as_mut_ptr(),
                self.pool.as_mut_ptr(),
            );
            svn_result(err)
        }
    }

    /// Duplicate this catalog.
    pub fn dup(&self) -> MergeinfoCatalog {
        let pool = apr::Pool::new();
        unsafe {
            let result = subversion_sys::svn_mergeinfo_catalog_dup(self.ptr, pool.as_mut_ptr());
            MergeinfoCatalog::from_ptr_and_pool(result, pool)
        }
    }

    /// Check if the catalog is empty.
    pub fn is_empty(&self) -> bool {
        if self.ptr.is_null() {
            return true;
        }
        unsafe { apr_sys::apr_hash_count(self.ptr) == 0 }
    }

    /// Get the number of entries in the catalog.
    pub fn len(&self) -> usize {
        if self.ptr.is_null() {
            return 0;
        }
        unsafe { apr_sys::apr_hash_count(self.ptr) as usize }
    }

    /// Get the paths in this catalog.
    pub fn paths(&self) -> Vec<String> {
        if self.ptr.is_null() {
            return Vec::new();
        }

        unsafe {
            let hash = apr::hash::TypedHash::<svn_mergeinfo_t>::from_ptr(self.ptr);
            hash.iter()
                .map(|(key, _)| {
                    std::str::from_utf8(key)
                        .expect("catalog path is not valid UTF-8")
                        .to_string()
                })
                .collect()
        }
    }
}

impl Default for MergeinfoCatalog {
    fn default() -> Self {
        Self::new()
    }
}

#[cfg(test)]
mod tests {
    use super::*;

    #[test]
    fn test_mergeinfo_parse() {
        let mergeinfo = Mergeinfo::parse("/trunk:1-10").unwrap();
        let s = mergeinfo.to_string().unwrap();
        assert_eq!(s, "/trunk:1-10");
    }

    #[test]
    fn test_mergeinfo_inheritance_conversion() {
        // Test conversion from SVN constants to enum
        assert_eq!(
            MergeinfoInheritance::from(
                subversion_sys::svn_mergeinfo_inheritance_t_svn_mergeinfo_explicit
            ),
            MergeinfoInheritance::Explicit
        );
        assert_eq!(
            MergeinfoInheritance::from(
                subversion_sys::svn_mergeinfo_inheritance_t_svn_mergeinfo_inherited
            ),
            MergeinfoInheritance::Inherited
        );
        assert_eq!(
            MergeinfoInheritance::from(
                subversion_sys::svn_mergeinfo_inheritance_t_svn_mergeinfo_nearest_ancestor
            ),
            MergeinfoInheritance::NearestAncestor
        );
    }

    #[test]
    fn test_mergeinfo_inheritance_to_svn() {
        // Test conversion from enum to SVN constants
        assert_eq!(
            subversion_sys::svn_mergeinfo_inheritance_t::from(MergeinfoInheritance::Explicit),
            subversion_sys::svn_mergeinfo_inheritance_t_svn_mergeinfo_explicit
        );
        assert_eq!(
            subversion_sys::svn_mergeinfo_inheritance_t::from(MergeinfoInheritance::Inherited),
            subversion_sys::svn_mergeinfo_inheritance_t_svn_mergeinfo_inherited
        );
        assert_eq!(
            subversion_sys::svn_mergeinfo_inheritance_t::from(
                MergeinfoInheritance::NearestAncestor
            ),
            subversion_sys::svn_mergeinfo_inheritance_t_svn_mergeinfo_nearest_ancestor
        );
    }

    #[test]
    fn test_mergeinfo_roundtrip_conversion() {
        // Test that converting back and forth preserves values
        let variants = vec![
            MergeinfoInheritance::Explicit,
            MergeinfoInheritance::Inherited,
            MergeinfoInheritance::NearestAncestor,
        ];

        for variant in variants {
            let svn_val = subversion_sys::svn_mergeinfo_inheritance_t::from(variant);
            let back = MergeinfoInheritance::from(svn_val);
            assert_eq!(variant, back);
        }
    }

    #[test]
    fn test_mergeinfo_drop() {
        // Test that Mergeinfo can be dropped without panic
        {
            let _mergeinfo = Mergeinfo::parse("/trunk:1-5").unwrap();
            // mergeinfo is dropped here
        }
        // No panic should occur
    }

    #[test]
    fn test_mergeinfo_dup() {
        let mergeinfo = Mergeinfo::parse("/trunk:1-10").unwrap();
        let dup = mergeinfo.dup();
        assert_eq!(dup.to_string().unwrap(), "/trunk:1-10");
    }

    #[test]
    fn test_rangelist_new() {
        let rangelist = Rangelist::new();
        assert!(rangelist.is_empty());
        assert_eq!(rangelist.len(), 0);
    }

    #[test]
    fn test_merge_range_from() {
        let range = MergeRange {
            start: Revnum(1),
            end: Revnum(10),
            inheritable: true,
        };
        assert_eq!(range.start.0, 1);
        assert_eq!(range.end.0, 10);
        assert!(range.inheritable);
    }

    #[test]
    fn test_rangelist_dup() {
        let rangelist = Rangelist::new();
        let dup = rangelist.dup();
        assert!(dup.is_empty());
    }

    #[test]
    fn test_rangelist_to_string_empty() {
        let rangelist = Rangelist::new();
        let s = rangelist.to_string().unwrap();
        assert_eq!(s, "");
    }

    #[test]
    fn test_rangelist_merge() {
        let mut r1 = Rangelist::new();
        let r2 = Rangelist::new();
        r1.merge(&r2).unwrap();
        assert!(r1.is_empty());
    }

    #[test]
    fn test_rangelist_intersect() {
        let r1 = Rangelist::new();
        let r2 = Rangelist::new();
        let intersected = Rangelist::intersect(&r1, &r2, true).unwrap();
        assert!(intersected.is_empty());
    }

    #[test]
    fn test_rangelist_reverse() {
        let mut rangelist = Rangelist::new();
        rangelist.reverse().unwrap();
        assert!(rangelist.is_empty());
    }

    #[test]
    fn test_rangelist_ranges_empty() {
        let rangelist = Rangelist::new();
        let ranges = rangelist.ranges();
        assert!(ranges.is_empty());
    }

    #[test]
    fn test_mergeinfo_catalog_new() {
        let catalog = MergeinfoCatalog::new();
        assert!(catalog.is_empty());
        assert_eq!(catalog.len(), 0);
    }

    #[test]
    fn test_mergeinfo_catalog_dup() {
        let catalog = MergeinfoCatalog::new();
        let dup = catalog.dup();
        assert!(dup.is_empty());
    }

    #[test]
    fn test_mergeinfo_catalog_merge() {
        let mut c1 = MergeinfoCatalog::new();
        let c2 = MergeinfoCatalog::new();
        c1.merge(&c2).unwrap();
        assert!(c1.is_empty());
    }

    #[test]
    fn test_mergeinfo_catalog_paths() {
        let catalog = MergeinfoCatalog::new();
        let paths = catalog.paths();
        assert!(paths.is_empty());
    }
}