codeplain 0.1.8__py3-none-any.whl → 0.2.1__py3-none-any.whl

{codeplain-0.1.8.dist-info → codeplain-0.2.1.dist-info}/METADATA

@@ -1,32 +1,31 @@
 Metadata-Version: 2.4
 Name: codeplain
-Version: 0.1.8
+Version: 0.2.1
 Summary: Transform plain language specifications into working code
+License-File: LICENSE
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Code Generators
 Requires-Python: >=3.11
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: python-liquid2==0.3.0
+Requires-Dist: gitpython==3.1.42
 Requires-Dist: mistletoe==1.3.0
+Requires-Dist: networkx==3.6.1
+Requires-Dist: python-frontmatter==1.1.0
+Requires-Dist: python-liquid2==0.3.0
+Requires-Dist: pyyaml==6.0.2
 Requires-Dist: requests==2.32.3
+Requires-Dist: rich==14.2.0
+Requires-Dist: textual==1.0.0
 Requires-Dist: tiktoken==0.12.0
-Requires-Dist: PyYAML==6.0.2
-Requires-Dist: gitpython==3.1.42
 Requires-Dist: transitions==0.9.3
-Requires-Dist: textual==1.0.0
-Requires-Dist: rich==14.2.0
-Requires-Dist: python-frontmatter==1.1.0
-Requires-Dist: networkx==3.6.1
 Provides-Extra: dev
-Requires-Dist: pytest==8.3.5; extra == "dev"
-Requires-Dist: flake8==7.0.0; extra == "dev"
-Requires-Dist: black==24.2.0; extra == "dev"
-Requires-Dist: isort==5.13.2; extra == "dev"
-Requires-Dist: mypy==1.11.2; extra == "dev"
-Dynamic: license-file
+Requires-Dist: black==24.2.0; extra == 'dev'
+Requires-Dist: flake8==7.0.0; extra == 'dev'
+Requires-Dist: isort==5.13.2; extra == 'dev'
+Requires-Dist: mypy==1.11.2; extra == 'dev'
+Requires-Dist: pytest==8.3.5; extra == 'dev'
+Description-Content-Type: text/markdown
 
 # Codeplain plain2code renderer
 

{codeplain-0.1.8.dist-info → codeplain-0.2.1.dist-info}/RECORD

@@ -1,5 +1,6 @@
 codeplain_REST_api.py,sha256=qfzUw9v0-NKII4ibw3vqSBrCeU2WP4RcrrEti43F3zs,18400
 concept_utils.py,sha256=vwSY4-FmxyqaDBxhntYzqG8t9pXvAWwiULP0DYQI32o,7905
+diff_utils.py,sha256=AjiQlqo5pRos_8hVXZo5yBurl5BzSrTMGrQv4dCtRCg,1198
 event_bus.py,sha256=sduIR3bgIbxAbLhwKd8Gx9YN9gzaeqy9-mNupS04aKw,1759
 file_utils.py,sha256=4BIxzsteZQOaK-efkvQcoaIfYydsQNFR6elpsxJgXLQ,11591
 git_utils.py,sha256=gTRps6RIzJJkyy9amaDxP38FPoxYulZViBWr9V0IPQg,12414
@@ -21,9 +22,10 @@ plain_modules.py,sha256=iDqqamtix5KahMC_v-vfQ7yndugmqtBW1z6XxTB4x6w,4876
 plain_spec.py,sha256=zC-VOb_UJOs8OxtEiwQJuonw7Lkmbi7YHyFvvCvUZNo,13529
 spinner.py,sha256=Ro6Gd9Przf-whuHqPRY6HwI0T57yJjyNPbhDbigZKZE,2471
 system_config.py,sha256=mgHLn-CRHLO9Y9vKyI_eFBreY_YhFad-ctZgBYp-rIg,1777
