add processing for empty file adds in git (#21)

* add processing for empty file adds in git

* 80 char linter rule is dumb

* prefer 100 len lines and expand travis matrix

* flatten test matrix

* use xenial dist to get python 3.7

* fix README line

* flip hunk order so any tuple access is still compatible

* addressing PR comments

* move pipenv installed packages to be dev-only

Author: cscorley

.gitignore

@@ -3,6 +3,8 @@ env/
 env2/
 env3/
 
+.vscode/
+
 *.py[cod]
 .ropeproject
 

.travis.yml

@@ -1,27 +1,30 @@
+dist: xenial
 sudo: false
 language: python
-python: "3.5"
-env:
-  - TOX_ENV=py27
-  - TOX_ENV=py34
-  - TOX_ENV=py35
 matrix:
   include:
+    - python: 3.4
+      env: TOX_ENV=py34
+
+    - python: 3.5
+      env: TOX_ENV=py35
+
     - python: 3.6
       env: TOX_ENV=py36
-  include:
+
     - python: 3.7
       env: TOX_ENV=py37
-  include:
     - python: 3.7
       env: TOX_ENV=lint
-  include:
+
+    - python: 2.7
+      env: TOX_ENV=py27
     - python: 2.7
       env: TOX_ENV=lint
 addons:
-    apt:
-        packages:
-            - ed
+  apt:
+    packages:
+      - ed
 install: pip install tox
 script: tox -e $TOX_ENV
 cache: pip

Pipfile

@@ -0,0 +1,15 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+nose = "*"
+flake8 = "*"
+tox = "*"
+twine = "*"
+
+[packages]
+
+[requires]
+python_version = "3.7"

Pipfile.lock

@@ -82,20 +82,21 @@ each diff in the patch:
                        old_version='2013-01-05 16:56:19.000000000 -0600',
                        new_path='tzu',
                        new_version='2013-01-05 16:56:35.000000000 -0600'),
-         changes=[Change(old=1, new=None, hunk=1, line='The Way that can be told of is not the eternal Way;'),
-                  Change(old=2, new=None, hunk=1, line='The name that can be named is not the eternal name.'),
-                  Change(old=3, new=1, hunk=1, line='The Nameless is the origin of Heaven and Earth;'),
-                  Change(old=4, new=None, hunk=1, line='The Named is the mother of all things.'),
-                  Change(old=None, new=2, hunk=1, line='The named is the mother of all things.'),
-                  Change(old=None, new=3, hunk=1, line=''), Change(old=5, new=4, hunk=1, line='Therefore let there always be non-being,'),
-                  Change(old=6, new=5, hunk=1, line='  so we may see their subtlety,'),
-                  Change(old=7, new=6, hunk=1, line='And let there always be being,'),
-                  Change(old=9, new=8, hunk=2, line='The two are the same,'),
-                  Change(old=10, new=9, hunk=2, line='But after they are produced,'),
-                  Change(old=11, new=10, hunk=2, line='  they have different names.'),
-                  Change(old=None, new=11, hunk=2, line='They both may be called deep and profound.'),
-                  Change(old=None, new=12, hunk=2, line='Deeper and more profound,'),
-                  Change(old=None, new=13, hunk=2, line='The door of all subtleties!')],
+         changes=[Change(old=1, new=None, line='The Way that can be told of is not the eternal Way;', hunk=1),
+                  Change(old=2, new=None, line='The name that can be named is not the eternal name.', hunk=1),
+                  Change(old=3, new=1, line='The Nameless is the origin of Heaven and Earth;', hunk=1),
+                  Change(old=4, new=None, line='The Named is the mother of all things.', hunk=1),
+                  Change(old=None, new=2, line='The named is the mother of all things.', hunk=1),
+                  Change(old=None, new=3, line='', hunk=1),
+                  Change(old=5, new=4, line='Therefore let there always be non-being,', hunk=1),
+                  Change(old=6, new=5, line='  so we may see their subtlety,', hunk=1),
+                  Change(old=7, new=6, line='And let there always be being,', hunk=1),
+                  Change(old=9, new=8, line='The two are the same,', hunk=2),
+                  Change(old=10, new=9, line='But after they are produced,', hunk=2),
+                  Change(old=11, new=10, line='  they have different names.', hunk=2),
+                  Change(old=None, new=11, line='They both may be called deep and profound.', hunk=2),
+                  Change(old=None, new=12, line='Deeper and more profound,', hunk=2),
+                  Change(old=None, new=13, line='The door of all subtleties!', hunk=2)],
          text='...')
 
 The changes are listed as they are in the patch, but instead of the +/- syntax
@@ -106,7 +107,7 @@ What these numbers indicate are as follows:
 #. ``( old=None, new=2, ... )`` indicates line 2 of the file tzu was **inserted**.
 #. ``( old=5, new=4, ... )`` indicates that line 5 of lao and line 4 of tzu are **equal**.
 
-Please note that not all patch formats provide the actual lines modified, so some 
+Please note that not all patch formats provide the actual lines modified, so some
 results will have the text portion of the tuple set to ``None``.
 
 Applying

README.rst

@@ -11,11 +11,12 @@
 
 setup(
     name='whatthepatch',
-    version='0.0.5',
-    description='A patch parsing library.',
-    long_description=readme,
+    version='0.0.6',
     author='Christopher S. Corley',
     author_email='[email protected]',
+    description='A patch parsing and application library.',
+    long_description=readme,
+    long_description_content_type="text/markdown",
     url='https://github.com/cscorley/whatthepatch',
     license='MIT',
     packages=['whatthepatch'],

setup.py

@@ -0,0 +1,3 @@
+diff --git a/somefile.txt b/somefile.txt
+new file mode 100644
+index 0000000..e69de29

tests/casefiles/git-new-empty-file.diff

@@ -97,7 +97,8 @@ def _process_change(c):
             return (c.old, c.new, c.line)
 
         def _process_diffobj(d):
-            return d._replace(changes=[_process_change(c) for c in d.changes])
+            changes = d.changes or []
+            return d._replace(changes=[_process_change(c) for c in changes])
 
         def _process(d_or_c):
             if isinstance(d_or_c, list):
@@ -579,6 +580,29 @@ def test_git_oneline_rm(self):
         results = list(wtp.parse_patch(text))
         self.assert_diffs_equal(results, expected)
 
+    def test_git_new_empty_file(self):
+        with open('tests/casefiles/git-new-empty-file.diff') as f:
+            text = f.read()
+
+        lines = text.splitlines()
+
+        expected = [
+            diffobj(
+                header=headerobj(
+                    index_path=None,
+                    old_path='/dev/null',
+                    old_version='0000000',
+                    new_path='somefile.txt',
+                    new_version='e69de29',
+                ),
+                changes=[],
+                text='\n'.join(lines[:34]) + '\n'
+            )
+        ]
+
+        results = list(wtp.parse_patch(text))
+        self.assert_diffs_equal(results, expected)
+
     def test_git_header(self):
         with open('tests/casefiles/git-header.diff') as f:
             text = f.read()