| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293 |
- """Tests for rerere functionality."""
- import tempfile
- import unittest
- from dulwich.rerere import (
- RerereCache,
- _extract_conflict_regions,
- _has_conflict_markers,
- _normalize_conflict_markers,
- _remove_conflict_markers,
- is_rerere_autoupdate,
- is_rerere_enabled,
- )
- class NormalizeConflictMarkersTests(unittest.TestCase):
- """Tests for _normalize_conflict_markers function."""
- def test_normalize_basic_conflict(self) -> None:
- """Test normalizing a basic conflict."""
- content = b"""line 1
- <<<<<<< ours
- our change
- =======
- their change
- >>>>>>> theirs
- line 2
- """
- expected = b"""line 1
- <<<<<<<
- our change
- =======
- their change
- >>>>>>>
- line 2
- """
- result = _normalize_conflict_markers(content)
- self.assertEqual(expected, result)
- def test_normalize_with_branch_names(self) -> None:
- """Test normalizing conflict with branch names."""
- content = b"""<<<<<<< HEAD
- content from HEAD
- =======
- content from feature
- >>>>>>> feature
- """
- expected = b"""<<<<<<<
- content from HEAD
- =======
- content from feature
- >>>>>>>
- """
- result = _normalize_conflict_markers(content)
- self.assertEqual(expected, result)
- class ExtractConflictRegionsTests(unittest.TestCase):
- """Tests for _extract_conflict_regions function."""
- def test_extract_single_conflict(self) -> None:
- """Test extracting a single conflict region."""
- content = b"""line 1
- <<<<<<< ours
- our change
- =======
- their change
- >>>>>>> theirs
- line 2
- """
- regions = _extract_conflict_regions(content)
- self.assertEqual(1, len(regions))
- ours, sep, theirs = regions[0]
- self.assertEqual(b"our change", ours)
- self.assertEqual(b"=======", sep)
- self.assertEqual(b"their change", theirs)
- def test_extract_multiple_conflicts(self) -> None:
- """Test extracting multiple conflict regions."""
- content = b"""<<<<<<< ours
- change 1
- =======
- change 2
- >>>>>>> theirs
- middle line
- <<<<<<< ours
- change 3
- =======
- change 4
- >>>>>>> theirs
- """
- regions = _extract_conflict_regions(content)
- self.assertEqual(2, len(regions))
- class HasConflictMarkersTests(unittest.TestCase):
- """Tests for _has_conflict_markers function."""
- def test_has_conflict_markers(self) -> None:
- """Test detecting conflict markers."""
- content = b"""<<<<<<< ours
- our change
- =======
- their change
- >>>>>>> theirs
- """
- self.assertTrue(_has_conflict_markers(content))
- def test_no_conflict_markers(self) -> None:
- """Test content without conflict markers."""
- content = b"""line 1
- line 2
- line 3
- """
- self.assertFalse(_has_conflict_markers(content))
- def test_partial_conflict_markers(self) -> None:
- """Test content with only some conflict markers."""
- content = b"""<<<<<<< ours
- our change
- line 3
- """
- self.assertFalse(_has_conflict_markers(content))
- class RemoveConflictMarkersTests(unittest.TestCase):
- """Tests for _remove_conflict_markers function."""
- def test_remove_conflict_markers(self) -> None:
- """Test removing conflict markers from resolved content."""
- content = b"""line 1
- <<<<<<< ours
- our change
- =======
- their change
- >>>>>>> theirs
- line 2
- """
- # This is a simplified test - in reality the resolved content
- # would have the user's chosen resolution
- result = _remove_conflict_markers(content)
- # The function keeps only lines outside conflict blocks
- self.assertNotIn(b"<<<<<<<", result)
- self.assertNotIn(b"=======", result)
- self.assertNotIn(b">>>>>>>", result)
- class RerereCacheTests(unittest.TestCase):
- """Tests for RerereCache class."""
- def setUp(self) -> None:
- """Set up test fixtures."""
- self.tempdir = tempfile.mkdtemp()
- self.cache = RerereCache(self.tempdir)
- def tearDown(self) -> None:
- """Clean up test fixtures."""
- import shutil
- shutil.rmtree(self.tempdir, ignore_errors=True)
- def test_record_conflict(self) -> None:
- """Test recording a conflict."""
- content = b"""line 1
- <<<<<<< ours
- our change
- =======
- their change
- >>>>>>> theirs
- line 2
- """
- conflict_id = self.cache.record_conflict(b"test.txt", content)
- self.assertIsNotNone(conflict_id)
- self.assertEqual(40, len(conflict_id)) # SHA-1 hash length
- def test_record_conflict_no_markers(self) -> None:
- """Test recording content without conflict markers."""
- content = b"line 1\nline 2\n"
- conflict_id = self.cache.record_conflict(b"test.txt", content)
- self.assertIsNone(conflict_id)
- def test_status_empty(self) -> None:
- """Test status with no conflicts."""
- status = self.cache.status()
- self.assertEqual([], status)
- def test_status_with_conflict(self) -> None:
- """Test status with a recorded conflict."""
- content = b"""<<<<<<< ours
- our change
- =======
- their change
- >>>>>>> theirs
- """
- conflict_id = self.cache.record_conflict(b"test.txt", content)
- status = self.cache.status()
- self.assertEqual(1, len(status))
- cid, has_resolution = status[0]
- self.assertEqual(conflict_id, cid)
- self.assertFalse(has_resolution)
- def test_has_resolution(self) -> None:
- """Test checking for resolution."""
- content = b"""<<<<<<< ours
- our change
- =======
- their change
- >>>>>>> theirs
- """
- conflict_id = self.cache.record_conflict(b"test.txt", content)
- self.assertIsNotNone(conflict_id)
- self.assertFalse(self.cache.has_resolution(conflict_id))
- def test_diff(self) -> None:
- """Test getting diff for a conflict."""
- content = b"""<<<<<<< ours
- our change
- =======
- their change
- >>>>>>> theirs
- """
- conflict_id = self.cache.record_conflict(b"test.txt", content)
- self.assertIsNotNone(conflict_id)
- preimage, postimage = self.cache.diff(conflict_id)
- self.assertIsNotNone(preimage)
- self.assertIsNone(postimage) # No resolution recorded yet
- def test_clear(self) -> None:
- """Test clearing all conflicts."""
- content = b"""<<<<<<< ours
- our change
- =======
- their change
- >>>>>>> theirs
- """
- self.cache.record_conflict(b"test.txt", content)
- status = self.cache.status()
- self.assertEqual(1, len(status))
- self.cache.clear()
- status = self.cache.status()
- self.assertEqual([], status)
- def test_forget(self) -> None:
- """Test forgetting a specific conflict."""
- content = b"""<<<<<<< ours
- our change
- =======
- their change
- >>>>>>> theirs
- """
- conflict_id = self.cache.record_conflict(b"test.txt", content)
- self.assertIsNotNone(conflict_id)
- self.cache.forget(conflict_id)
- status = self.cache.status()
- self.assertEqual([], status)
- class ConfigTests(unittest.TestCase):
- """Tests for rerere configuration functions."""
- def test_is_rerere_enabled_false_by_default(self) -> None:
- """Test that rerere is disabled by default."""
- from dulwich.config import ConfigDict
- config = ConfigDict()
- self.assertFalse(is_rerere_enabled(config))
- def test_is_rerere_enabled_true(self) -> None:
- """Test rerere enabled config."""
- from dulwich.config import ConfigDict
- config = ConfigDict()
- config.set((b"rerere",), b"enabled", b"true")
- self.assertTrue(is_rerere_enabled(config))
- def test_is_rerere_autoupdate_false_by_default(self) -> None:
- """Test that rerere.autoupdate is disabled by default."""
- from dulwich.config import ConfigDict
- config = ConfigDict()
- self.assertFalse(is_rerere_autoupdate(config))
- def test_is_rerere_autoupdate_true(self) -> None:
- """Test rerere.autoupdate enabled config."""
- from dulwich.config import ConfigDict
- config = ConfigDict()
- config.set((b"rerere",), b"autoupdate", b"true")
- self.assertTrue(is_rerere_autoupdate(config))
|