-codeplain-0.1.8.dist-info/licenses/LICENSE,sha256=wsFi5dpbJurnRNfBj8q2RCcF3ryrmdRIfxc3lPcmc4c,1069
 config/__init__.py,sha256=beYSsJWmBNHDP5rYmVDouqgEeP3t1lkkepbXJ-oq0F8,37
 config/system_config.yaml,sha256=bB5Th5jxgXFyaIvceUPID1ReebMMXsyMibV4gtu9sWQ,1148
+docs/generate_cli.py,sha256=xJmiihtdgqEDBYt_wBsRbniZvIfq7Q6tjAsi3SjoMJg,531
+examples/example_hello_world_python/harness_tests/hello_world_display/test_hello_world.py,sha256=dwTowrHiVKKbrDv21v8xJC30Q57AXZkQasdGOO5JsBE,470
 render_machine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 render_machine/code_renderer.py,sha256=jOoYivkZzCuGG947YlNPlvD1Dpd2xTWVK8pwfF_OqDU,2957
 render_machine/conformance_test_helpers.py,sha256=6Ru7Dh24SLNIKWfz_sP5hE_EmWpvk6nfgN1T1yaCZus,2887
@@ -57,6 +59,14 @@ standard_template_library/golang-console-app-template.plain,sha256=M3gE1wZ6o_F-H
 standard_template_library/python-console-app-template.plain,sha256=ofIJIkNXScGFTx2w8mY3lP4KmRml2GQv2EiEoXlbqqs,1005
 standard_template_library/typescript-react-app-boilerplate.plain,sha256=6LFxhEOzWnDHdVpFj-XBTq6s4_2dy7LKV3lVkCzv8i4,114
 standard_template_library/typescript-react-app-template.plain,sha256=SG1cBMVt1ncMRK4cOGOyVVj0MmsQTmF4MI67IBn1lFg,380
+tests/__init__.py,sha256=Wk73Io62J15BtlLVIzxmASDWaaJkQLevS4BLK5LDAQg,16
+tests/conftest.py,sha256=QZcp08htUlJGgmHDlRWFgsWXZ8o8IBWTD5QqJaUMlU8,790
+tests/test_git_utils.py,sha256=Knc4R2ZkHYVj9iPFKhb0_ewaad_mxPrakOn6gpziHMc,13138
+tests/test_imports.py,sha256=cdw7u93xNFD064sjwwEWy4oLHhJNlt1-DRDYhHjymFw,2078
+tests/test_plainfile.py,sha256=N3f59hpxOO5zULdBtmXZM6KO2PKADoOL5d3WxNTUYXg,11106
+tests/test_plainfileparser.py,sha256=9B9r2jEeUKDMhqb4TJEPK7aatYl1op1z92GDAD4fJ20,18685
+tests/test_plainspec.py,sha256=ouS899oejStu8u1D3399y5NAxcKlNbLcinNoxZUp59M,2437
+tests/test_requires.py,sha256=u8wY-UI7Ryat84htaI0yFXpl-PjX7G90EnMKM35S6No,1182
 tui/__init__.py,sha256=_fy7FowY0RkWdn4kC7XV2jgvQPCj-2gE8fNUb-Mny0A,60
 tui/components.py,sha256=l7f-jLk0sj9WM8z2IpaHksmSyytXe_bl2GBdHASoIg4,13901
 tui/models.py,sha256=KMjlWubmPD41GA-BjgiqkaV9v7tLJ0fuWKBDPmZj4JA,1493
@@ -64,8 +74,8 @@ tui/plain2code_tui.py,sha256=7agVU0NnaCuF1LuOSEmjx-XfEOQ6HHr1HlWe_b1Tses,11695
 tui/state_handlers.py,sha256=HbjgaV-9xGhp3E-3X114zOqPkeNcCjT-R1PbVRxVdso,12674
 tui/styles.css,sha256=Umm2TLePmywizZGV4Nd8UezZRiK5pFyibYRbpRvGqbs,3056
 tui/widget_helpers.py,sha256=VJorEM2PjRBzN-jIDmKJPolFgo2d8-2NmTumgC5xeNo,5229
