Ensure apply_diff also includes new files when committing changes

Author: jpichon

git_wrapper/branch.py

@@ -196,7 +196,7 @@ def apply_diff(self, branch_name, diff_path, message, signoff=False):
            :param bool signoff: Whether to add signed-off-by to commit message
         """
         # Ensure we don't commit more than we mean to
-        if self.git_repo.repo.is_dirty():
+        if self.git_repo.repo.is_dirty(untracked_files=True):
             msg = ("Repository {repo} contains uncommitted changes. Please clean workspace "
                    "before proceeding.".format(repo=self.git_repo.repo.working_dir))
             raise exceptions.DirtyRepositoryException(msg)
@@ -218,6 +218,9 @@ def apply_diff(self, branch_name, diff_path, message, signoff=False):
             msg = "Could not apply diff {path} on branch {name}. Error: {error}".format(path=full_path, name=branch_name, error=ex)
             raise_from(exceptions.ChangeNotAppliedException(msg), ex)
 
+        # The diff may have added new files, ensure they are staged
+        self.git_repo.git.add(".")
+
         # Commit
         self.git_repo.commit.commit(message, signoff)
 

integration_tests/test_branch.py

@@ -25,6 +25,9 @@ def test_apply_diff(repo_root, datadir):
     assert "Test commit message" in message
     assert "Signed-off-by" in message
 
+    # Check the working directory is clean and the new files also committed
+    assert repo.repo.is_dirty(untracked_files=True) is False
+
 
 def test_apply_patch(repo_root, patch_cleanup, datadir):
     repo = GitRepo(repo_root)

integration_tests/test_branch/test.diff

@@ -9,3 +9,13 @@
 
  .. image:: https://img.shields.io/pypi/v/git_wrapper.svg
          :target: https://pypi.python.org/pypi/git_wrapper
+
+--- /dev/null
++++ a/newdir/newfile
+@@ -0,0 +1,1 @@
++This is a test
+
+--- /dev/null
++++ a/.newhiddenfile
+@@ -0,0 +1,1 @@
++This is a test adding a hidden file

tests/test_branch.py

@@ -352,6 +352,7 @@ def test_apply_diff(mock_repo):
 
     with patch('git.repo.fun.name_to_object'):
         repo.branch.apply_diff('test_branch', './requirements.txt', 'message', True)
+    assert repo.git.add.called is True
     assert repo.git.apply.called is True
     assert repo.git.commit.called is True