123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275 |
- """Tests for dulwich merge CLI command."""
- import io
- import os
- import tempfile
- import unittest
- from unittest.mock import patch
- from dulwich import porcelain
- from dulwich.cli import main
- from dulwich.tests import TestCase
- class CLIMergeTests(TestCase):
- """Tests for the dulwich merge CLI command."""
- def test_merge_fast_forward(self):
- """Test CLI merge with fast-forward."""
- with tempfile.TemporaryDirectory() as tmpdir:
-
- porcelain.init(tmpdir)
-
- with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
- f.write("Initial content\n")
- porcelain.add(tmpdir, paths=["file1.txt"])
- porcelain.commit(tmpdir, message=b"Initial commit")
-
- porcelain.branch_create(tmpdir, "feature")
- porcelain.checkout_branch(tmpdir, "feature")
-
- with open(os.path.join(tmpdir, "file2.txt"), "w") as f:
- f.write("Feature content\n")
- porcelain.add(tmpdir, paths=["file2.txt"])
- porcelain.commit(tmpdir, message=b"Add feature")
-
- porcelain.checkout_branch(tmpdir, "master")
-
- old_cwd = os.getcwd()
- try:
- os.chdir(tmpdir)
- with patch("sys.stdout", new_callable=io.StringIO) as mock_stdout:
- ret = main(["merge", "feature"])
- output = mock_stdout.getvalue()
- self.assertEqual(ret, None)
- self.assertIn("Merge successful", output)
-
- self.assertTrue(os.path.exists(os.path.join(tmpdir, "file2.txt")))
- finally:
- os.chdir(old_cwd)
- def test_merge_with_conflicts(self):
- """Test CLI merge with conflicts."""
- with tempfile.TemporaryDirectory() as tmpdir:
-
- porcelain.init(tmpdir)
-
- with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
- f.write("Initial content\n")
- porcelain.add(tmpdir, paths=["file1.txt"])
- porcelain.commit(tmpdir, message=b"Initial commit")
-
- porcelain.branch_create(tmpdir, "feature")
- porcelain.checkout_branch(tmpdir, "feature")
- with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
- f.write("Feature content\n")
- porcelain.add(tmpdir, paths=["file1.txt"])
- porcelain.commit(tmpdir, message=b"Modify file1 in feature")
-
- porcelain.checkout_branch(tmpdir, "master")
- with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
- f.write("Master content\n")
- porcelain.add(tmpdir, paths=["file1.txt"])
- porcelain.commit(tmpdir, message=b"Modify file1 in master")
-
- old_cwd = os.getcwd()
- try:
- os.chdir(tmpdir)
- with patch("sys.stdout", new_callable=io.StringIO) as mock_stdout:
- with patch("sys.exit") as mock_exit:
- main(["merge", "feature"])
- mock_exit.assert_called_with(1)
- output = mock_stdout.getvalue()
- self.assertIn("Merge conflicts", output)
- self.assertIn("file1.txt", output)
- finally:
- os.chdir(old_cwd)
- def test_merge_already_up_to_date(self):
- """Test CLI merge when already up to date."""
- with tempfile.TemporaryDirectory() as tmpdir:
-
- porcelain.init(tmpdir)
-
- with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
- f.write("Initial content\n")
- porcelain.add(tmpdir, paths=["file1.txt"])
- porcelain.commit(tmpdir, message=b"Initial commit")
-
- old_cwd = os.getcwd()
- try:
- os.chdir(tmpdir)
- with patch("sys.stdout", new_callable=io.StringIO) as mock_stdout:
- ret = main(["merge", "HEAD"])
- output = mock_stdout.getvalue()
- self.assertEqual(ret, None)
- self.assertIn("Already up to date", output)
- finally:
- os.chdir(old_cwd)
- def test_merge_no_commit(self):
- """Test CLI merge with --no-commit."""
- with tempfile.TemporaryDirectory() as tmpdir:
-
- porcelain.init(tmpdir)
-
- with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
- f.write("Initial content\n")
- porcelain.add(tmpdir, paths=["file1.txt"])
- porcelain.commit(tmpdir, message=b"Initial commit")
-
- porcelain.branch_create(tmpdir, "feature")
- porcelain.checkout_branch(tmpdir, "feature")
-
- with open(os.path.join(tmpdir, "file2.txt"), "w") as f:
- f.write("Feature content\n")
- porcelain.add(tmpdir, paths=["file2.txt"])
- porcelain.commit(tmpdir, message=b"Add feature")
-
- porcelain.checkout_branch(tmpdir, "master")
- with open(os.path.join(tmpdir, "file3.txt"), "w") as f:
- f.write("Master content\n")
- porcelain.add(tmpdir, paths=["file3.txt"])
- porcelain.commit(tmpdir, message=b"Add file3")
-
- old_cwd = os.getcwd()
- try:
- os.chdir(tmpdir)
- with patch("sys.stdout", new_callable=io.StringIO) as mock_stdout:
- ret = main(["merge", "--no-commit", "feature"])
- output = mock_stdout.getvalue()
- self.assertEqual(ret, None)
- self.assertIn("not committing", output)
-
- self.assertTrue(os.path.exists(os.path.join(tmpdir, "file2.txt")))
- self.assertTrue(os.path.exists(os.path.join(tmpdir, "file3.txt")))
- finally:
- os.chdir(old_cwd)
- def test_merge_no_ff(self):
- """Test CLI merge with --no-ff."""
- with tempfile.TemporaryDirectory() as tmpdir:
-
- porcelain.init(tmpdir)
-
- with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
- f.write("Initial content\n")
- porcelain.add(tmpdir, paths=["file1.txt"])
- porcelain.commit(tmpdir, message=b"Initial commit")
-
- porcelain.branch_create(tmpdir, "feature")
- porcelain.checkout_branch(tmpdir, "feature")
-
- with open(os.path.join(tmpdir, "file2.txt"), "w") as f:
- f.write("Feature content\n")
- porcelain.add(tmpdir, paths=["file2.txt"])
- porcelain.commit(tmpdir, message=b"Add feature")
-
- porcelain.checkout_branch(tmpdir, "master")
-
- old_cwd = os.getcwd()
- try:
- os.chdir(tmpdir)
- with patch("sys.stdout", new_callable=io.StringIO) as mock_stdout:
- ret = main(["merge", "--no-ff", "feature"])
- output = mock_stdout.getvalue()
- self.assertEqual(ret, None)
- self.assertIn("Merge successful", output)
- self.assertIn("Created merge commit", output)
- finally:
- os.chdir(old_cwd)
- def test_merge_with_message(self):
- """Test CLI merge with custom message."""
- with tempfile.TemporaryDirectory() as tmpdir:
-
- porcelain.init(tmpdir)
-
- with open(os.path.join(tmpdir, "file1.txt"), "w") as f:
- f.write("Initial content\n")
- porcelain.add(tmpdir, paths=["file1.txt"])
- porcelain.commit(tmpdir, message=b"Initial commit")
-
- porcelain.branch_create(tmpdir, "feature")
- porcelain.checkout_branch(tmpdir, "feature")
-
- with open(os.path.join(tmpdir, "file2.txt"), "w") as f:
- f.write("Feature content\n")
- porcelain.add(tmpdir, paths=["file2.txt"])
- porcelain.commit(tmpdir, message=b"Add feature")
-
- porcelain.checkout_branch(tmpdir, "master")
- with open(os.path.join(tmpdir, "file3.txt"), "w") as f:
- f.write("Master content\n")
- porcelain.add(tmpdir, paths=["file3.txt"])
- porcelain.commit(tmpdir, message=b"Add file3")
-
- old_cwd = os.getcwd()
- try:
- os.chdir(tmpdir)
- with patch("sys.stdout", new_callable=io.StringIO) as mock_stdout:
- ret = main(["merge", "-m", "Custom merge message", "feature"])
- output = mock_stdout.getvalue()
- self.assertEqual(ret, None)
- self.assertIn("Merge successful", output)
- finally:
- os.chdir(old_cwd)
- if __name__ == "__main__":
- unittest.main()
|