-codeplain-0.1.8.dist-info/METADATA,sha256=6cCO9MBjIFzFB4xwk0DzkYOsG9teb9irU43B_oW9kic,4300
-codeplain-0.1.8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-codeplain-0.1.8.dist-info/entry_points.txt,sha256=oDZkBqu9WhtZApb_K6ia8-fn9aojwmAsgnKELceX5T4,46
-codeplain-0.1.8.dist-info/top_level.txt,sha256=L9DFaIGhmYbauBxKOmNEl7cc-eYfRAw5XWYaM7B1bcw,620
-codeplain-0.1.8.dist-info/RECORD,,
+codeplain-0.2.1.dist-info/METADATA,sha256=UmRjTWg_BVVg4NqJRvOi_Rb6ldLR4EwZDU4X0TpNI3w,4278
+codeplain-0.2.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+codeplain-0.2.1.dist-info/entry_points.txt,sha256=oDZkBqu9WhtZApb_K6ia8-fn9aojwmAsgnKELceX5T4,46
+codeplain-0.2.1.dist-info/licenses/LICENSE,sha256=wsFi5dpbJurnRNfBj8q2RCcF3ryrmdRIfxc3lPcmc4c,1069
+codeplain-0.2.1.dist-info/RECORD,,

{codeplain-0.1.8.dist-info → codeplain-0.2.1.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.2)
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any
-

diff_utils.py

@@ -0,0 +1,32 @@
+from difflib import unified_diff
+
+
+def get_unified_diff(filename: str, existing_file_content: str, response_file_content: str) -> str:
+    diff = unified_diff(
+        existing_file_content.splitlines(keepends=True),
+        response_file_content.splitlines(keepends=True),
+        fromfile=filename,
+        tofile=filename,
+    )
+
+    return "".join(diff)
+
+
+def get_code_diff(response_files: dict[str, str], existing_files_content: dict[str, str]) -> dict[str, str]:
+    code_diff: dict[str, str] = {}
+    for file_name in response_files:
+        if file_name in existing_files_content and existing_files_content[file_name]:
+            if response_files[file_name]:
+                unified_diff_result = get_unified_diff(
+                    file_name,
+                    existing_files_content[file_name],
+                    response_files[file_name],
+                )
+                if unified_diff_result and unified_diff_result.strip():
+                    code_diff[file_name] = unified_diff_result
+            else:
+                code_diff[file_name] = f"File {file_name} was deleted."
+        else:
+            code_diff[file_name] = response_files[file_name]
+
+    return code_diff

docs/generate_cli.py

@@ -0,0 +1,20 @@
+import os
+import sys
+
+from plain2code_arguments import create_parser
+
+# Add the parent directory to the path so we can import plain2code_arguments
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+
+# Get the parser and generate help text
+parser = create_parser()
+help_text = parser.format_help()
+
+# Create markdown
+md = "# Plain2Code CLI Reference\n\n```text\n" + help_text + "\n```"
+
+# Run generate_cli.py in the docs folder
+
+with open("plain2code_cli.md", "w", encoding="utf-8") as f:
+    f.write(md)

examples/example_hello_world_python/harness_tests/hello_world_display/test_hello_world.py

@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+
+import subprocess
+import unittest
+
+
+class TestHelloWorld(unittest.TestCase):
+    def test_hello_world_output(self):
+        # Run the hello_world.py script and capture its output
+        result = subprocess.run(["python3", "hello_world.py"], capture_output=True, text=True)
+
+        # Check if the output matches the expected string
+        self.assertEqual(result.stdout.strip(), "hello, world")
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/__init__.py

@@ -0,0 +1 @@
+# Tests package

tests/conftest.py

