New files not part of dfetch diff generated patch

Fixes #886

Author: spoorcc

dfetch/project/svn.py

@@ -17,7 +17,11 @@
     in_directory,
     safe_rm,
 )
-from dfetch.vcs.patch import filter_patch
+from dfetch.vcs.patch import (
+    combine_patches,
+    create_svn_patch_for_new_file,
+    filter_patch,
+)
 
 logger = get_logger(__name__)
 
@@ -372,15 +376,52 @@ def get_diff(
         self, old_revision: str, new_revision: Optional[str], ignore: Sequence[str]
     ) -> str:
         """Get the diff between two revisions."""
-        cmd = ["svn", "diff", "--non-interactive", ".", "-r", old_revision]
+        cmd = [
+            "svn",
+            "diff",
+            "--non-interactive",
+            "--ignore-properties",
+            ".",
+            "-r",
+            old_revision,
+        ]
         if new_revision:
             cmd[-1] += f":{new_revision}"
 
         with in_directory(self.local_path):
             patch_text = run_on_cmdline(logger, cmd).stdout
 
-        return filter_patch(patch_text, ignore)
+        filtered = filter_patch(patch_text, ignore)
+
+        if new_revision:
+            return filtered
+
+        patches: list[bytes] = [filtered.encode("utf-8")] if filtered else []
+        with in_directory(self.local_path):
+            for file_path in self._untracked_not_ignored("."):
+                patch = create_svn_patch_for_new_file(file_path)
+                if patch:
+                    patches.append(patch.encode("utf-8"))
+
+        return combine_patches(patches)
 
     def get_default_branch(self) -> str:
         """Get the default branch of this repository."""
         return self.DEFAULT_BRANCH
+
+    @staticmethod
+    def _untracked_not_ignored(path: str) -> list[str]:
+        result = (
+            run_on_cmdline(
+                logger,
+                ["svn", "status", path],
+            )
+            .stdout.decode()
+            .splitlines()
+        )
+
+        files = []
+        for line in result:
+            if line.startswith("?"):
+                files.append(line[1:].strip())
+        return files

dfetch/vcs/patch.py

@@ -1,6 +1,8 @@
 """Various patch utilities for VCS systems."""
 
+import difflib
 from collections.abc import Sequence
+from pathlib import Path
 
 import patch_ng
 
@@ -35,3 +37,34 @@ def dump_patch(patch_set: patch_ng.PatchSet) -> str:
             for line in h.text:
                 patch_lines.append(line.rstrip(b"\n").decode("utf-8"))
     return "\n".join(patch_lines)
+
+
+def create_svn_patch_for_new_file(file_path: str) -> str:
+    """Create a svn patch for a new file."""
+    diff = unified_diff_new_file(Path(file_path))
+    return "" if not diff else "\n".join([f"Index: {file_path}", "=" * 67] + diff)
+
+
+def unified_diff_new_file(path: Path) -> list[str]:
+    """Create a unified diff for a new file."""
+    with path.open("r", encoding="utf-8", errors="replace") as new_file:
+        lines = new_file.readlines()
+
+    return list(
+        difflib.unified_diff(
+            [], lines, fromfile="/dev/null", tofile=str(path), lineterm=""
+        )
+    )
+
+
+def combine_patches(patches: Sequence[bytes]) -> str:
+    """Combine multiple patches into a single patch."""
+    if not patches:
+        return ""
+
+    final_patchset = patch_ng.PatchSet()
+    for patch in patches:
+        for patch_obj in patch_ng.fromstring(patch) or []:
+            final_patchset.items += [patch_obj]
+
+    return dump_patch(final_patchset)

features/diff-in-git.feature

@@ -32,23 +32,32 @@ Feature: Diff in git
             +An important sentence for the README!
             """
 
+    @wip
     Scenario: New files are part of the patch
         Given files as '*.tmp' are ignored in git
         And "SomeProject/NEWFILE.md" in MyProject is created and committed with
             """
-            A completely new untracked file.
+            A completely new tracked file.
             """
+        And "SomeProject/NEW_UNCOMMITTED_FILE.md" in MyProject is created
         And "SomeProject/IGNORE_ME.tmp" in MyProject is created
         When I run "dfetch diff SomeProject"
         Then the patch file 'MyProject/SomeProject.patch' is generated
             """
             diff --git a/NEWFILE.md b/NEWFILE.md
             new file mode 100644
-            index 0000000..9a3c71c
+            index 0000000..a2d8605
             --- /dev/null
             +++ b/NEWFILE.md
             @@ -0,0 +1 @@
-            +A completely new untracked file.
+            +A completely new tracked file.
+            diff --git a/dev/null b/NEW_UNCOMMITTED_FILE.md
+            new file mode 100644
+            index 0000000..9a3c71c
+            --- /dev/null
+            +++ b/NEW_UNCOMMITTED_FILE.md
+            @@ -0,0 +1 @@
+            +Some content
             """
 
     Scenario: No change is present

features/diff-in-svn.feature

@@ -21,7 +21,7 @@ Feature: Diff in svn
             """
             An important sentence for the README!
             """
-        When I run "dfetch -v diff SomeProject" in MySvnProject
+        When I run "dfetch diff SomeProject" in MySvnProject
         Then the patch file 'MySvnProject/SomeProject.patch' is generated
             """
             Index: README.md
@@ -34,11 +34,12 @@ Feature: Diff in svn
             """
 
     Scenario: New files are part of the patch
-        Given files as '*.tmp' are ignored in 'SomeProject' in svn
+        Given files as '*.tmp' are ignored in 'MySvnProject/SomeProject' in svn
         And "SomeProject/NEWFILE.md" in MySvnProject is changed, added and committed with
             """
-            A completely new untracked file.
+            A completely new tracked file.
             """
+        And "SomeProject/NEW_UNCOMMITTED_FILE.md" in MySvnProject is created
         And "SomeProject/IGNORE_ME.tmp" in MySvnProject is created
         When I run "dfetch diff SomeProject" in MySvnProject
         Then the patch file 'MySvnProject/SomeProject.patch' is generated
@@ -48,7 +49,13 @@ Feature: Diff in svn
             --- NEWFILE.md
             +++ NEWFILE.md
             @@ -0,0 +1,1 @@
-            +A completely new untracked file.
+            +A completely new tracked file.
+            Index: NEW_UNCOMMITTED_FILE.md
+            ===================================================================
+            --- /dev/null
+            +++ NEW_UNCOMMITTED_FILE.md
+            @@ -0,0 +1,1 @@
+            +Some content
             """
 
     Scenario: No change is present
@@ -78,7 +85,7 @@ Feature: Diff in svn
 
     Scenario: Metadata is not part of diff
         Given the metadata file ".dfetch_data.yaml" of "MySvnProject/SomeProject" is changed
-        When I run "dfetch diff SomeProject"
+        When I run "dfetch diff SomeProject" in MySvnProject
         Then the output shows
         """
         Dfetch (0.10.0)

features/steps/svn_steps.py

@@ -123,7 +123,7 @@ def step_impl(context):
 def step_impl(context, directory, path):
     with in_directory(directory):
         extend_file(path, context.text)
-        add_and_commit("A change")
+        add_and_commit(f"Added {path} to {directory}")
 
 
 @given("files as '{pattern}' are ignored in '{directory}' in svn")