@@ -0,0 +1,34 @@
+import os
+
+import pytest
+
+os.environ["MASTER_KEY"] = "test-master-key"
+os.environ["GOOGLE_API_KEY"] = "test-google-api-key"
+
+
+@pytest.fixture
+def test_data_path():
+    """Returns the path to the test data directory."""
+    return os.path.dirname(__file__)
+
+
+@pytest.fixture
+def load_test_data(test_data_path):
+    """Returns a function to load test data files."""
+
+    def _load(file_name):
+        file_path = os.path.join(test_data_path, file_name)
+        with open(file_path, "r") as file:
+            return file.read()
+
+    return _load
+
+
+@pytest.fixture
+def get_test_data_path(test_data_path):
+    """Returns a function to get the path to a test data subfolder."""
+
+    def _get_path(subfolder_name):
+        return os.path.join(test_data_path, subfolder_name)
+
+    return _get_path

tests/test_git_utils.py

@@ -0,0 +1,458 @@
+import os
+import tempfile
+from pathlib import Path
+from textwrap import dedent
+
+import pytest
+from git import Repo
+
+from git_utils import (
+    BASE_FOLDER_COMMIT_MESSAGE,
+    FUNCTIONAL_REQUIREMENT_FINISHED_COMMIT_MESSAGE,
+    REFACTORED_CODE_COMMIT_MESSAGE,
+    add_all_files_and_commit,
+    diff,
+    init_git_repo,
+    revert_changes,
+    revert_to_commit_with_frid,
+)
+
+
+@pytest.fixture
+def temp_repo():
+    """Create a temporary git repository for testing."""
+    with tempfile.TemporaryDirectory() as temp_dir:
+        init_git_repo(temp_dir)
+
+        # Create and commit initial file
+        file_path = Path(temp_dir) / "test.txt"
+        file_path.write_text("initial content\nline2\nline3\n")
+
+        repo = Repo(temp_dir)
+        repo.index.add(["test.txt"])
+        add_all_files_and_commit(temp_dir, FUNCTIONAL_REQUIREMENT_FINISHED_COMMIT_MESSAGE.format("1.1"))
+
+        yield temp_dir
+
+
+@pytest.fixture
+def empty_repo():
+    """Create an empty git repository for testing."""
+    with tempfile.TemporaryDirectory() as temp_dir:
+        init_git_repo(temp_dir)
+        yield temp_dir
+
+
+def test_empty_diff(temp_repo):
+    """Test diff when there are no changes."""
+    result = diff(temp_repo, "1.1")
+    assert result == {}
+
+
+def test_single_file_change(temp_repo):
+    """Test diff with a single file change."""
+    repo = Repo(temp_repo)
+
+    # Modify the file
+    file_path = Path(temp_repo) / "test.txt"
+    file_path.write_text("modified content\nline2\nline3\n")
+    repo.index.add(["test.txt"])
+    repo.index.commit("Modified test.txt")
+
+    # Get diff
+    result = diff(temp_repo, "1.1")
+
+    assert "test.txt" in result
+    expected_diff = dedent(
+        """
+        --- a/test.txt
+        +++ b/test.txt
+        @@ -1,3 +1,3 @@
+        -initial content
+        +modified content
+         line2
+         line3
+    """
+    ).strip()
+    assert result["test.txt"] == expected_diff
+
+
+def test_multiple_file_changes(temp_repo):
+    """Test diff with multiple file changes."""
+    repo = Repo(temp_repo)
+
+    # Create and commit second file
+    file2_path = Path(temp_repo) / "file2.txt"
+    file2_path.write_text("file2 initial\nline2\n")
+
+    add_all_files_and_commit(temp_repo, "Added file2.txt", None, "1.2")
+
+    # Modify both files
+    file1_path = Path(temp_repo) / "test.txt"
+    file1_path.write_text("file1 modified\nline2\n")
+
+    file2_path.write_text("file2 modified\nline2")
+
+    # Get diff
+    result = diff(temp_repo, "1.1")
+
+    # Check first file
+    assert "test.txt" in result
+    expected_diff1 = dedent(
+        """
+        --- a/test.txt
+        +++ b/test.txt
+        @@ -1,3 +1,2 @@
+        -initial content
+        +file1 modified
+         line2
+        -line3
+    """
+    ).strip()
+    assert result["test.txt"] == expected_diff1
+
+    # Check second file
+    assert "file2.txt" in result
+    expected_diff2 = dedent(
+        """
+        --- /dev/null
+        +++ b/file2.txt
+        @@ -0,0 +1,2 @@
+        +file2 modified
+        +line2
+        \
+    """
+    ).strip()
+    assert result["file2.txt"] == expected_diff2
+
+
+def test_multiple_commits_diff(temp_repo):
+    """Test diff with multiple commits."""
+    repo = Repo(temp_repo)
+
+    file1_path = Path(temp_repo) / "test.txt"
+
+    # Create and commit second file
+    file2_path = Path(temp_repo) / "file2.txt"
+    file2_path.write_text("file2 frid1.1 refactored version\nline2\n")
+
+    add_all_files_and_commit(temp_repo, REFACTORED_CODE_COMMIT_MESSAGE.format("1.1"), None, "1.1")
+    add_all_files_and_commit(temp_repo, FUNCTIONAL_REQUIREMENT_FINISHED_COMMIT_MESSAGE.format("1.1"), None, "1.1")
+
+    file1_path.write_text("file1 frid1.2 version\nline2\n")
+    file2_path.write_text("file2 frid1.2 version\nline2\n")
+
+    add_all_files_and_commit(temp_repo, "implemented frid 1.2", None, "1.2")
+
+    file1_path.write_text("file1 frid1.2 refactored version\nline2\n")
+
+    add_all_files_and_commit(temp_repo, REFACTORED_CODE_COMMIT_MESSAGE.format("1.2"), None, "1.2")
+    add_all_files_and_commit(temp_repo, FUNCTIONAL_REQUIREMENT_FINISHED_COMMIT_MESSAGE.format("1.2"), None, "1.2")
+
+    file3_path = Path(temp_repo) / "file3.txt"
+    file3_path.write_text("file3 frid1.2 new file\nline2\n")
+
+    # Get diff
+    result = diff(temp_repo, "1.1")
+
+    # Check first file
+    assert "test.txt" in result
+    expected_diff1 = dedent(
+        """
+        --- a/test.txt
+        +++ b/test.txt
+        @@ -1,3 +1,2 @@
+        -initial content
+        +file1 frid1.2 refactored version
+         line2
+        -line3
+    """
+    ).strip()
+    assert result["test.txt"] == expected_diff1
+
+    # Check second file
+    assert "file2.txt" in result
+    expected_diff2 = dedent(
+        """
+        --- a/file2.txt
+        +++ b/file2.txt
+        @@ -1,2 +1,2 @@
+        -file2 frid1.1 refactored version
+        +file2 frid1.2 version
+         line2
+    """
+    ).strip()
+    assert result["file2.txt"] == expected_diff2
+
+    # Check third file
+    assert "file3.txt" in result
+    expected_diff3 = dedent(
+        """
+        --- /dev/null
+        +++ b/file3.txt
+        @@ -0,0 +1,2 @@
+        +file3 frid1.2 new file
+        +line2
+    """
+    ).strip()
+    assert result["file3.txt"] == expected_diff3
+
+
+def test_diff_without_previous_frid_and_no_base_folder(empty_repo):
+    """Test diff without previous frid and no base folder."""
+    # Create a new file without committing
+    file_path = Path(empty_repo) / "new.txt"
+    file_path.write_text("new file content\nline2\n")
+    add_all_files_and_commit(empty_repo, "First commit")
+
+    # create one more file
+    file_path = Path(empty_repo) / "new2.txt"
+    file_path.write_text("new file content\nline2\n")
+
+    # Get diff
+    result = diff(empty_repo)
+
+    assert "new.txt" in result
+    expected_diff = dedent(
+        """
+        --- /dev/null
+        +++ b/new.txt
+        @@ -0,0 +1,2 @@
+        +new file content
+        +line2
+    """
+    ).strip()
+    assert result["new.txt"] == expected_diff
+
+    assert "new2.txt" in result
+    expected_diff2 = dedent(
+        """
+        --- /dev/null
+        +++ b/new2.txt
+        @@ -0,0 +1,2 @@
+        +new file content
+        +line2
+    """
+    ).strip()
+    assert result["new2.txt"] == expected_diff2
+
+
+def test_diff_without_previous_frid_and_base_folder(temp_repo):
+    """Test diff without previous frid and base folder."""
+    # Create a commit for the base folder
+    file_path = Path(temp_repo) / "new.txt"
+    file_path.write_text("base folder content\nline2\n")
+    add_all_files_and_commit(temp_repo, BASE_FOLDER_COMMIT_MESSAGE)
+
+    # update the file
+    file_path.write_text("updated base folder content\nline2\n")
+
+    # Get diff
+    result = diff(temp_repo)
+
+    assert "new.txt" in result
+    expected_diff = dedent(
+        """
+        --- a/new.txt
+        +++ b/new.txt
+        @@ -1,2 +1,2 @@
+        -base folder content
+        +updated base folder content
+         line2
+    """
+    ).strip()
+    assert result["new.txt"] == expected_diff
+
+
+def test_new_file(temp_repo):
+    """Test diff with a new untracked file."""
+    repo = Repo(temp_repo)
+
+    # Create a new file without committing
+    file_path = Path(temp_repo) / "new.txt"
+    file_path.write_text("new file content\nline2\n")
+
+    # Get diff
+    result = diff(temp_repo, "1.1")
+
+    assert "new.txt" in result
+    expected_diff = dedent(
+        """
+        --- /dev/null
+        +++ b/new.txt
+        @@ -0,0 +1,2 @@
+        +new file content
+        +line2
+    """
+    ).strip()
+    assert result["new.txt"] == expected_diff
+
+
+def test_deleted_file(temp_repo):
+    """Test diff with a deleted file."""
+    repo = Repo(temp_repo)
+
+    # Delete the file
+    file_path = Path(temp_repo) / "test.txt"
+    file_path.unlink()
+
+    # Get diff
+    result = diff(temp_repo, "1.1")
+
+    assert "test.txt" in result
+    expected_diff = dedent(
+        """
+        --- a/test.txt
+        +++ /dev/null
+        @@ -1,3 +0,0 @@
+        -initial content
+        -line2
+        -line3
+    """
+    ).strip()
+    assert result["test.txt"] == expected_diff
+
+
+def test_init_clean_repo(empty_repo):
+    """Test initializing a clean git repository."""
+    repo = Repo(empty_repo)
+
+    # Verify it's a git repository
+    assert repo.git_dir is not None
+    assert repo.git_dir.endswith(".git")
+
+    # Verify there is only one commit
+    assert len(list(repo.iter_commits())) == 1
+    assert "[Codeplain] Initial module commit" in list(repo.iter_commits())[0].message
+
+
+def test_add_all_files_and_commit(temp_repo):
+    """Test adding all files and committing them."""
+    # Create some test files
+    file1_path = Path(temp_repo) / "file1.txt"
+    file1_path.write_text("content1")
+    file2_path = Path(temp_repo) / "file2.txt"
+    file2_path.write_text("content2")
+
+    # Add and commit files
+    repo = add_all_files_and_commit(temp_repo, "Test commit", None, "FR123", "render-id")
+
+    # Verify commit was created
+    commits = list(repo.iter_commits())
+    assert len(commits) == 3  # initial commit + first FRID commit + test commit
+
+    # Verify commit message
+    commit = commits[0]
+    assert "Test commit" in commit.message
+    assert "Changes related to Functional requirement ID (FRID): FR123" in commit.message
+    assert "Render ID: render-id" in commit.message
+
+    # Verify files were committed
+    tree = commit.tree
+    assert "file1.txt" in tree
+    assert "file2.txt" in tree
+
+    file2_path.write_text("content2 modified")
+    repo = add_all_files_and_commit(temp_repo, "Commit changes on existing file", None, "FR4")
+    commits = list(repo.iter_commits())
+    assert len(commits) == 4
+    assert "Changes related to Functional requirement ID (FRID): FR4" in commits[0].message
+
+    repo = add_all_files_and_commit(temp_repo, "Empty commit", None, "FR5")
+    commits = list(repo.iter_commits())
+    assert len(commits) == 5
+    assert "Changes related to Functional requirement ID (FRID): FR5" in commits[0].message
+
+
+def test_revert_changes(temp_repo):
+    """Test reverting changes in the repository."""
+    # Create and commit initial file
+    file_path = Path(temp_repo) / "test.txt"
+    file_path.write_text("initial content")
+    repo = add_all_files_and_commit(temp_repo, "Initial commit", None, "FR123")
+
+    # Modify the file
+    file_path.write_text("modified content")
+
+    # Verify the file was modified
+    assert file_path.read_text() == "modified content"
+
+    # Revert changes
+    repo = revert_changes(temp_repo)
+
+    # Verify the file was reverted
+    assert file_path.read_text() == "initial content"
+
+    # Verify working directory is clean
+    assert not repo.is_dirty()
+
+
+def test_revert_to_commit_with_frid(temp_repo):
+    """Test reverting to a specific commit with FRID."""
+    # Create and commit first version
+    file_path = Path(temp_repo) / "test.txt"
+    file_path.write_text("version 1")
+    repo = add_all_files_and_commit(
+        temp_repo, FUNCTIONAL_REQUIREMENT_FINISHED_COMMIT_MESSAGE.format("FR123"), None, "FR123"
+    )
+
+    # Create and commit second version
+    file_path.write_text("version 2")
+    repo = add_all_files_and_commit(
+        temp_repo, FUNCTIONAL_REQUIREMENT_FINISHED_COMMIT_MESSAGE.format("FR456"), None, "FR456"
+    )
+
+    # Create and commit third version
+    file_path.write_text("version 3")
+    repo = add_all_files_and_commit(
+        temp_repo, FUNCTIONAL_REQUIREMENT_FINISHED_COMMIT_MESSAGE.format("FR789"), None, "FR789"
+    )
+
+    # Revert to FR123
+    repo = revert_to_commit_with_frid(temp_repo, "FR123")
+
+    # Verify we're back at version 1
+    assert file_path.read_text() == "version 1"
+
+    # Verify working directory is clean
+    assert not repo.is_dirty()
+
+    # Test error case - non-existent FRID
+    with pytest.raises(Exception) as exc_info:
+        revert_to_commit_with_frid(temp_repo, "NONEXISTENT")
+    assert "No commit with frid NONEXISTENT found" in str(exc_info.value)
+
+
+def test_revert_to_commit_with_frid_and_base_folder(temp_repo):
+    """Test reverting to base folder."""
+    # Create a commit for the base folder
+    file_path = Path(temp_repo) / "new.txt"
+    file_path.write_text("base folder content\nline1\n")
+    add_all_files_and_commit(temp_repo, BASE_FOLDER_COMMIT_MESSAGE)
+
+    # create another commit
+    file_path.write_text("changed file content\nline2\n")
+    add_all_files_and_commit(temp_repo, "Another commit")
+
+    # revert to base folder
+    repo = revert_to_commit_with_frid(temp_repo, None)
+
+    # verify the file was reverted
+    assert file_path.read_text() == "base folder content\nline1\n"
+
+
+def test_revert_to_base_folder_no_commit(temp_repo):
+    """Test reverting to base folder."""
+    # Create a commit for the base folder
+    file_path = Path(temp_repo) / "new.txt"
+    file_path.write_text("some content\n")
+    add_all_files_and_commit(temp_repo, "FRID", 123)
+
+    # revert initial commit
+    repo = revert_to_commit_with_frid(temp_repo, None)
+
+    # verify the repo doesn't have any commits and that the file doesn't exist
+    assert not repo.is_dirty()
+    assert repo.active_branch.name == "main"
+    assert len(list(repo.iter_commits())) == 1  # initial commit
+    assert not file_path.exists()